feat(background-agents): base branch and cloud diffs (#1149)

Author: tatoalo

apps/twig/src/renderer/features/message-editor/components/DiffStatsIndicator.tsx

@@ -4,21 +4,31 @@ import { useQuery } from "@tanstack/react-query";
 
 interface DiffStatsIndicatorProps {
   repoPath: string | null | undefined;
+  overrideStats?: {
+    filesChanged: number;
+    linesAdded: number;
+    linesRemoved: number;
+  } | null;
 }
 
-export function DiffStatsIndicator({ repoPath }: DiffStatsIndicatorProps) {
-  const { data: diffStats } = useQuery({
+export function DiffStatsIndicator({
+  repoPath,
+  overrideStats,
+}: DiffStatsIndicatorProps) {
+  const { data: localStats } = useQuery({
     queryKey: ["diff-stats", repoPath],
     queryFn: () =>
       trpcVanilla.git.getDiffStats.query({
         directoryPath: repoPath as string,
       }),
-    enabled: !!repoPath,
+    enabled: !!repoPath && !overrideStats,
     staleTime: 5000,
     refetchInterval: 5000,
     placeholderData: (prev) => prev,
   });
 
+  const diffStats = overrideStats ?? localStats;
+
   if (!diffStats || diffStats.filesChanged === 0) {
     return null;
   }

apps/twig/src/renderer/features/message-editor/components/MessageEditor.tsx

@@ -22,24 +22,36 @@ interface ModeAndBranchRowProps {
   modeOption?: SessionConfigOption;
   onModeChange?: () => void;
   repoPath?: string | null;
+  cloudBranch?: string | null;
+  cloudDiffStats?: {
+    filesChanged: number;
+    linesAdded: number;
+    linesRemoved: number;
+  } | null;
   disabled?: boolean;
 }
 
 function ModeAndBranchRow({
   modeOption,
   onModeChange,
   repoPath,
+  cloudBranch,
+  cloudDiffStats,
   disabled,
 }: ModeAndBranchRowProps) {
-  const { currentBranch, diffStats } = useGitQueries(repoPath ?? undefined);
+  const { currentBranch: gitBranch, diffStats } = useGitQueries(
+    repoPath ?? undefined,
+  );
+  const currentBranch = cloudBranch ?? gitBranch;
 
   const showModeIndicator = !!onModeChange;
   const showBranchSelector = !!currentBranch;
+  const effectiveDiffStats = cloudDiffStats ?? diffStats;
   const showDiffStats =
-    diffStats &&
-    (diffStats.filesChanged > 0 ||
-      diffStats.linesAdded > 0 ||
-      diffStats.linesRemoved > 0);
+    effectiveDiffStats &&
+    (effectiveDiffStats.filesChanged > 0 ||
+      effectiveDiffStats.linesAdded > 0 ||
+      effectiveDiffStats.linesRemoved > 0);
 
   if (!showModeIndicator && !showBranchSelector) {
     return null;
@@ -61,7 +73,10 @@ function ModeAndBranchRow({
         )}
       </Flex>
       <Flex align="center" gap="2" style={{ minWidth: 0, overflow: "hidden" }}>
-        <DiffStatsIndicator repoPath={repoPath} />
+        <DiffStatsIndicator
+          repoPath={repoPath}
+          overrideStats={cloudDiffStats}
+        />
         {showBranchSelector && showDiffStats && (
           <Flex
             align="center"
@@ -127,6 +142,8 @@ export const MessageEditor = forwardRef<EditorHandle, MessageEditorProps>(
     const disabled = context?.disabled ?? false;
     const isLoading = context?.isLoading ?? false;
     const repoPath = context?.repoPath;
+    const cloudBranch = context?.cloudBranch;
+    const cloudDiffStats = context?.cloudDiffStats;
     const isSubmitDisabled = disabled || !isOnline;
 
     const {
@@ -297,6 +314,8 @@ export const MessageEditor = forwardRef<EditorHandle, MessageEditorProps>(
           modeOption={modeOption}
           onModeChange={onModeChange}
           repoPath={repoPath}
+          cloudBranch={cloudBranch}
+          cloudDiffStats={cloudDiffStats}
           disabled={disabled}
         />
       </Flex>

apps/twig/src/renderer/features/message-editor/stores/draftStore.ts

@@ -7,10 +7,18 @@ import type { EditorContent } from "../utils/content";
 
 type SessionId = string;
 
+export interface CloudDiffStats {
+  filesChanged: number;
+  linesAdded: number;
+  linesRemoved: number;
+}
+
 export interface EditorContext {
   sessionId: string;
   taskId: string | undefined;
   repoPath: string | null | undefined;
+  cloudBranch?: string | null;
+  cloudDiffStats?: CloudDiffStats | null;
   disabled: boolean;
   isLoading: boolean;
 }
@@ -78,13 +86,22 @@ export const useDraftStore = create<DraftStore>()(
             sessionId,
             taskId: context.taskId ?? existing?.taskId,
             repoPath: context.repoPath ?? existing?.repoPath,
+            cloudBranch: context.cloudBranch ?? existing?.cloudBranch,
+            cloudDiffStats: context.cloudDiffStats ?? existing?.cloudDiffStats,
             disabled: context.disabled ?? existing?.disabled ?? false,
             isLoading: context.isLoading ?? existing?.isLoading ?? false,
           };
           if (
             existing?.sessionId === newContext.sessionId &&
             existing?.taskId === newContext.taskId &&
             existing?.repoPath === newContext.repoPath &&
+            existing?.cloudBranch === newContext.cloudBranch &&
+            existing?.cloudDiffStats?.filesChanged ===
+              newContext.cloudDiffStats?.filesChanged &&
+            existing?.cloudDiffStats?.linesAdded ===
+              newContext.cloudDiffStats?.linesAdded &&
+            existing?.cloudDiffStats?.linesRemoved ===
+              newContext.cloudDiffStats?.linesRemoved &&
             existing?.disabled === newContext.disabled &&
             existing?.isLoading === newContext.isLoading
           ) {

apps/twig/src/renderer/features/sessions/components/SessionView.tsx

@@ -45,6 +45,12 @@ interface SessionViewProps {
   onBashCommand?: (command: string) => void;
   onCancelPrompt: () => void;
   repoPath?: string | null;
+  cloudBranch?: string | null;
+  cloudDiffStats?: {
+    filesChanged: number;
+    linesAdded: number;
+    linesRemoved: number;
+  } | null;
   hasError?: boolean;
   errorTitle?: string;
   errorMessage?: string;
@@ -68,6 +74,8 @@ export function SessionView({
   onBashCommand,
   onCancelPrompt,
   repoPath,
+  cloudBranch,
+  cloudDiffStats,
   hasError = false,
   errorTitle,
   errorMessage = DEFAULT_ERROR_MESSAGE,
@@ -126,6 +134,8 @@ export function SessionView({
   setContext(sessionId, {
     taskId,
     repoPath,
+    cloudBranch,
+    cloudDiffStats,
     disabled: !isRunning,
     isLoading: !!isPromptPending,
   });

apps/twig/src/renderer/features/task-detail/components/TaskDetail.tsx

@@ -34,7 +34,11 @@ export function TaskDetail({ task: initialTask }: TaskDetailProps) {
   const workspace = useWorkspaceStore((state) => state.workspaces[taskId]);
   const effectiveRepoPath = useCwd(taskId);
   const { currentBranch } = useGitQueries(effectiveRepoPath ?? undefined);
-  const branchName = currentBranch ?? workspace?.branchName;
+  const isCloud =
+    workspace?.mode === "cloud" || task.latest_run?.environment === "cloud";
+  const branchName = isCloud
+    ? (workspace?.baseBranch ?? task.latest_run?.branch ?? currentBranch)
+    : (currentBranch ?? workspace?.branchName);
 
   const [filePickerOpen, setFilePickerOpen] = useState(false);
 

apps/twig/src/renderer/features/task-detail/components/TaskLogsPanel.tsx

@@ -1,5 +1,9 @@
 import { BackgroundWrapper } from "@components/BackgroundWrapper";
 import { ErrorBoundary } from "@components/ErrorBoundary";
+import {
+  useCloudBranchChangedFiles,
+  useCloudPrChangedFiles,
+} from "@features/git-interaction/hooks/useGitQueries";
 import { tryExecuteTwigCommand } from "@features/message-editor/commands";
 import { useDraftStore } from "@features/message-editor/stores/draftStore";
 import { SessionView } from "@features/sessions/components/SessionView";
@@ -23,7 +27,7 @@ import { useQueryClient } from "@tanstack/react-query";
 import { logger } from "@utils/logger";
 import { getTaskRepository } from "@utils/repository";
 import { toast } from "@utils/toast";
-import { useCallback, useEffect, useRef } from "react";
+import { useCallback, useEffect, useMemo, useRef } from "react";
 
 const log = logger.scope("task-logs-panel");
 
@@ -74,6 +78,27 @@ export function TaskLogsPanel({ taskId, task }: TaskLogsPanelProps) {
       ? task.latest_run.state.slack_thread_url
       : undefined;
 
+  // Cloud diff stats — reuses React Query cache from ChangesPanel
+  const cloudBranch = isCloud
+    ? (workspace?.baseBranch ?? task.latest_run?.branch ?? null)
+    : null;
+  const cloudRepo = isCloud ? (task.repository ?? null) : null;
+  const { data: prFiles } = useCloudPrChangedFiles(prUrl);
+  const { data: branchFiles } = useCloudBranchChangedFiles(
+    !prUrl ? cloudRepo : null,
+    !prUrl ? cloudBranch : null,
+  );
+  const cloudDiffStats = useMemo(() => {
+    if (!isCloud) return null;
+    const files = prUrl ? prFiles : branchFiles;
+    if (!files || files.length === 0) return null;
+    return {
+      filesChanged: files.length,
+      linesAdded: files.reduce((sum, f) => sum + (f.linesAdded ?? 0), 0),
+      linesRemoved: files.reduce((sum, f) => sum + (f.linesRemoved ?? 0), 0),
+    };
+  }, [isCloud, prUrl, prFiles, branchFiles]);
+
   const isRunning = isCloud
     ? isCloudRunNotTerminal
     : session?.status === "connected";
@@ -337,6 +362,8 @@ export function TaskLogsPanel({ taskId, task }: TaskLogsPanelProps) {
               onBashCommand={isCloud ? undefined : handleBashCommand}
               onCancelPrompt={handleCancelPrompt}
               repoPath={repoPath}
+              cloudBranch={cloudBranch}
+              cloudDiffStats={cloudDiffStats}
               hasError={hasError}
               errorTitle={errorTitle}
               errorMessage={errorMessage}

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

@@ -384,5 +384,33 @@ describe("AgentServer HTTP Mode", () => {
       expect(prompt).toContain("Create a draft pull request");
       expect(prompt).toContain("gh pr create --draft");
     });
+
+    it("includes --base flag when baseBranch is configured", () => {
+      server = new AgentServer({
+        port,
+        jwtPublicKey: TEST_PUBLIC_KEY,
+        repositoryPath: repo.path,
+        apiUrl: "http://localhost:8000",
+        apiKey: "test-api-key",
+        projectId: 1,
+        mode: "interactive",
+        taskId: "test-task-id",
+        runId: "test-run-id",
+        baseBranch: "add-yolo-to-readme",
+      });
+      const prompt = (
+        server as unknown as TestableServer
+      ).buildCloudSystemPrompt();
+      expect(prompt).toContain(
+        "gh pr create --draft --base add-yolo-to-readme",
+      );
+    });
+
+    it("omits --base flag when baseBranch is not configured", () => {
+      const s = createServer();
+      const prompt = (s as unknown as TestableServer).buildCloudSystemPrompt();
+      expect(prompt).toContain("gh pr create --draft`");
+      expect(prompt).not.toContain("--base");
+    });
   });
 });

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

@@ -747,7 +747,7 @@ After completing the requested changes:
 1. Create a new branch with a descriptive name based on the work done
 2. Stage and commit all changes with a clear commit message
 3. Push the branch to origin
-4. Create a draft pull request using \`gh pr create --draft\` with a descriptive title and body
+4. Create a draft pull request using \`gh pr create --draft${this.config.baseBranch ? ` --base ${this.config.baseBranch}` : ""}\` with a descriptive title and body
 
 Important:
 - Always create the PR as a draft. Do not ask for confirmation.

packages/agent/src/server/bin.ts

@@ -50,6 +50,7 @@ program
     "--mcpServers <json>",
     "MCP servers config as JSON array (ACP McpServer[] format)",
   )
+  .option("--baseBranch <branch>", "Base branch for PR creation")
   .action(async (options) => {
     const envResult = envSchema.safeParse(process.env);
 
@@ -99,6 +100,7 @@ program
       taskId: options.taskId,
       runId: options.runId,
       mcpServers,
+      baseBranch: options.baseBranch,
     });
 
     process.on("SIGINT", async () => {

packages/agent/src/server/types.ts

@@ -13,4 +13,5 @@ export interface AgentServerConfig {
   runId: string;
   version?: string;
   mcpServers?: RemoteMcpServer[];
+  baseBranch?: string;
 }