@rallycry/conveyor-agent 7.1.6 → 7.1.8

package/dist/{chunk-6EJDKTIE.js → chunk-WUBCS4RB.js}

@@ -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
 `);
@@ -925,6 +929,9 @@ var PlanSync = class {
 
 // src/execution/query-executor.ts
 import { createHash } from "crypto";
+import { existsSync } from "fs";
+import { homedir } from "os";
+import { join as join2 } from "path";
 
 // src/execution/pack-runner-prompt.ts
 function findLastAgentMessageIndex(history) {
@@ -5025,6 +5032,15 @@ 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 sessionFileExists(sessionUuid, cwd) {
+  try {
+    const cwdSlug = cwd.replace(/\//g, "-");
+    const sessionFile = join2(homedir(), ".claude", "projects", cwdSlug, `${sessionUuid}.jsonl`);
+    return existsSync(sessionFile);
+  } catch {
+    return false;
+  }
+}
 function isReadOnlyMode(mode, hasExitedPlanMode) {
   return mode === "discovery" || mode === "help" || mode === "auto" && !hasExitedPlanMode;
 }
@@ -5073,7 +5089,6 @@ 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() });
     }
@@ -5146,8 +5161,13 @@ async function runSdkQuery(host, context, followUpContent) {
   if (needsPlanSync) {
     host.snapshotPlanFiles();
   }
-  const options = buildQueryOptions(host, context);
-  const resume = taskIdToSessionUuid(context.taskId);
+  const sessionUuid = taskIdToSessionUuid(context.taskId);
+  const hasExistingSession = sessionFileExists(sessionUuid, host.config.workspaceDir);
+  const options = {
+    ...buildQueryOptions(host, context),
+    ...hasExistingSession ? {} : { sessionId: sessionUuid }
+  };
+  const resume = hasExistingSession ? sessionUuid : void 0;
   if (followUpContent) {
     const prompt = await buildFollowUpPrompt(host, context, followUpContent);
     const agentQuery = host.harness.executeQuery({
@@ -5200,7 +5220,10 @@ async function buildRetryQuery(host, context, options, lastErrorWasImage) {
   );
   return host.harness.executeQuery({
     prompt: host.createInputStream(retryPrompt),
-    options: { ...options },
+    // Strip sessionId on retry — if the failing query partially created a
+    // session with that ID, passing it again would error. Let the SDK
+    // auto-generate on retry attempts.
+    options: { ...options, sessionId: void 0 },
     resume: void 0
   });
 }
@@ -5223,7 +5246,7 @@ async function handleAuthError(context, host, options) {
   );
   const freshQuery = host.harness.executeQuery({
     prompt: host.createInputStream(freshPrompt),
-    options: { ...options },
+    options: { ...options, sessionId: void 0 },
     resume: void 0
   });
   return runWithRetry(freshQuery, context, host, options);
@@ -5237,7 +5260,7 @@ async function handleStaleSession(context, host, options) {
   );
   const freshQuery = host.harness.executeQuery({
     prompt: host.createInputStream(freshPrompt),
-    options: { ...options },
+    options: { ...options, sessionId: void 0 },
     resume: void 0
   });
   return runWithRetry(freshQuery, context, host, options);
@@ -5530,7 +5553,7 @@ var QueryBridge = class {
 
 // src/runner/session-runner-helpers.ts
 import { readFileSync as readFileSync2 } from "fs";
-import { dirname, join as join2 } from "path";
+import { dirname, join as join3 } from "path";
 import { fileURLToPath } from "url";
 function mapChatHistory(messages) {
   if (!messages) return [];
@@ -5558,7 +5581,7 @@ function readAgentVersion() {
     const here = dirname(fileURLToPath(import.meta.url));
     for (const rel of ["../package.json", "../../package.json"]) {
       try {
-        const pkg = JSON.parse(readFileSync2(join2(here, rel), "utf-8"));
+        const pkg = JSON.parse(readFileSync2(join3(here, rel), "utf-8"));
         if (pkg.version) return pkg.version;
       } catch {
       }
@@ -5668,11 +5691,13 @@ var SessionRunner = class _SessionRunner {
       await this.shutdown("error");
       return;
     }
-    if (this.fullContext?.githubBranch) {
-      ensureOnTaskBranch(this.config.workspaceDir, this.fullContext.githubBranch);
-    }
-    if (this.fullContext?.baseBranch) {
-      syncWithBaseBranch(this.config.workspaceDir, this.fullContext.baseBranch);
+    if (process.env.CONVEYOR_GIT_READY !== "1") {
+      if (this.fullContext?.githubBranch) {
+        ensureOnTaskBranch(this.config.workspaceDir, this.fullContext.githubBranch);
+      }
+      if (this.fullContext?.baseBranch) {
+        syncWithBaseBranch(this.config.workspaceDir, this.fullContext.baseBranch);
+      }
     }
     this.mode.applyServerMode(this.fullContext?.agentMode, this.fullContext?.isAuto);
     this.mode.resolveInitialMode(this.taskContext);
@@ -6398,15 +6423,15 @@ var CommitWatcher = class {
 
 // src/runner/worktree.ts
 import { execSync as execSync4 } from "child_process";
-import { existsSync } from "fs";
-import { join as join3 } from "path";
+import { existsSync as existsSync2 } from "fs";
+import { join as join4 } from "path";
 var WORKTREE_DIR = ".worktrees";
 function ensureWorktree(projectDir, taskId, branch) {
   if (projectDir.includes(`/${WORKTREE_DIR}/`)) {
     return projectDir;
   }
-  const worktreePath = join3(projectDir, WORKTREE_DIR, taskId);
-  if (existsSync(worktreePath)) {
+  const worktreePath = join4(projectDir, WORKTREE_DIR, taskId);
+  if (existsSync2(worktreePath)) {
     if (branch) {
       if (hasUncommittedChanges(worktreePath)) {
         return worktreePath;
@@ -6451,8 +6476,8 @@ function detachWorktreeBranch(projectDir, branch) {
   }
 }
 function removeWorktree(projectDir, taskId) {
-  const worktreePath = join3(projectDir, WORKTREE_DIR, taskId);
-  if (!existsSync(worktreePath)) return;
+  const worktreePath = join4(projectDir, WORKTREE_DIR, taskId);
+  if (!existsSync2(worktreePath)) return;
   try {
     execSync4(`git worktree remove "${worktreePath}" --force`, {
       cwd: projectDir,
@@ -7490,11 +7515,11 @@ var ProjectRunner = class {
 
 // src/setup/config.ts
 import { readFile as readFile2 } from "fs/promises";
-import { join as join4 } from "path";
+import { join as join5 } from "path";
 var DEVCONTAINER_PATH = ".devcontainer/conveyor/devcontainer.json";
 async function loadForwardPorts(workspaceDir) {
   try {
-    const raw = await readFile2(join4(workspaceDir, DEVCONTAINER_PATH), "utf-8");
+    const raw = await readFile2(join5(workspaceDir, DEVCONTAINER_PATH), "utf-8");
     const parsed = JSON.parse(raw);
     return parsed.forwardPorts ?? [];
   } catch {
@@ -7542,4 +7567,4 @@ export {
   loadForwardPorts,
   loadConveyorConfig
 };
-//# sourceMappingURL=chunk-6EJDKTIE.js.map
+//# sourceMappingURL=chunk-WUBCS4RB.js.map