@rallycry/conveyor-agent 7.1.5 → 7.1.7

package/dist/{chunk-36TKGT6T.js → chunk-N3365TFE.js}

@@ -7,7 +7,7 @@ import {
   createHarness,
   createServiceLogger,
   defineTool
-} from "./chunk-U6AYNVS7.js";
+} from "./chunk-RRXX6DTB.js";
 
 // src/connection/agent-connection.ts
 import { io } from "socket.io-client";
@@ -684,7 +684,11 @@ function ensureOnTaskBranch(cwd, taskBranch) {
     return false;
   }
   try {
-    execSync(`git checkout ${taskBranch}`, { cwd, stdio: "ignore", timeout: 3e4 });
+    execSync(`git checkout -B ${taskBranch} origin/${taskBranch}`, {
+      cwd,
+      stdio: "ignore",
+      timeout: 3e4
+    });
   } catch {
     process.stderr.write(`[conveyor-agent] Warning: git checkout ${taskBranch} failed
 `);
@@ -923,6 +927,9 @@ var PlanSync = class {
   }
 };
 
+// src/execution/query-executor.ts
+import { createHash } from "crypto";
+
 // src/execution/pack-runner-prompt.ts
 function findLastAgentMessageIndex(history) {
   for (let i = history.length - 1; i >= 0; i--) {
@@ -5018,6 +5025,10 @@ function buildHooks(host) {
     ]
   };
 }
+function taskIdToSessionUuid(taskId) {
+  const hash = createHash("sha256").update(taskId).digest("hex");
+  return `${hash.slice(0, 8)}-${hash.slice(8, 12)}-8${hash.slice(13, 16)}-a${hash.slice(17, 20)}-${hash.slice(20, 32)}`;
+}
 function isReadOnlyMode(mode, hasExitedPlanMode) {
   return mode === "discovery" || mode === "help" || mode === "auto" && !hasExitedPlanMode;
 }
@@ -5066,6 +5077,7 @@ function buildQueryOptions(host, context) {
     abortController: host.abortController ?? void 0,
     disallowedTools: buildDisallowedTools(settings, mode, host.hasExitedPlanMode),
     enableFileCheckpointing: settings.enableFileCheckpointing,
+    sessionId: taskIdToSessionUuid(context.taskId),
     stderr: (data) => {
       logger2.warn("Claude Code stderr", { data: data.trimEnd() });
     }
@@ -5139,7 +5151,7 @@ async function runSdkQuery(host, context, followUpContent) {
     host.snapshotPlanFiles();
   }
   const options = buildQueryOptions(host, context);
-  const resume = context.claudeSessionId ?? void 0;
+  const resume = taskIdToSessionUuid(context.taskId);
   if (followUpContent) {
     const prompt = await buildFollowUpPrompt(host, context, followUpContent);
     const agentQuery = host.harness.executeQuery({
@@ -5976,6 +5988,9 @@ var SessionRunner = class _SessionRunner {
         if (this.fullContext && action.newMode === "review") {
           this.fullContext.claudeSessionId = null;
         }
+        if (this.fullContext && action.newMode === "building") {
+          void this.refreshBranchForBuilding();
+        }
         this.connection.emitModeChanged(action.newMode);
         this.softStop();
       }
@@ -5990,6 +6005,23 @@ var SessionRunner = class _SessionRunner {
       }
     });
   }
+  /** Re-fetch task context to pick up a newly created branch and check it out. */
+  async refreshBranchForBuilding() {
+    try {
+      const ctx = await this.connection.call("getTaskContext", {
+        sessionId: this.sessionId,
+        includeHistory: false
+      });
+      if (ctx?.githubBranch && this.fullContext) {
+        this.fullContext.githubBranch = ctx.githubBranch;
+        ensureOnTaskBranch(this.config.workspaceDir, ctx.githubBranch);
+      }
+    } catch {
+      process.stderr.write(
+        "[conveyor-agent] Warning: failed to refresh branch for building transition\n"
+      );
+    }
+  }
   async setState(status) {
     this._state = status;
     await this.connection.emitStatus(status);
@@ -7051,7 +7083,7 @@ var ProjectRunner = class {
   async handleAuditTags(request) {
     this.connection.emitStatus("busy");
     try {
-      const { handleTagAudit } = await import("./tag-audit-handler-BM6MMS5T.js");
+      const { handleTagAudit } = await import("./tag-audit-handler-WPGSBNXO.js");
       await handleTagAudit(request, this.connection, this.projectDir);
     } catch (error) {
       const msg = error instanceof Error ? error.message : String(error);
@@ -7074,7 +7106,7 @@ var ProjectRunner = class {
   async handleAuditTasks(request) {
     this.connection.emitStatus("busy");
     try {
-      const { handleTaskAudit } = await import("./task-audit-handler-URD2BOC4.js");
+      const { handleTaskAudit } = await import("./task-audit-handler-AOYSFO5B.js");
       await handleTaskAudit(request, this.connection, this.projectDir);
     } catch (error) {
       const msg = error instanceof Error ? error.message : String(error);
@@ -7514,4 +7546,4 @@ export {
   loadForwardPorts,
   loadConveyorConfig
 };
-//# sourceMappingURL=chunk-36TKGT6T.js.map
+//# sourceMappingURL=chunk-N3365TFE.js.map