@rallycry/conveyor-agent 4.5.0 → 4.6.0

package/dist/{chunk-7Y3RP3ZA.js → chunk-XG5DMOJX.js}

@@ -103,9 +103,11 @@ var ConveyorConnection = class _ConveyorConnection {
   static EVENT_BATCH_MS = 500;
   earlyMessages = [];
   earlyStop = false;
+  earlySoftStop = false;
   earlyModeChanges = [];
   chatMessageCallback = null;
   stopCallback = null;
+  softStopCallback = null;
   modeChangeCallback = null;
   runStartCommandCallback = null;
   pendingQuestionResolvers = /* @__PURE__ */ new Map();
@@ -135,6 +137,10 @@ var ConveyorConnection = class _ConveyorConnection {
         if (this.stopCallback) this.stopCallback();
         else this.earlyStop = true;
       });
+      this.socket.on("agentRunner:softStop", () => {
+        if (this.softStopCallback) this.softStopCallback();
+        else this.earlySoftStop = true;
+      });
       this.socket.on("agentRunner:questionAnswer", (data) => {
         const resolver = this.pendingQuestionResolvers.get(data.requestId);
         if (resolver) {
@@ -233,6 +239,13 @@ var ConveyorConnection = class _ConveyorConnection {
       this.earlyStop = false;
     }
   }
+  onSoftStopRequested(callback) {
+    this.softStopCallback = callback;
+    if (this.earlySoftStop) {
+      callback();
+      this.earlySoftStop = false;
+    }
+  }
   onModeChange(callback) {
     this.modeChangeCallback = callback;
     for (const data of this.earlyModeChanges) callback(data);
@@ -538,14 +551,6 @@ async function loadConveyorConfig(workspaceDir) {
     if (parsed.setupCommand || parsed.startCommand) return parsed;
   } catch {
   }
-  try {
-    const raw = await readFile(join2(workspaceDir, DEVCONTAINER_PATH), "utf-8");
-    const parsed = JSON.parse(raw);
-    if (parsed.conveyor && (parsed.conveyor.startCommand || parsed.conveyor.setupCommand)) {
-      return parsed.conveyor;
-    }
-  } catch {
-  }
   return null;
 }
 
@@ -2406,7 +2411,12 @@ async function runSdkQuery(host, context, followUpContent) {
       prompt: typeof prompt === "string" ? prompt : host.createInputStream(prompt),
       options: { ...options, resume }
     });
-    await runWithRetry(agentQuery, context, host, options);
+    host.activeQuery = agentQuery;
+    try {
+      await runWithRetry(agentQuery, context, host, options);
+    } finally {
+      host.activeQuery = null;
+    }
   } else if (isDiscoveryLike) {
     return;
   } else {
@@ -2416,7 +2426,12 @@ async function runSdkQuery(host, context, followUpContent) {
       prompt: host.createInputStream(prompt),
       options: { ...options, resume }
     });
-    await runWithRetry(agentQuery, context, host, options);
+    host.activeQuery = agentQuery;
+    try {
+      await runWithRetry(agentQuery, context, host, options);
+    } finally {
+      host.activeQuery = null;
+    }
   }
   if (isDiscoveryLike) {
     host.syncPlanFile();
@@ -2702,6 +2717,39 @@ async function runSetupSafe(runnerConfig, connection, callbacks, setupLog, effec
       () => void 0
     );
   }
