@rallycry/conveyor-agent 7.0.2 → 7.0.3

package/dist/{chunk-NZ3IPMLO.js → chunk-L7ZH423N.js}

@@ -141,25 +141,7 @@ var AgentConnection = class {
       });
       this.socket.io.on("reconnect", () => {
         process.stderr.write("[conveyor-agent] Reconnected\n");
-        this.call("connectAgent", { sessionId: this.config.sessionId }).then(({ pendingMessages }) => {
-          for (const msg of pendingMessages) {
-            if (msg.content) {
-              if (this.messageCallback) {
-                this.messageCallback({ content: msg.content, userId: msg.userId });
-              } else {
-                this.earlyMessages.push({ content: msg.content, userId: msg.userId });
-              }
-            }
-          }
-        }).catch(() => {
-        });
-        if (this.lastEmittedStatus) {
-          void this.call("reportAgentStatus", {
-            sessionId: this.config.sessionId,
-            status: this.lastEmittedStatus
-          }).catch(() => {
-          });
-        }
+        void this.reconnectToSession();
       });
       this.socket.io.on("reconnect_attempt", () => {
       });
@@ -174,6 +156,53 @@ var AgentConnection = class {
       this.socket = null;
     }
   }
+  // ── Reconnect with retry ────────────────────────────────────────────
+  async reconnectToSession() {
+    const maxRetries = 5;
+    const baseDelayMs = 2e3;
+    for (let attempt = 1; attempt <= maxRetries; attempt++) {
+      try {
+        const { pendingMessages } = await this.call("connectAgent", {
+          sessionId: this.config.sessionId
+        });
+        this.drainPendingMessages(pendingMessages);
+        process.stderr.write("[conveyor-agent] Reconnected to session successfully\n");
+        if (this.lastEmittedStatus) {
+          void this.call("reportAgentStatus", {
+            sessionId: this.config.sessionId,
+            status: this.lastEmittedStatus
+          }).catch(() => {
+          });
+        }
+        return;
+      } catch (err) {
+        const errMsg = err instanceof Error ? err.message : String(err);
+        const delayMs = baseDelayMs * 2 ** (attempt - 1);
+        process.stderr.write(
+          `[conveyor-agent] connectAgent failed (attempt ${attempt}/${maxRetries}): ${errMsg} \u2014 retrying in ${delayMs / 1e3}s
+`
+        );
+        await new Promise((resolve2) => {
+          setTimeout(resolve2, delayMs);
+        });
+      }
+    }
+    process.stderr.write(
+      `[conveyor-agent] Failed to reconnect to session after ${maxRetries} attempts, exiting
+`
+    );
+    process.exit(1);
+  }
+  drainPendingMessages(messages) {
+    for (const msg of messages) {
+      if (!msg.content) continue;
+      if (this.messageCallback) {
+        this.messageCallback({ content: msg.content, userId: msg.userId });
+      } else {
+        this.earlyMessages.push({ content: msg.content, userId: msg.userId });
+      }
+    }
+  }
   // ── Callback registration with early-buffer draining ───────────────
   onMessage(callback) {
     this.messageCallback = callback;
@@ -2305,6 +2334,7 @@ Co-Authored-By: Claude Sonnet 4 <noreply@anthropic.com>`;
           }
         }
         const result = await connection.call("createPullRequest", {
+          sessionId: connection.sessionId,
           title,
           body,
           head: branch,
@@ -4657,6 +4687,9 @@ function handleAutoToolAccess(toolName, input, hasExitedPlanMode, isParentTask)
   return { behavior: "allow", updatedInput: input };
 }
 async function handleExitPlanMode(host, input) {
+  if (host.hasExitedPlanMode) {
+    return { behavior: "allow", updatedInput: input };
+  }
   try {
     host.syncPlanFile();
     const taskProps = await host.connection.getTaskProperties();
@@ -5223,6 +5256,8 @@ var QueryBridge = class {
       const msg = err instanceof Error ? err.message : String(err);
       logger2.error("Query execution failed", { error: msg });
       this.connection.sendEvent({ type: "error", message: msg });
+    } finally {
+      this.mode.pendingModeRestart = false;
     }
   }
   // ── QueryHost construction ──────────────────────────────────────────
@@ -5431,6 +5466,7 @@ var SessionRunner = class _SessionRunner {
         if (!this.stopped && this.pendingMessages.length === 0) {
           await this.maybeSendPRNudge();
         }
+        this.hasCompleted = true;
         if (!this.stopped) await this.setState("idle");
       } else if (this._state === "error") {
         await this.setState("idle");
@@ -6624,7 +6660,7 @@ var ProjectRunner = class {
   }
   // ── Event wiring ───────────────────────────────────────────────────────
   wireEventHandlers() {
-    this.connection.onTaskAssignment((assignment) => this.handleAssignment(assignment));
+    this.connection.onTaskAssignment((assignment) => void this.handleAssignment(assignment));
     this.connection.onStopTask((data) => this.handleStopTask(data.taskId));
     this.connection.onShutdown(() => void this.stop());
     this.connection.onChatMessage((msg) => {
@@ -6682,13 +6718,42 @@ var ProjectRunner = class {
     }
   }
   // ── Task management ────────────────────────────────────────────────────
-  handleAssignment(assignment) {
+  async killAgent(agent, taskId) {
+    const shortId = taskId.slice(0, 8);
+    if (agent.process.exitCode !== null) {
+      logger6.info("Agent process already exited", { taskId: shortId });
+      return;
+    }
+    logger6.info("Killing agent process", { taskId: shortId });
+    agent.process.kill("SIGTERM");
+    await new Promise((resolve2) => {
+      const timer = setTimeout(() => {
+        if (agent.process.exitCode === null) {
+          logger6.warn("Agent did not exit after SIGTERM, sending SIGKILL", { taskId: shortId });
+          agent.process.kill("SIGKILL");
+        }
+        resolve2();
+      }, STOP_TIMEOUT_MS);
+      agent.process.on("exit", () => {
+        clearTimeout(timer);
+        resolve2();
+      });
+    });
+  }
+  // oxlint-disable-next-line max-lines-per-function -- re-assignment logic requires sequential checks
+  async handleAssignment(assignment) {
     const { taskId, mode } = assignment;
     const shortId = taskId.slice(0, 8);
     const agentKey = assignment.agentMode === "code-review" ? `${taskId}:code-review` : taskId;
-    if (this.activeAgents.has(agentKey)) {
-      logger6.info("Task already running, skipping", { taskId: shortId });
-      return;
+    const existing = this.activeAgents.get(agentKey);
+    if (existing) {
+      if (existing.process.exitCode === null) {
+        logger6.info("Re-assignment received, killing existing agent", { taskId: shortId });
+        await this.killAgent(existing, taskId);
+      } else {
+        logger6.info("Stale agent entry (process already exited), cleaning up", { taskId: shortId });
+      }
+      this.activeAgents.delete(agentKey);
     }
     if (this.activeAgents.size >= MAX_CONCURRENT) {
       logger6.warn("Max concurrent agents reached", { maxConcurrent: MAX_CONCURRENT });
@@ -6730,16 +6795,11 @@ var ProjectRunner = class {
     }
   }
   handleStopTask(taskId) {
-    let agent = this.activeAgents.get(taskId);
-    if (!agent) agent = this.activeAgents.get(`${taskId}:code-review`);
+    const agentKey = this.activeAgents.has(taskId) ? taskId : `${taskId}:code-review`;
+    const agent = this.activeAgents.get(agentKey);
     if (!agent) return;
     logger6.info("Stopping task", { taskId: taskId.slice(0, 8) });
-    agent.process.kill("SIGTERM");
-    const timer = setTimeout(() => {
-      if (this.activeAgents.has(taskId)) agent.process.kill("SIGKILL");
-    }, STOP_TIMEOUT_MS);
-    agent.process.on("exit", () => {
-      clearTimeout(timer);
+    void this.killAgent(agent, taskId).then(() => {
       if (agent.usesWorktree) {
         try {
           removeWorktree(this.projectDir, taskId);
@@ -7027,4 +7087,4 @@ export {
   removeWorktree,
   ProjectRunner
 };
-//# sourceMappingURL=chunk-NZ3IPMLO.js.map
+//# sourceMappingURL=chunk-L7ZH423N.js.map