@rallycry/conveyor-agent 7.0.6 → 7.0.8

package/dist/{chunk-3H2FXJFD.js → chunk-PMDVB2EU.js}

@@ -15,6 +15,8 @@ var AgentConnection = class _AgentConnection {
   eventBuffer = [];
   flushTimer = null;
   lastEmittedStatus = null;
+  // Pending answer resolvers for askUserQuestion room-event fallback
+  pendingAnswerResolvers = /* @__PURE__ */ new Map();
   // Dedup: suppress near-identical messages within a short window
   recentMessages = [];
   static DEDUP_WINDOW_MS = 3e4;
@@ -114,6 +116,13 @@ var AgentConnection = class _AgentConnection {
           this.earlyMessages.push({ content: "", userId: "system" });
         }
       });
+      this.socket.on(
+        "session:answerQuestion",
+        (data) => {
+          const resolver = this.pendingAnswerResolvers.get(data.requestId);
+          if (resolver) resolver(data.answers);
+        }
+      );
       this.socket.on("agentRunner:updateApiKey", (data) => {
         if (this.apiKeyUpdateCallback) this.apiKeyUpdateCallback(data);
       });
@@ -267,7 +276,7 @@ var AgentConnection = class _AgentConnection {
       (m) => now - m.timestamp < _AgentConnection.DEDUP_WINDOW_MS
     );
     const words = new Set(
-      content.toLowerCase().split(/\s+/).filter((w) => w.length >= 3)
+      content.toLowerCase().replace(/[^\w\s]/g, "").split(/\s+/).filter((w) => w.length >= 3)
     );
     if (words.size === 0) return false;
     for (const recent of this.recentMessages) {
@@ -364,13 +373,20 @@ var AgentConnection = class _AgentConnection {
 ${q.question}${q.options.length ? "\n" + q.options.map((o) => `- ${o.label}: ${o.description}`).join("\n") : ""}`
     ).join("\n\n");
     const requestId = crypto.randomUUID();
-    const { answers } = await this.call("askUserQuestion", {
+    const roomEventPromise = new Promise((resolve2) => {
+      this.pendingAnswerResolvers.set(requestId, resolve2);
+    });
+    const rpcPromise = this.call("askUserQuestion", {
       sessionId: this.config.sessionId,
       question: questionText,
       requestId,
       questions
-    });
-    return answers;
+    }).then((res) => res.answers);
+    try {
+      return await Promise.race([rpcPromise, roomEventPromise]);
+    } finally {
+      this.pendingAnswerResolvers.delete(requestId);
+    }
   }
   // ── Typed service method wrappers ───────────────────────────────────
   getTaskProperties() {
@@ -4957,7 +4973,7 @@ async function handleExitPlanMode(host, input) {
       host.connection.postChatMessage(
         "Plan complete. The task stays in Planning \u2014 identify it or switch to Build mode when ready."
       );
-      host.requestStop();
+      host.requestSoftStop();
       return { behavior: "allow", updatedInput: input };
     }
     await host.connection.triggerIdentification();
@@ -5000,6 +5016,7 @@ async function handleAskUserQuestion(host, input) {
   return { behavior: "allow", updatedInput: { questions: input.questions, answers } };
 }
 var DENIAL_WARNING_THRESHOLD = 3;
+var DENIAL_FORCE_STOP_THRESHOLD = 8;
 function isResourceHeavyCommand(command) {
   return RESOURCE_HEAVY_PATTERNS.some((p) => p.test(command));
 }
@@ -5048,6 +5065,12 @@ function buildCanUseTool(host) {
           `\u26A0\uFE0F Multiple tool denials detected. You are in ${host.agentMode} mode \u2014 file writes outside .claude/plans/ are not permitted. Focus on creating a plan instead of implementing code changes.`
         );
       }
+      if (consecutiveDenials >= DENIAL_FORCE_STOP_THRESHOLD) {
+        host.connection.postChatMessage(
+          `Agent force-stopped after ${DENIAL_FORCE_STOP_THRESHOLD} consecutive tool denials. The agent appears stuck \u2014 send a message to resume.`
+        );
+        host.requestStop();
+      }
     } else {
       consecutiveDenials = 0;
     }
@@ -5485,6 +5508,8 @@ var QueryBridge = class {
   _abortController = null;
   /** Called by SessionRunner when ExitPlanMode triggers a mode transition. */
   onModeTransition;
+  /** Called by tool handlers to soft-stop (abort query, keep session alive). */
+  onSoftStop;
   get isStopped() {
     return this._stopped;
   }
@@ -5568,6 +5593,9 @@ var QueryBridge = class {
       },
       isStopped: () => bridge._stopped,
       requestStop: () => bridge.stop(),
+      requestSoftStop: () => {
+        if (bridge.onSoftStop) bridge.onSoftStop();
+      },
       createInputStream: (prompt) => bridge.createInputStream(prompt),
       snapshotPlanFiles: () => bridge.planSync.snapshotPlanFiles(),
       syncPlanFile: () => bridge.planSync.syncPlanFile(),
@@ -5643,8 +5671,12 @@ var SessionRunner = class _SessionRunner {
     return this.stopped;
   }
   // ── Main lifecycle ─────────────────────────────────────────────────
-  // oxlint-disable-next-line max-lines-per-function, complexity -- lifecycle orchestration is inherently sequential
-  async start() {
+  /**
+   * Establish the API connection, wire callbacks, and join the session room.
+   * Call this before run() when you need to send events (e.g. setup/start
+   * command output) before the main agent lifecycle begins.
+   */
+  async connect() {
     await this.setState("connecting");
     await this.connection.connect();
     await this.setState("connected");
@@ -5659,6 +5691,13 @@ var SessionRunner = class _SessionRunner {
         this.pendingMessages.push({ content: msg.content, userId: msg.userId });
       }
     }
+  }
+  /**
+   * Run the main agent lifecycle: fetch context, resolve mode, execute, loop.
+   * Requires connect() to have been called first.
+   */
+  // oxlint-disable-next-line max-lines-per-function, complexity -- lifecycle orchestration is inherently sequential
+  async run() {
     await this.setState("fetching_context");
     try {
       const ctx = await this.connection.call("getTaskContext", {
@@ -5706,6 +5745,11 @@ var SessionRunner = class _SessionRunner {
     }
     await this.shutdown("finished");
   }
+  /** Convenience wrapper: connect() then run(). */
+  async start() {
+    await this.connect();
+    await this.run();
+  }
   // ── Core loop ──────────────────────────────────────────────────────
   async coreLoop() {
     while (!this.stopped) {
@@ -5863,7 +5907,7 @@ var SessionRunner = class _SessionRunner {
   async maybeSendPRNudge() {
     await this.refreshTaskContext();
     if (!this.needsPRNudge()) return;
-    while (!this.stopped && this.needsPRNudge()) {
+    while (!this.stopped && !this.interrupted && this.needsPRNudge()) {
       this.prNudgeCount++;
       if (this.prNudgeCount > _SessionRunner.MAX_PR_NUDGES) {
         this.connection.postChatMessage(
@@ -5878,6 +5922,7 @@ var SessionRunner = class _SessionRunner {
       this.connection.postChatMessage(chatMsg);
       await this.setState("running");
       await this.callbacks.onEvent({ type: "pr_nudge", prompt });
+      if (this.interrupted || this.stopped) return;
       await this.executeQuery(prompt);
       if (this.interrupted || this.stopped) return;
       await this.refreshTaskContext();
@@ -5950,6 +5995,10 @@ var SessionRunner = class _SessionRunner {
       this.config.workspaceDir
     );
     bridge.isParentTask = this.fullContext?.isParentTask ?? false;
+    bridge.onSoftStop = () => {
+      process.stderr.write("[conveyor-agent] Soft stop requested (discovery ExitPlanMode)\n");
+      this.softStop();
+    };
     bridge.onModeTransition = (newMode) => {
       const oldMode = this.mode.effectiveMode;
       process.stderr.write(`[conveyor-agent] Mode transition: ${oldMode} \u2192 ${newMode}
@@ -6814,6 +6863,8 @@ function spawnChildAgent(assignment, workDir) {
   const childEnv = { ...process.env };
   delete childEnv.CONVEYOR_PROJECT_TOKEN;
   delete childEnv.CONVEYOR_PROJECT_ID;
+  delete childEnv.CONVEYOR_SETUP_COMMAND;
+  delete childEnv.CONVEYOR_START_COMMAND;
   const effectiveAgentMode = agentMode ?? (isAuto ? "auto" : "");
   const effectiveApiUrl = apiUrl || process.env.CONVEYOR_API_URL || "";
   if (!effectiveApiUrl) {
@@ -7427,4 +7478,4 @@ export {
   loadForwardPorts,
   loadConveyorConfig
 };
-//# sourceMappingURL=chunk-3H2FXJFD.js.map
+//# sourceMappingURL=chunk-PMDVB2EU.js.map