@rallycry/conveyor-agent 7.1.4 → 7.1.6

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

@@ -7,7 +7,7 @@ import {
   createHarness,
   createServiceLogger,
   defineTool
-} from "./chunk-U6AYNVS7.js";
+} from "./chunk-RRXX6DTB.js";
 
 // src/connection/agent-connection.ts
 import { io } from "socket.io-client";
@@ -37,7 +37,6 @@ var AgentConnection = class _AgentConnection {
   stopCallback = null;
   softStopCallback = null;
   modeChangeCallback = null;
-  wakeCallback = null;
   apiKeyUpdateCallback = null;
   constructor(config) {
     this.config = config;
@@ -119,15 +118,6 @@ var AgentConnection = class _AgentConnection {
         if (this.modeChangeCallback) this.modeChangeCallback(data);
         else this.earlyModeChanges.push(data);
       });
-      this.socket.on("session:wake", () => {
-        if (this.wakeCallback) {
-          this.wakeCallback();
-        } else if (this.messageCallback) {
-          this.messageCallback({ content: "", userId: "system" });
-        } else {
-          this.earlyMessages.push({ content: "", userId: "system" });
-        }
-      });
       this.socket.on(
         "session:answerQuestion",
         (data) => {
@@ -256,9 +246,6 @@ var AgentConnection = class _AgentConnection {
     for (const data of this.earlyModeChanges) callback(data);
     this.earlyModeChanges = [];
   }
-  onWake(callback) {
-    this.wakeCallback = callback;
-  }
   onApiKeyUpdate(callback) {
     this.apiKeyUpdateCallback = callback;
   }
@@ -319,8 +306,7 @@ var AgentConnection = class _AgentConnection {
       fetching_context: "active",
       connected: "active",
       connecting: "active",
-      idle: "idle",
-      sleeping: "idle"
+      idle: "idle"
     };
     const heartbeatStatus = statusMap[this.lastEmittedStatus ?? "idle"] ?? "active";
     void this.call("heartbeat", {
@@ -603,7 +589,6 @@ var ModeController = class {
 // src/runner/lifecycle.ts
 var DEFAULT_LIFECYCLE_CONFIG = {
   idleTimeoutMs: 30 * 60 * 1e3,
-  sleepGracePeriodMs: 5e3,
   heartbeatIntervalMs: 3e4
 };
 var Lifecycle = class {
@@ -612,15 +597,10 @@ var Lifecycle = class {
   heartbeatTimer = null;
   idleTimer = null;
   idleCheckInterval = null;
-  sleepShutdownTimer = null;
-  _isSleeping = false;
   constructor(config, callbacks) {
     this.config = config;
     this.callbacks = callbacks;
   }
-  get isSleeping() {
-    return this._isSleeping;
-  }
   // ── Heartbeat ──────────────────────────────────────────────────────
   startHeartbeat() {
     this.stopHeartbeat();
@@ -639,37 +619,11 @@ var Lifecycle = class {
     this.clearIdleTimers();
     this.idleTimer = setTimeout(() => {
       this.callbacks.onIdleTimeout();
-      this.enterSleepMode();
     }, this.config.idleTimeoutMs);
   }
   cancelIdleTimer() {
     this.clearIdleTimers();
   }
-  // ── Sleep mode ─────────────────────────────────────────────────────
-  enterSleepMode() {
-    this._isSleeping = true;
-    this.callbacks.onSleep();
-    this.sleepShutdownTimer = setTimeout(() => {
-      this.callbacks.onSleepGraceExpired();
-    }, this.config.sleepGracePeriodMs);
-  }
-  /** Wake from sleep — cancels shutdown timer, resets idle */
-  wake() {
-    if (this.sleepShutdownTimer) {
-      clearTimeout(this.sleepShutdownTimer);
-      this.sleepShutdownTimer = null;
-    }
-    this._isSleeping = false;
-    this.callbacks.onWake();
-  }
-  /** Cancel the sleep shutdown timer (e.g. when a message arrives) */
-  cancelSleepShutdown() {
-    if (this.sleepShutdownTimer) {
-      clearTimeout(this.sleepShutdownTimer);
-      this.sleepShutdownTimer = null;
-    }
-    this._isSleeping = false;
-  }
   // ── Cleanup ────────────────────────────────────────────────────────
   destroy() {
     this.stopHeartbeat();
@@ -685,11 +639,6 @@ var Lifecycle = class {
       clearInterval(this.idleCheckInterval);
       this.idleCheckInterval = null;
     }
-    if (this.sleepShutdownTimer) {
-      clearTimeout(this.sleepShutdownTimer);
-      this.sleepShutdownTimer = null;
-    }
-    this._isSleeping = false;
   }
 };
 
@@ -974,6 +923,9 @@ var PlanSync = class {
   }
 };
 
+// src/execution/query-executor.ts
+import { createHash } from "crypto";
+
 // src/execution/pack-runner-prompt.ts
 function findLastAgentMessageIndex(history) {
   for (let i = history.length - 1; i >= 0; i--) {
@@ -5069,6 +5021,10 @@ function buildHooks(host) {
     ]
   };
 }
+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 isReadOnlyMode(mode, hasExitedPlanMode) {
   return mode === "discovery" || mode === "help" || mode === "auto" && !hasExitedPlanMode;
 }
@@ -5117,6 +5073,7 @@ 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() });
     }
@@ -5190,7 +5147,7 @@ async function runSdkQuery(host, context, followUpContent) {
     host.snapshotPlanFiles();
   }
   const options = buildQueryOptions(host, context);
-  const resume = context.claudeSessionId ?? void 0;
+  const resume = taskIdToSessionUuid(context.taskId);
   if (followUpContent) {
     const prompt = await buildFollowUpPrompt(host, context, followUpContent);
     const agentQuery = host.harness.executeQuery({
@@ -5637,24 +5594,13 @@ var SessionRunner = class _SessionRunner {
     this.lifecycle = new Lifecycle(lifecycleConfig, {
       onHeartbeat: () => this.connection.sendHeartbeat(),
       onIdleTimeout: () => {
-        process.stderr.write("[conveyor-agent] Idle timeout reached, entering sleep\n");
-        this.connection.emitStatus("sleeping");
-      },
-      onSleep: () => {
-        process.stderr.write("[conveyor-agent] Sleep mode active\n");
-        this.connection.postChatMessage("Agent sleeping \u2014 send a message or click Resume to wake.");
-      },
-      onSleepGraceExpired: () => {
+        process.stderr.write("[conveyor-agent] Idle timeout reached, stopping agent\n");
         this.stopped = true;
         if (this.inputResolver) {
           const resolver = this.inputResolver;
           this.inputResolver = null;
           resolver(null);
         }
-      },
-      onWake: () => {
-        process.stderr.write("[conveyor-agent] Woken from sleep\n");
-        this.lifecycle.cancelSleepShutdown();
       }
     });
   }
@@ -5822,7 +5768,6 @@ var SessionRunner = class _SessionRunner {
   }
   /** Inject a message (from connection callback or external source) */
   injectMessage(msg) {
-    this.lifecycle.cancelSleepShutdown();
     if (this.inputResolver) {
       const resolve2 = this.inputResolver;
       this.inputResolver = null;
@@ -6039,11 +5984,13 @@ var SessionRunner = class _SessionRunner {
         if (this.fullContext && action.newMode === "review") {
           this.fullContext.claudeSessionId = null;
         }
+        if (this.fullContext && action.newMode === "building") {
+          void this.refreshBranchForBuilding();
+        }
         this.connection.emitModeChanged(action.newMode);
         this.softStop();
       }
     });
-    this.connection.onWake(() => this.lifecycle.wake());
     this.connection.onApiKeyUpdate((data) => {
       if (data.isSubscription) {
         process.env.CLAUDE_CODE_OAUTH_TOKEN = data.apiKey;
@@ -6054,6 +6001,23 @@ var SessionRunner = class _SessionRunner {
       }
     });
   }
+  /** Re-fetch task context to pick up a newly created branch and check it out. */
+  async refreshBranchForBuilding() {
+    try {
+      const ctx = await this.connection.call("getTaskContext", {
+        sessionId: this.sessionId,
+        includeHistory: false
+      });
+      if (ctx?.githubBranch && this.fullContext) {
+        this.fullContext.githubBranch = ctx.githubBranch;
+        ensureOnTaskBranch(this.config.workspaceDir, ctx.githubBranch);
+      }
+    } catch {
+      process.stderr.write(
+        "[conveyor-agent] Warning: failed to refresh branch for building transition\n"
+      );
+    }
+  }
   async setState(status) {
     this._state = status;
     await this.connection.emitStatus(status);
@@ -6066,6 +6030,12 @@ var SessionRunner = class _SessionRunner {
     this.lifecycle.destroy();
     await this.setState(finalState);
     this.connection.disconnect();
+    this._finalState = finalState;
+  }
+  _finalState = null;
+  /** The final status after run() completes. Use to determine exit code. */
+  get finalState() {
+    return this._finalState;
   }
   logInitialization() {
     const context = {
@@ -7109,7 +7079,7 @@ var ProjectRunner = class {
   async handleAuditTags(request) {
     this.connection.emitStatus("busy");
     try {
-      const { handleTagAudit } = await import("./tag-audit-handler-BM6MMS5T.js");
+      const { handleTagAudit } = await import("./tag-audit-handler-WPGSBNXO.js");
       await handleTagAudit(request, this.connection, this.projectDir);
     } catch (error) {
       const msg = error instanceof Error ? error.message : String(error);
@@ -7132,7 +7102,7 @@ var ProjectRunner = class {
   async handleAuditTasks(request) {
     this.connection.emitStatus("busy");
     try {
-      const { handleTaskAudit } = await import("./task-audit-handler-URD2BOC4.js");
+      const { handleTaskAudit } = await import("./task-audit-handler-AOYSFO5B.js");
       await handleTaskAudit(request, this.connection, this.projectDir);
     } catch (error) {
       const msg = error instanceof Error ? error.message : String(error);
@@ -7572,4 +7542,4 @@ export {
   loadForwardPorts,
   loadConveyorConfig
 };
-//# sourceMappingURL=chunk-H2GKXPFI.js.map
+//# sourceMappingURL=chunk-6EJDKTIE.js.map