+  const pullBranch = process.env.CONVEYOR_PULL_BRANCH;
+  if (pullBranch) {
+    pushSetupLog(setupLog, `[conveyor] Merging latest from ${pullBranch}...`);
+    connection.sendEvent({
+      type: "setup_output",
+      stream: "stdout",
+      data: `Merging latest from ${pullBranch}...
+`
+    });
+    try {
+      await runSetupCommand(
+        `git fetch origin ${pullBranch} && git merge origin/${pullBranch} --no-edit`,
+        runnerConfig.workspaceDir,
+        (stream, data) => {
+          connection.sendEvent({ type: "setup_output", stream, data });
+          for (const line of data.split("\n").filter(Boolean)) {
+            pushSetupLog(setupLog, `[${stream}] ${line}`);
+          }
+        }
+      );
+      pushSetupLog(setupLog, `[conveyor] Merge complete`);
+    } catch (error) {
+      const message = `Failed to merge ${pullBranch}: ${error instanceof Error ? error.message : "unknown error"}`;
+      connection.sendEvent({ type: "setup_error", message });
+      await callbacks.onEvent({ type: "setup_error", message });
+      connection.postChatMessage(
+        `Failed to merge latest code from \`${pullBranch}\`. There may be conflicts between the prebuild branch and dev.
+
+${message}`
+      );
+      return { ok: false, deferredStartConfig: null };
+    }
+  }
   const config = await loadConveyorConfig(runnerConfig.workspaceDir);
   if (!config) {
     connection.sendEvent({ type: "setup_complete" });
@@ -2850,6 +2898,7 @@ function buildQueryHost(deps) {
       deps.setPendingModeRestart(val);
     },
     sessionIds: deps.sessionIds,
+    activeQuery: null,
     isStopped: deps.isStopped,
     createInputStream: deps.createInputStream,
     snapshotPlanFiles: () => deps.planSync.snapshotPlanFiles(),
@@ -2867,6 +2916,7 @@ var AgentRunner = class {
   callbacks;
   _state = "connecting";
   stopped = false;
+  interrupted = false;
   inputResolver = null;
   pendingMessages = [];
   setupLog = [];
@@ -2884,6 +2934,7 @@ var AgentRunner = class {
   idleTimer = null;
   idleCheckInterval = null;
   deferredStartConfig = null;
+  _queryHost = null;
   constructor(config, callbacks) {
     this.config = config;
     this.connection = new ConveyorConnection(config);
@@ -2930,6 +2981,7 @@ var AgentRunner = class {
     await this.setState("connecting");
     await this.connection.connect();
     this.connection.onStopRequested(() => this.stop());
+    this.connection.onSoftStopRequested(() => this.softStop());
     this.connection.onChatMessage(
       (message) => this.injectHumanMessage(message.content, message.files)
     );
@@ -3072,9 +3124,17 @@ var AgentRunner = class {
       }
       if (this._state === "idle") {
         const msg = await this.waitForUserContent();
-        if (!msg) break;
+        if (!msg) {
+          if (this.interrupted && !this.stopped) {
+            this.interrupted = false;
+            continue;
+          }
+          break;
+        }
         await this.setState("running");
+        this.interrupted = false;
         await this.runQuerySafe(this.taskContext, msg);
+        if (this.interrupted) this.interrupted = false;
         if (!this.stopped && this._state !== "error") await this.setState("idle");
       } else if (this._state === "error") {
         await this.setState("idle");
@@ -3127,7 +3187,7 @@ var AgentRunner = class {
     this.clearIdleTimers();
     return new Promise((resolve2) => {
       this.idleCheckInterval = setInterval(() => {
-        if (this.stopped) {
+        if (this.stopped || this.interrupted) {
           this.clearIdleTimers();
           this.inputResolver = null;
           resolve2(null);
@@ -3167,7 +3227,7 @@ var AgentRunner = class {
     });
     yield makeUserMessage(initialPrompt);
     try {
-      while (!this.stopped) {
+      while (!this.stopped && !this.interrupted) {
         if (this.pendingMessages.length > 0) {
           const next = this.pendingMessages.shift();
           if (next) yield next;
@@ -3186,7 +3246,7 @@ var AgentRunner = class {
     }
   }
   asQueryHost() {
-    return buildQueryHost({
+    const host = buildQueryHost({
       config: this.config,
       connection: this.connection,
       callbacks: this.callbacks,
@@ -3204,12 +3264,14 @@ var AgentRunner = class {
       setPendingModeRestart: (val) => {
         this.pendingModeRestart = val;
       },
-      isStopped: () => this.stopped,
+      isStopped: () => this.stopped || this.interrupted,
       createInputStream: (prompt) => this.createInputStream(prompt),
       onModeTransition: (newMode) => {
         this.agentMode = newMode;
       }
     });
+    this._queryHost = host;
+    return host;
   }
   handleModeChange(newAgentMode) {
     if (this.config.mode !== "pm") return;
@@ -3224,6 +3286,21 @@ var AgentRunner = class {
       this.taskContext.status = "InProgress";
     }
   }
+  softStop() {
+    this.interrupted = true;
+    const host = this._queryHost;
+    if (host?.activeQuery) {
+      const q = host.activeQuery;
+      if (typeof q.interrupt === "function") {
+        void q.interrupt();
+      }
+      host.activeQuery = null;
+    }
+    if (this.inputResolver) {
+      this.inputResolver(null);
+      this.inputResolver = null;
+    }
+  }
   stop() {
     this.stopped = true;
     this.clearIdleTimers();
@@ -3696,4 +3773,4 @@ export {
   ProjectRunner,
   FileCache
 };
-//# sourceMappingURL=chunk-7Y3RP3ZA.js.map
+//# sourceMappingURL=chunk-XG5DMOJX.js.map