feat: cloud pr flow (#908)

Author: tatoalo

apps/twig/src/renderer/features/sidebar/components/items/TaskItem.tsx

@@ -3,6 +3,7 @@ import { Tooltip } from "@components/ui/Tooltip";
 import {
   ArrowsClockwise,
   BellRinging,
+  Cloud as CloudIcon,
   GitBranch as GitBranchIcon,
   Laptop as LaptopIcon,
   PushPin,
@@ -139,6 +140,12 @@ export function TaskItem({
         </span>
       </Tooltip>
     )
+  ) : workspaceMode === "cloud" ? (
+    <Tooltip content="Cloud" side="right">
+      <span className="flex items-center justify-center">
+        <CloudIcon size={ICON_SIZE} />
+      </span>
+    </Tooltip>
   ) : (
     <Tooltip content="Local" side="right">
       <span className="flex items-center justify-center">

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

@@ -72,6 +72,9 @@ export function TaskLogsPanel({ taskId, task }: TaskLogsPanelProps) {
     if (isConnecting.current) return;
     if (!isOnline) return;
 
+    // Cloud tasks are handled by the sandbox
+    if (workspace?.mode === "cloud") return;
+
     if (
       session?.status === "connected" ||
       session?.status === "connecting" ||
@@ -106,7 +109,7 @@ export function TaskLogsPanel({ taskId, task }: TaskLogsPanelProps) {
       .finally(() => {
         isConnecting.current = false;
       });
-  }, [task, repoPath, session, markActivity, isOnline]);
+  }, [task, repoPath, session, markActivity, isOnline, workspace?.mode]);
 
   const handleSendPrompt = useCallback(
     async (text: string) => {
@@ -201,7 +204,9 @@ export function TaskLogsPanel({ taskId, task }: TaskLogsPanelProps) {
     async (command: string) => {
       if (!repoPath) return;
 
-      const execId = `user-shell-${Date.now()}-${Math.random().toString(36).slice(2, 9)}`;
+      const execId = `user-shell-${Date.now()}-${Math.random()
+        .toString(36)
+        .slice(2, 9)}`;
       await getSessionService().startUserShellExecute(
         taskId,
         execId,

apps/twig/src/renderer/sagas/task/task-creation.ts

@@ -173,12 +173,14 @@ export class TaskCreationSaga extends Saga<
     }
 
     // Step 6: Connect to session
+    // Cloud create: skip local session — the sandbox handles execution
     const agentCwd =
       workspace?.worktreePath ?? workspace?.folderPath ?? repoPath;
+    const isCloudCreate = !input.taskId && workspaceMode === "cloud";
     const shouldConnect =
-      !!input.taskId || // Open: always connect to load chat history
-      workspaceMode === "cloud" || // Cloud create: always connect
-      !!agentCwd; // Local create: always connect if we have a cwd
+      !isCloudCreate &&
+      (!!input.taskId || // Open: always connect to load chat history
+        !!agentCwd); // Local create: always connect if we have a cwd
 
     if (shouldConnect) {
       const initialPrompt =

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

@@ -518,7 +518,11 @@ export class AgentServer {
     await clientConnection.newSession({
       cwd: this.config.repositoryPath,
       mcpServers: [],
-      _meta: { sessionId: payload.run_id },
+      _meta: {
+        sessionId: payload.run_id,
+        taskRunId: payload.run_id,
+        systemPrompt: { append: this.buildCloudSystemPrompt() },
+      },
     });
 
     this.session = {
@@ -533,6 +537,15 @@ export class AgentServer {
 
     this.logger.info("Session initialized successfully");
 
+    // Signal in_progress so the UI can start polling for updates
+    this.posthogAPI
+      .updateTaskRun(payload.task_id, payload.run_id, {
+        status: "in_progress",
+      })
+      .catch((err) =>
+        this.logger.warn("Failed to set task run to in_progress", err),
+      );
+
     await this.sendInitialTaskMessage(payload);
   }
 
@@ -579,6 +592,20 @@ export class AgentServer {
     }
   }
 
+  private buildCloudSystemPrompt(): string {
+    return `
+# Cloud Task Execution
+
+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 pull request using \`gh pr create\` with a descriptive title and body
+
+Important: Always create the PR. Do not ask for confirmation.
+`;
+  }
+
   private async signalTaskComplete(
     payload: JwtPayload,
     stopReason: string,
@@ -672,11 +699,97 @@ export class AgentServer {
           ) {
             await this.captureTreeState();
           }
+
+          if (
+            toolName &&
+            (toolName.includes("Bash") || toolName.includes("bash"))
+          ) {
+            this.detectAndAttachPrUrl(payload, params.update);
+          }
         }
       },
     };
   }
 
+  private detectAndAttachPrUrl(
+    payload: JwtPayload,
+    update: Record<string, unknown>,
+  ): void {
+    try {
+      const meta = (update?._meta as Record<string, unknown>)?.claudeCode as
+        | Record<string, unknown>
+        | undefined;
+      const toolResponse = meta?.toolResponse;
+
+      // Extract text content from tool response
+      let textToSearch = "";
+
+      if (toolResponse) {
+        if (typeof toolResponse === "string") {
+          textToSearch = toolResponse;
+        } else if (typeof toolResponse === "object" && toolResponse !== null) {
+          const respObj = toolResponse as Record<string, unknown>;
+          textToSearch =
+            String(respObj.stdout || "") + String(respObj.stderr || "");
+          if (!textToSearch && respObj.output) {
+            textToSearch = String(respObj.output);
+          }
+        }
+      }
+
+      // Also check content array
+      const content = update?.content;
+      if (Array.isArray(content)) {
+        for (const item of content) {
+          if (item.type === "text" && item.text) {
+            textToSearch += ` ${item.text}`;
+          }
+        }
+      }
+
+      if (!textToSearch) return;
+
+      // Match GitHub PR URLs
+      const prUrlMatch = textToSearch.match(
+        /https:\/\/github\.com\/[^/]+\/[^/]+\/pull\/\d+/,
+      );
+      if (!prUrlMatch) return;
+
+      const prUrl = prUrlMatch[0];
+      this.logger.info("Detected PR URL in bash output", {
+        runId: payload.run_id,
+        prUrl,
+      });
+
+      // Fire-and-forget: attach PR URL to the task run
+      this.posthogAPI
+        .updateTaskRun(payload.task_id, payload.run_id, {
+          output: { pr_url: prUrl },
+        })
+        .then(() => {
+          this.logger.info("PR URL attached to task run", {
+            taskId: payload.task_id,
+            runId: payload.run_id,
+            prUrl,
+          });
+        })
+        .catch((err) => {
+          this.logger.error("Failed to attach PR URL to task run", {
+            taskId: payload.task_id,
+            runId: payload.run_id,
+            prUrl,
+            error: err,
+          });
+        });
+    } catch (err) {
+      // Never let detection errors break message flow
+      this.logger.debug("Error in PR URL detection", {
+        runId: payload.run_id,
+        error: err,
+      });
+    }
+  }
+
   private async cleanupSession(): Promise<void> {
     if (!this.session) return;