@rallycry/conveyor-agent 7.3.7 → 7.3.8

package/dist/{chunk-PC43BKMM.js → chunk-RX7NQCWK.js}

@@ -40,6 +40,8 @@ var AgentConnection = class _AgentConnection {
   softStopCallback = null;
   modeChangeCallback = null;
   apiKeyUpdateCallback = null;
+  pullBranchCallback = null;
+  earlyPullBranches = [];
   constructor(config) {
     this.config = config;
   }
@@ -130,6 +132,10 @@ var AgentConnection = class _AgentConnection {
       this.socket.on("agentRunner:updateApiKey", (data) => {
         if (this.apiKeyUpdateCallback) this.apiKeyUpdateCallback(data);
       });
+      this.socket.on("session:pullBranch", (data) => {
+        if (this.pullBranchCallback) this.pullBranchCallback(data);
+        else this.earlyPullBranches.push(data);
+      });
       this.socket.on("connect", () => {
         process.stderr.write("[conveyor-agent] Socket connected\n");
         if (!settled) {
@@ -251,6 +257,11 @@ var AgentConnection = class _AgentConnection {
   onApiKeyUpdate(callback) {
     this.apiKeyUpdateCallback = callback;
   }
+  onPullBranch(callback) {
+    this.pullBranchCallback = callback;
+    for (const data of this.earlyPullBranches) callback(data);
+    this.earlyPullBranches = [];
+  }
   // ── Convenience methods (thin wrappers around call / emit) ─────────
   async emitStatus(status) {
     this.lastEmittedStatus = status;
@@ -6572,6 +6583,48 @@ function readAgentVersion() {
   return null;
 }
 
+// src/runner/parent-pull-handler.ts
+import { execSync as execSync2 } from "child_process";
+function handlePullBranch(workDir, branch) {
+  if (!branch) return;
+  const current = getCurrentBranch(workDir);
+  if (current !== branch) {
+    process.stderr.write(
+      `[conveyor-agent] pull_branch ignored \u2014 current branch ${current ?? "(detached)"} != ${branch}
+`
+    );
+    return;
+  }
+  if (hasUncommittedChanges(workDir)) {
+    process.stderr.write(
+      `[conveyor-agent] pull_branch ignored \u2014 uncommitted changes on ${branch}
+`
+    );
+    return;
+  }
+  try {
+    execSync2(`git fetch origin ${branch}`, { cwd: workDir, stdio: "ignore", timeout: 6e4 });
+  } catch {
+    process.stderr.write(`[conveyor-agent] pull_branch: fetch failed for ${branch}
+`);
+    return;
+  }
+  try {
+    execSync2(`git pull --ff-only origin ${branch}`, {
+      cwd: workDir,
+      stdio: "ignore",
+      timeout: 6e4
+    });
+    process.stderr.write(`[conveyor-agent] pull_branch: pulled origin/${branch}
+`);
+  } catch {
+    process.stderr.write(
+      `[conveyor-agent] pull_branch: ff-only pull failed for ${branch} (likely diverged)
+`
+    );
+  }
+}
+
 // src/runner/session-runner.ts
 var SessionRunner = class _SessionRunner {
   connection;
@@ -7134,6 +7187,9 @@ var SessionRunner = class _SessionRunner {
         delete process.env.CLAUDE_CODE_OAUTH_TOKEN;
       }
     });
+    this.connection.onPullBranch(({ branch }) => {
+      handlePullBranch(this.config.workspaceDir, branch);
+    });
   }
   /**
    * Rehydrate CostTracker from server. Caps at 3s so a slow API call never
@@ -7417,7 +7473,7 @@ var ProjectConnection = class {
 };
 
 // src/runner/commit-watcher.ts
-import { execSync as execSync2 } from "child_process";
+import { execSync as execSync3 } from "child_process";
 var logger5 = createServiceLogger("CommitWatcher");
 var CommitWatcher = class {
   constructor(config, callbacks) {
@@ -7451,7 +7507,7 @@ var CommitWatcher = class {
     this.isSyncing = false;
   }
   getLocalHeadSha() {
-    return execSync2("git rev-parse HEAD", {
+    return execSync3("git rev-parse HEAD", {
       cwd: this.config.projectDir,
       stdio: ["ignore", "pipe", "ignore"]
     }).toString().trim();
@@ -7459,12 +7515,12 @@ var CommitWatcher = class {
   poll() {
     if (!this.branch || this.isSyncing) return;
     try {
-      execSync2(`git fetch origin ${this.branch} --quiet`, {
+      execSync3(`git fetch origin ${this.branch} --quiet`, {
         cwd: this.config.projectDir,
         stdio: "ignore",
         timeout: 3e4
       });
-      const remoteSha = execSync2(`git rev-parse origin/${this.branch}`, {
+      const remoteSha = execSync3(`git rev-parse origin/${this.branch}`, {
         cwd: this.config.projectDir,
         stdio: ["ignore", "pipe", "ignore"]
       }).toString().trim();
@@ -7485,12 +7541,12 @@ var CommitWatcher = class {
     let latestMessage = "";
     let latestAuthor = "";
     try {
-      const countOutput = execSync2(`git rev-list --count ${previousSha}..origin/${this.branch}`, {
+      const countOutput = execSync3(`git rev-list --count ${previousSha}..origin/${this.branch}`, {
         cwd: this.config.projectDir,
         stdio: ["ignore", "pipe", "ignore"]
       }).toString().trim();
       commitCount = parseInt(countOutput, 10) || 1;
-      const logOutput = execSync2(`git log -1 --format="%s|||%an" origin/${this.branch}`, {
+      const logOutput = execSync3(`git log -1 --format="%s|||%an" origin/${this.branch}`, {
         cwd: this.config.projectDir,
         stdio: ["ignore", "pipe", "ignore"]
       }).toString().trim();
@@ -7525,7 +7581,7 @@ var CommitWatcher = class {
 };
 
 // src/runner/worktree.ts
-import { execSync as execSync3 } from "child_process";
+import { execSync as execSync4 } from "child_process";
 import { existsSync as existsSync2 } from "fs";
 import { join as join4 } from "path";
 var WORKTREE_DIR = ".worktrees";
@@ -7540,7 +7596,7 @@ function ensureWorktree(projectDir, taskId, branch) {
         return worktreePath;
       }
       try {
-        execSync3(`git checkout --detach origin/${branch}`, {
+        execSync4(`git checkout --detach origin/${branch}`, {
           cwd: worktreePath,
           stdio: "ignore"
         });
@@ -7550,7 +7606,7 @@ function ensureWorktree(projectDir, taskId, branch) {
     return worktreePath;
   }
   const ref = branch ? `origin/${branch}` : "HEAD";
-  execSync3(`git worktree add --detach "${worktreePath}" ${ref}`, {
+  execSync4(`git worktree add --detach "${worktreePath}" ${ref}`, {
     cwd: projectDir,
     stdio: "ignore"
   });
@@ -7558,7 +7614,7 @@ function ensureWorktree(projectDir, taskId, branch) {
 }
 function detachWorktreeBranch(projectDir, branch) {
   try {
-    const output = execSync3("git worktree list --porcelain", {
+    const output = execSync4("git worktree list --porcelain", {
       cwd: projectDir,
       encoding: "utf-8"
     });
@@ -7571,7 +7627,7 @@ function detachWorktreeBranch(projectDir, branch) {
       const worktreePath = worktreeLine.replace("worktree ", "");
       if (!worktreePath.includes(`/${WORKTREE_DIR}/`)) continue;
       try {
-        execSync3("git checkout --detach", { cwd: worktreePath, stdio: "ignore" });
+        execSync4("git checkout --detach", { cwd: worktreePath, stdio: "ignore" });
       } catch {
       }
     }
@@ -7582,7 +7638,7 @@ function removeWorktree(projectDir, taskId) {
   const worktreePath = join4(projectDir, WORKTREE_DIR, taskId);
   if (!existsSync2(worktreePath)) return;
   try {
-    execSync3(`git worktree remove "${worktreePath}" --force`, {
+    execSync4(`git worktree remove "${worktreePath}" --force`, {
       cwd: projectDir,
       stdio: "ignore"
     });
@@ -7591,7 +7647,7 @@ function removeWorktree(projectDir, taskId) {
 }
 
 // src/setup/commands.ts
-import { spawn, execSync as execSync4 } from "child_process";
+import { spawn, execSync as execSync5 } from "child_process";
 function runSetupCommand(cmd, cwd, onOutput) {
   return new Promise((resolve2, reject) => {
     const child = spawn("sh", ["-c", cmd], {
@@ -7620,7 +7676,7 @@ function runSetupCommand(cmd, cwd, onOutput) {
 var AUTH_TOKEN_TIMEOUT_MS = 3e4;
 function runAuthTokenCommand(cmd, userEmail, cwd) {
   try {
-    const output = execSync4(`${cmd} ${JSON.stringify(userEmail)}`, {
+    const output = execSync5(`${cmd} ${JSON.stringify(userEmail)}`, {
       cwd,
       timeout: AUTH_TOKEN_TIMEOUT_MS,
       stdio: ["ignore", "pipe", "ignore"],
@@ -8003,15 +8059,15 @@ function parseErrorMessage(error) {
 
 // src/runner/project-runner-children.ts
 import { fork } from "child_process";
-import { execSync as execSync7 } from "child_process";
+import { execSync as execSync8 } from "child_process";
 import * as path from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 
 // src/runner/project-runner-git.ts
-import { execSync as execSync6 } from "child_process";
+import { execSync as execSync7 } from "child_process";
 
 // src/runner/project-runner-sync.ts
-import { execSync as execSync5 } from "child_process";
+import { execSync as execSync6 } from "child_process";
 var logger7 = createServiceLogger("ProjectRunner");
 var START_CMD_KILL_TIMEOUT_MS = 5e3;
 async function executeSetupCommand(projectDir, connection) {
@@ -8108,7 +8164,7 @@ async function handleSyncEnvironment(projectDir, branchSwitchCommand, state, con
 }
 function getChangedFiles(projectDir, previousSha, newSha) {
   try {
-    return execSync5(`git diff --name-only ${previousSha}..${newSha}`, {
+    return execSync6(`git diff --name-only ${previousSha}..${newSha}`, {
       cwd: projectDir,
       stdio: ["ignore", "pipe", "ignore"]
     }).toString().trim().split("\n").filter(Boolean);
@@ -8119,7 +8175,7 @@ function getChangedFiles(projectDir, previousSha, newSha) {
 function runIndividualSyncSteps(projectDir, needsInstall, needsPrisma, stepsRun) {
   if (needsInstall) {
     try {
-      execSync5("bun install", { cwd: projectDir, timeout: 12e4, stdio: "pipe" });
+      execSync6("bun install", { cwd: projectDir, timeout: 12e4, stdio: "pipe" });
       stepsRun.push("install");
     } catch (err) {
       const msg = parseErrorMessage(err);
@@ -8128,8 +8184,8 @@ function runIndividualSyncSteps(projectDir, needsInstall, needsPrisma, stepsRun)
   }
   if (needsPrisma) {
     try {
-      execSync5("bunx prisma generate", { cwd: projectDir, timeout: 6e4, stdio: "pipe" });
-      execSync5("bunx prisma db push --accept-data-loss", {
+      execSync6("bunx prisma generate", { cwd: projectDir, timeout: 6e4, stdio: "pipe" });
+      execSync6("bunx prisma db push --accept-data-loss", {
         cwd: projectDir,
         timeout: 6e4,
         stdio: "pipe"
@@ -8173,7 +8229,7 @@ async function smartSync(projectDir, branchSwitchCommand, state, connection, pre
   }
   await killStartCommand(state);
   try {
-    execSync5(`git pull origin ${branch}`, {
+    execSync6(`git pull origin ${branch}`, {
       cwd: projectDir,
       stdio: "pipe",
       timeout: 6e4
@@ -8209,10 +8265,10 @@ function setupWorkDir(projectDir, assignment) {
       logger8.warn("Uncommitted changes, skipping checkout", { taskId: shortId, branch });
     } else {
       try {
-        execSync6(`git checkout ${branch}`, { cwd: workDir, stdio: "ignore" });
+        execSync7(`git checkout ${branch}`, { cwd: workDir, stdio: "ignore" });
       } catch {
         try {
-          execSync6(`git checkout -b ${branch}`, { cwd: workDir, stdio: "ignore" });
+          execSync7(`git checkout -b ${branch}`, { cwd: workDir, stdio: "ignore" });
         } catch {
           logger8.warn("Could not checkout branch", { taskId: shortId, branch });
         }
@@ -8231,8 +8287,8 @@ function checkoutWorkspaceBranch(projectDir) {
     return;
   }
   try {
-    execSync6(`git fetch origin ${workspaceBranch}`, { cwd: projectDir, stdio: "pipe" });
-    execSync6(`git checkout ${workspaceBranch}`, { cwd: projectDir, stdio: "pipe" });
+    execSync7(`git fetch origin ${workspaceBranch}`, { cwd: projectDir, stdio: "pipe" });
+    execSync7(`git checkout ${workspaceBranch}`, { cwd: projectDir, stdio: "pipe" });
     logger8.info("Checked out workspace branch", { workspaceBranch });
   } catch {
     logger8.warn("Failed to checkout workspace branch", { workspaceBranch });
@@ -8241,20 +8297,20 @@ function checkoutWorkspaceBranch(projectDir) {
 async function handleSwitchBranch(projectDir, branchSwitchCommand, startCmd, connection, commitWatcher, data, callback) {
   try {
     try {
-      execSync6("git fetch origin", { cwd: projectDir, stdio: "pipe" });
+      execSync7("git fetch origin", { cwd: projectDir, stdio: "pipe" });
     } catch {
       logger8.warn("Git fetch failed during branch switch");
     }
     detachWorktreeBranch(projectDir, data.branch);
     try {
-      execSync6(`git checkout ${data.branch}`, { cwd: projectDir, stdio: "pipe" });
+      execSync7(`git checkout ${data.branch}`, { cwd: projectDir, stdio: "pipe" });
     } catch (err) {
       const msg = parseErrorMessage(err);
       callback({ ok: false, error: `Failed to checkout branch: ${msg}` });
       return;
     }
     try {
-      execSync6(`git pull origin ${data.branch}`, { cwd: projectDir, stdio: "pipe" });
+      execSync7(`git pull origin ${data.branch}`, { cwd: projectDir, stdio: "pipe" });
     } catch {
       logger8.warn("Git pull failed during branch switch");
     }
@@ -8397,7 +8453,7 @@ async function handleAssignment(assignment, activeAgents, projectDir, connection
   }
   try {
     try {
-      execSync7("git fetch origin", { cwd: projectDir, stdio: "ignore" });
+      execSync8("git fetch origin", { cwd: projectDir, stdio: "ignore" });
     } catch {
       logger9.warn("Git fetch failed", { taskId: shortId });
     }
@@ -8804,4 +8860,4 @@ export {
   buildSessionPreviewPorts,
   loadConveyorConfig
 };
-//# sourceMappingURL=chunk-PC43BKMM.js.map
+//# sourceMappingURL=chunk-RX7NQCWK.js.map