chore(settings): simplify auto-publish threading after review

Inline the one-ternary getCloudAutoPublish helper, pass the option value through in the request body builder, take a single settings snapshot in useTaskCreation, and split the no-repo cloud prompt into per-mode blocks mirroring the repository branch.

Generated-By: PostHog Code
Task-Id: 49d73463-ec66-491c-b645-f6116972bd02

Author: k11kirky

packages/agent/src/server/agent-server.ts

@@ -2729,28 +2729,33 @@ ${signedCommitInstructions}${prLinkInstructions}${shellEfficiencyInstructions}
     }
 
     if (!this.config.repositoryPath) {
-      const publishTiming = shouldAutoCreatePr
-        ? `- After completing code changes in a cloned repository, create a branch, stage your changes with \`git add\` and commit them with the \`git_signed_commit\` tool (do NOT use \`git commit\`/\`git push\` — they are blocked), and open a draft pull request from inside the clone without waiting to be asked.`
-        : `- If the user explicitly asks you to open or update a pull request, create a branch, stage your changes with \`git add\` and commit them with the \`git_signed_commit\` tool (do NOT use \`git commit\`/\`git push\` — they are blocked), and open a draft pull request from inside the clone.`;
-      const publishClosing = shouldAutoCreatePr
-        ? `- Always create the PR as a draft. Do not ask for confirmation before publishing completed code changes`
-        : `- Do NOT create branches, commits, push changes, or open pull requests unless the user explicitly asks for that`;
       const publishInstructions =
         this.config.createPr === false
           ? `
 When the user asks for code changes:
 - You may clone a repository and make local edits in that clone
 - Do NOT create branches, commits, push changes, or open pull requests in this run`
-          : `
-When the user ${shouldAutoCreatePr ? "asks" : "explicitly asks"} to clone or work in a GitHub repository:
+          : shouldAutoCreatePr
+            ? `
+When the user asks to clone or work in a GitHub repository:
 - Clone the repository into /tmp/workspace/repos/<owner>/<repo> using \`gh repo clone <owner>/<repo> /tmp/workspace/repos/<owner>/<repo>\`
 - Work from inside that cloned repository for follow-up code changes
-${publishTiming} Before opening the PR, check the cloned repo for a PR template at \`.github/pull_request_template.md\` (or variants; fall back to the org's \`.github\` repo via \`gh api\`) and use it as the body structure, and search for matching open issues with \`gh issue list --search\` to include \`Closes #<n>\` / \`Refs #<n>\` links.
+- After completing code changes in a cloned repository, create a branch, stage your changes with \`git add\` and commit them with the \`git_signed_commit\` tool (do NOT use \`git commit\`/\`git push\` — they are blocked), and open a draft pull request from inside the clone without waiting to be asked. Before opening the PR, check the cloned repo for a PR template at \`.github/pull_request_template.md\` (or variants; fall back to the org's \`.github\` repo via \`gh api\`) and use it as the body structure, and search for matching open issues with \`gh issue list --search\` to include \`Closes #<n>\` / \`Refs #<n>\` links.
 - Keep the PR description brief overall. Summarize only the most important changes — do NOT enumerate every change you made. A few sentences or bullets is plenty.
 ${whyContextInstruction.trimStart()}
 ${publicRepoSafetyInstruction.trimStart()}
 - End the PR description with a horizontal rule followed by this footer line: ${prFooter}
-${publishClosing}`;
+- Always create the PR as a draft. Do not ask for confirmation before publishing completed code changes`
+            : `
+When the user explicitly asks to clone or work in a GitHub repository:
+- Clone the repository into /tmp/workspace/repos/<owner>/<repo> using \`gh repo clone <owner>/<repo> /tmp/workspace/repos/<owner>/<repo>\`
+- Work from inside that cloned repository for follow-up code changes
+- If the user explicitly asks you to open or update a pull request, create a branch, stage your changes with \`git add\` and commit them with the \`git_signed_commit\` tool (do NOT use \`git commit\`/\`git push\` — they are blocked), and open a draft pull request from inside the clone. Before opening the PR, check the cloned repo for a PR template at \`.github/pull_request_template.md\` (or variants; fall back to the org's \`.github\` repo via \`gh api\`) and use it as the body structure, and search for matching open issues with \`gh issue list --search\` to include \`Closes #<n>\` / \`Refs #<n>\` links.
+- Keep the PR description brief overall. Summarize only the most important changes — do NOT enumerate every change you made. A few sentences or bullets is plenty.
+${whyContextInstruction.trimStart()}
+${publicRepoSafetyInstruction.trimStart()}
+- End the PR description with a horizontal rule followed by this footer line: ${prFooter}
+- Do NOT create branches, commits, push changes, or open pull requests unless the user explicitly asks for that`;
 
       return `${identityInstructions}
 # Cloud Task Execution — No Repository Mode

packages/api-client/src/posthog-client.ts

@@ -553,7 +553,7 @@ function buildCloudRunRequestBody(
     body.pr_authorship_mode = options.prAuthorshipMode;
   }
   if (options?.autoPublish) {
-    body.auto_publish = true;
+    body.auto_publish = options.autoPublish;
   }
   if (options?.runSource) {
     body.run_source = options.runSource;

packages/core/src/sessions/cloudRunOptions.ts

@@ -31,12 +31,6 @@ export function getCloudRunSource(
   return state.run_source === "signal_report" ? "signal_report" : "manual";
 }
 
-export function getCloudAutoPublish(
-  state: Record<string, unknown>,
-): boolean | undefined {
-  return state.auto_publish === true ? true : undefined;
-}
-
 export interface CloudRuntimeOptions {
   adapter?: Adapter;
   model?: string;

packages/core/src/sessions/sessionService.ts

@@ -51,7 +51,6 @@ import { CloudLogGapReconciler } from "./cloudLogGapReconciler";
 import { CloudRunIdleTracker } from "./cloudRunIdleTracker";
 import {
   type CloudRuntimeOptions,
-  getCloudAutoPublish,
   getCloudPrAuthorshipMode,
   getCloudRunSource,
   getCloudRuntimeOptions,
@@ -2928,7 +2927,7 @@ export class SessionService {
           pendingUserArtifactIds:
             artifactIds.length > 0 ? artifactIds : undefined,
           prAuthorshipMode,
-          autoPublish: getCloudAutoPublish(previousState),
+          autoPublish: previousState.auto_publish === true || undefined,
           runSource: getCloudRunSource(previousState),
           signalReportId:
             typeof previousState.signal_report_id === "string"

packages/ui/src/features/task-detail/hooks/useTaskCreation.ts

@@ -299,6 +299,7 @@ export function useTaskCreation({
           }
         }
 
+        const settings = useSettingsStore.getState();
         const input = prepareTaskInput(serializedContent, filePaths, {
           // In channels chat-box mode no repo is attached up front, even if a
           // directory/repo is lingering in the persisted picker state.
@@ -321,9 +322,8 @@ export function useTaskCreation({
           channelContext,
           channelName,
           channelId,
-          customInstructions: useSettingsStore.getState().customInstructions,
-          autoPublishCloudRuns:
-            useSettingsStore.getState().autoPublishCloudRuns,
+          customInstructions: settings.customInstructions,
+          autoPublishCloudRuns: settings.autoPublishCloudRuns,
           allowNoRepo,
         });