@rallycry/conveyor-agent 4.9.3 → 4.10.1

package/dist/{chunk-ACPWJ2SL.js → chunk-XRB3VPXH.js}

@@ -638,6 +638,12 @@ import { randomUUID as randomUUID2 } from "crypto";
 import { execSync as execSync3 } from "child_process";
 
 // src/execution/event-processor.ts
+function epochSecondsToISO(value) {
+  if (typeof value === "string") return value;
+  if (typeof value !== "number" || value <= 0) return void 0;
+  const ms = value < 1e12 ? value * 1e3 : value;
+  return new Date(ms).toISOString();
+}
 async function processAssistantEvent(event, host, turnToolCalls) {
   const { content } = event.message;
   const turnTextParts = [];
@@ -675,50 +681,46 @@ function isRetriableMessage(msg) {
   if (API_ERROR_PATTERN.test(msg)) return true;
   return false;
 }
-function handleSuccessResult(event, host, context, startTime) {
-  const durationMs = Date.now() - startTime;
-  const summary = event.result || "Task completed.";
-  const retriable = isRetriableMessage(summary);
-  const cumulativeTotal = host.costTracker.addQueryCost(event.total_cost_usd);
-  const { modelUsage } = event;
-  if (modelUsage && typeof modelUsage === "object") {
-    host.costTracker.addModelUsage(modelUsage);
+function aggregateModelUsage(modelUsage) {
+  let queryInputTokens = 0;
+  let contextWindow = 0;
+  let totalInputTokens = 0;
+  let totalCacheRead = 0;
+  let totalCacheCreation = 0;
+  for (const data of Object.values(modelUsage)) {
+    const d = data;
+    const input = d.inputTokens ?? 0;
+    const cacheRead = d.cacheReadInputTokens ?? 0;
+    const cacheCreation = d.cacheCreationInputTokens ?? 0;
+    totalInputTokens += input;
+    totalCacheRead += cacheRead;
+    totalCacheCreation += cacheCreation;
+    queryInputTokens += input + cacheRead + cacheCreation;
+    const cw = data.contextWindow ?? 0;
+    if (cw > contextWindow) contextWindow = cw;
+  }
+  return { queryInputTokens, contextWindow, totalInputTokens, totalCacheRead, totalCacheCreation };
+}
+function emitContextUpdate(modelUsage, host, context) {
+  const usage = aggregateModelUsage(modelUsage);
+  let { contextWindow } = usage;
+  const settings = context.agentSettings ?? host.config.agentSettings ?? {};
+  const has1mBeta = settings.betas?.includes("context-1m-2025-08-07");
+  if (has1mBeta && contextWindow > 0 && contextWindow <= 2e5) {
+    contextWindow = 1e6;
   }
-  host.connection.sendEvent({ type: "completed", summary, costUsd: cumulativeTotal, durationMs });
-  if (modelUsage && typeof modelUsage === "object") {
-    let queryInputTokens = 0;
-    let contextWindow = 0;
-    let totalInputTokens = 0;
-    let totalCacheRead = 0;
-    let totalCacheCreation = 0;
-    for (const data of Object.values(modelUsage)) {
-      const d = data;
-      const input = d.inputTokens ?? 0;
-      const cacheRead = d.cacheReadInputTokens ?? 0;
-      const cacheCreation = d.cacheCreationInputTokens ?? 0;
-      totalInputTokens += input;
-      totalCacheRead += cacheRead;
-      totalCacheCreation += cacheCreation;
-      queryInputTokens += input + cacheRead + cacheCreation;
-      const cw = data.contextWindow ?? 0;
-      if (cw > contextWindow) contextWindow = cw;
-    }
-    const settings = context.agentSettings ?? host.config.agentSettings ?? {};
-    const has1mBeta = settings.betas?.includes("context-1m-2025-08-07");
-    if (has1mBeta && contextWindow > 0 && contextWindow <= 2e5) {
-      contextWindow = 1e6;
-    }
-    if (contextWindow > 0) {
-      host.connection.sendEvent({
-        type: "context_update",
-        contextTokens: queryInputTokens,
-        contextWindow,
-        inputTokens: totalInputTokens,
-        cacheReadInputTokens: totalCacheRead,
-        cacheCreationInputTokens: totalCacheCreation
-      });
-    }
+  if (contextWindow > 0) {
+    host.connection.sendEvent({
+      type: "context_update",
+      contextTokens: usage.queryInputTokens,
+      contextWindow,
+      inputTokens: usage.totalInputTokens,
+      cacheReadInputTokens: usage.totalCacheRead,
+      cacheCreationInputTokens: usage.totalCacheCreation
+    });
   }
+}
+function trackCostSpending(host, context, cumulativeTotal) {
   if (cumulativeTotal > 0 && context.agentId && context._runnerSessionId) {
     const breakdown = host.costTracker.modelBreakdown;
     host.connection.trackSpending({
@@ -729,6 +731,21 @@ function handleSuccessResult(event, host, context, startTime) {
       modelUsage: breakdown.length > 0 ? breakdown : void 0
     });
   }
+}
+function handleSuccessResult(event, host, context, startTime) {
+  const durationMs = Date.now() - startTime;
+  const summary = event.result || "Task completed.";
+  const retriable = isRetriableMessage(summary);
+  const cumulativeTotal = host.costTracker.addQueryCost(event.total_cost_usd);
+  const { modelUsage } = event;
+  if (modelUsage && typeof modelUsage === "object") {
+    host.costTracker.addModelUsage(modelUsage);
+  }
+  host.connection.sendEvent({ type: "completed", summary, costUsd: cumulativeTotal, durationMs });
+  if (modelUsage && typeof modelUsage === "object") {
+    emitContextUpdate(modelUsage, host, context);
+  }
+  trackCostSpending(host, context, cumulativeTotal);
   return { totalCostUsd: cumulativeTotal, retriable };
 }
 function handleErrorResult(event, host) {
@@ -768,7 +785,7 @@ async function emitResultEvent(event, host, context, startTime) {
 function handleRateLimitEvent(event, host) {
   const { rate_limit_info } = event;
   const status = rate_limit_info.status;
-  if (rate_limit_info.utilization != null && rate_limit_info.rateLimitType) {
+  if (rate_limit_info.utilization !== void 0 && rate_limit_info.rateLimitType) {
     host.connection.sendEvent({
       type: "rate_limit_update",
       rateLimitType: rate_limit_info.rateLimitType,
@@ -777,7 +794,7 @@ function handleRateLimitEvent(event, host) {
     });
   }
   if (status === "rejected") {
-    const resetsAt = rate_limit_info.resetsAt ? new Date(rate_limit_info.resetsAt).toISOString() : void 0;
+    const resetsAt = epochSecondsToISO(rate_limit_info.resetsAt);
     const resetsAtDisplay = resetsAt ?? "unknown";
     const message = `Rate limit rejected (type: ${rate_limit_info.rateLimitType ?? "unknown"}, resets at: ${resetsAtDisplay})`;
     host.connection.sendEvent({ type: "error", message });
@@ -791,6 +808,18 @@ function handleRateLimitEvent(event, host) {
   }
   return void 0;
 }
+async function handleSystemEvent(event, host, context, sessionIdStored) {
+  if (event.subtype !== "init") return false;
+  if (event.session_id && !sessionIdStored) {
+    host.connection.storeSessionId(event.session_id);
+    context.claudeSessionId = event.session_id;
+  }
+  await host.callbacks.onEvent({
+    type: "thinking",
+    message: `Agent initialized (model: ${event.model})`
+  });
+  return !!(event.session_id && !sessionIdStored);
+}
 async function processEvents(events, context, host) {
   const startTime = Date.now();
   let sessionIdStored = false;
@@ -810,17 +839,8 @@ async function processEvents(events, context, host) {
     switch (event.type) {
       case "system": {
         const systemEvent = event;
-        if (systemEvent.subtype === "init") {
-          if (systemEvent.session_id && !sessionIdStored) {
-            sessionIdStored = true;
-            host.connection.storeSessionId(systemEvent.session_id);
-            context.claudeSessionId = systemEvent.session_id;
-          }
-          await host.callbacks.onEvent({
-            type: "thinking",
-            message: `Agent initialized (model: ${systemEvent.model})`
-          });
-        }
+        const stored = await handleSystemEvent(systemEvent, host, context, sessionIdStored);
+        if (stored) sessionIdStored = true;
         break;
       }
       case "assistant": {
@@ -1021,42 +1041,73 @@ function buildPropertyInstructions(context) {
   }
   return parts;
 }
+function buildDiscoveryPrompt(context) {
+  const parts = [
+    `
+## Mode: Discovery`,
+    `You are in Discovery mode \u2014 helping plan and scope this task.`,
+    `- You have read-only codebase access (can read files, run git commands, search code)`,
+    `- You can write plan files in .claude/plans/ only \u2014 no other file writes`,
+    `- You can create and manage subtasks`,
+    `- Goal: collaborate with the user to create a clear plan`,
+    `- Proactively fill task properties (SP, tags, icon) as the plan takes shape`,
+    ``,
+    `### Self-Identification Tools`,
+    `Use these MCP tools to set your own task properties:`,
+    `- \`update_task\` \u2014 save your plan and description`,
+    `- \`set_story_points\` \u2014 assign story points`,
+    `- \`set_task_title\` \u2014 set an accurate title`,
+    `- \`set_task_tags\` \u2014 categorize the work`,
+    `- \`set_task_icon\` / \`generate_task_icon\` \u2014 set a task icon (call \`list_icons\` first)`,
+    ``,
+    `### Self-Update vs Subtasks`,
+    `- If the work fits in a single task (1-3 SP), update YOUR OWN plan and properties \u2014 do not create subtasks`,
+    `- Only create subtasks when the work genuinely requires multiple independent pieces (e.g., Pack-tier work, 8+ SP)`,
+    ``,
+    `### Finishing Planning`,
+    `Once your plan is complete and all required properties are set, call the **ExitPlanMode** tool.`,
+    `- Required before ExitPlanMode will succeed: **plan** (via update_task), **story points** (via set_story_points), **title** (via set_task_title)`,
+    `- ExitPlanMode validates these properties and moves the task to Open status`,
+    `- It does NOT start building \u2014 the team controls when to switch to Build mode`
+  ];
+  if (context) parts.push(...buildPropertyInstructions(context));
+  return parts.join("\n");
+}
+function buildAutoPrompt(context) {
+  const parts = [
+    `
+## Mode: Auto`,
+    `You are in Auto mode \u2014 operating autonomously through planning \u2192 building \u2192 PR.`,
+    ``,
+    `### Phase 1: Discovery & Planning (current)`,
+    `- You have read-only codebase access (can read files, run git commands, search code)`,
+    `- You can write plan files in .claude/plans/ only \u2014 no other file writes`,
+    `- You have MCP tools for task properties: update_task, set_story_points, set_task_tags, set_task_icon, set_task_title`,
+    ``,
+    `### Required before transitioning:`,
+    `Before calling ExitPlanMode, you MUST fill in ALL of these:`,
+    `1. **Plan** \u2014 Save a clear implementation plan using update_task`,
+    `2. **Story Points** \u2014 Assign via set_story_points`,
+    `3. **Title** \u2014 Set an accurate title via set_task_title (if the current one is vague or "Untitled")`,
+    ``,
+    `### Transitioning to Building:`,
+    `When your plan is complete and all required properties are set, call the **ExitPlanMode** tool.`,
+    `- If any required properties are missing, ExitPlanMode will be denied with details on what's missing`,
+    `- Once ExitPlanMode succeeds, the system will automatically restart your session in Building mode with the appropriate model`,
+    `- You do NOT need to do anything after calling ExitPlanMode \u2014 the transition is handled for you`,
+    ``,
+    `### Autonomous Guidelines:`,
+    `- Make decisions independently \u2014 do not ask the team for approval at each step`,
+    `- Only escalate when genuinely blocked (ambiguous requirements, missing access, conflicting instructions)`,
+    `- Be thorough in discovery: read relevant files, understand the codebase architecture, then plan`
+  ];
+  if (context) parts.push(...buildPropertyInstructions(context));
+  return parts.join("\n");
+}
 function buildModePrompt(agentMode, context) {
   switch (agentMode) {
-    case "discovery": {
-      const parts = [
-        `
-## Mode: Discovery`,
-        `You are in Discovery mode \u2014 helping plan and scope this task.`,
-        `- You have read-only codebase access (can read files, run git commands, search code)`,
-        `- You can write plan files in .claude/plans/ only \u2014 no other file writes`,
-        `- You can create and manage subtasks`,
-        `- Goal: collaborate with the user to create a clear plan`,
-        `- Proactively fill task properties (SP, tags, icon) as the plan takes shape`,
-        ``,
-        `### Self-Identification Tools`,
-        `Use these MCP tools to set your own task properties:`,
-        `- \`update_task\` \u2014 save your plan and description`,
-        `- \`set_story_points\` \u2014 assign story points`,
-        `- \`set_task_title\` \u2014 set an accurate title`,
-        `- \`set_task_tags\` \u2014 categorize the work`,
-        `- \`set_task_icon\` / \`generate_task_icon\` \u2014 set a task icon (call \`list_icons\` first)`,
-        ``,
-        `### Self-Update vs Subtasks`,
-        `- If the work fits in a single task (1-3 SP), update YOUR OWN plan and properties \u2014 do not create subtasks`,
-        `- Only create subtasks when the work genuinely requires multiple independent pieces (e.g., Pack-tier work, 8+ SP)`,
-        ``,
-        `### Finishing Planning`,
-        `Once your plan is complete and all required properties are set, call the **ExitPlanMode** tool.`,
-        `- Required before ExitPlanMode will succeed: **plan** (via update_task), **story points** (via set_story_points), **title** (via set_task_title)`,
-        `- ExitPlanMode validates these properties and moves the task to Open status`,
-        `- It does NOT start building \u2014 the team controls when to switch to Build mode`
-      ];
-      if (context) {
-        parts.push(...buildPropertyInstructions(context));
-      }
-      return parts.join("\n");
-    }
+    case "discovery":
+      return buildDiscoveryPrompt(context);
     case "building":
       return [
         `
@@ -1077,39 +1128,8 @@ function buildModePrompt(agentMode, context) {
         `- You have Pack Runner coordination tools (list_subtasks, fire builds, approve PRs)`,
         `- Goal: ensure quality, provide feedback, coordinate progression`
       ].join("\n");
-    case "auto": {
-      const parts = [
-        `
-## Mode: Auto`,
-        `You are in Auto mode \u2014 operating autonomously through planning \u2192 building \u2192 PR.`,
-        ``,
-        `### Phase 1: Discovery & Planning (current)`,
-        `- You have read-only codebase access (can read files, run git commands, search code)`,
-        `- You can write plan files in .claude/plans/ only \u2014 no other file writes`,
-        `- You have MCP tools for task properties: update_task, set_story_points, set_task_tags, set_task_icon, set_task_title`,
-        ``,
-        `### Required before transitioning:`,
-        `Before calling ExitPlanMode, you MUST fill in ALL of these:`,
-        `1. **Plan** \u2014 Save a clear implementation plan using update_task`,
-        `2. **Story Points** \u2014 Assign via set_story_points`,
-        `3. **Title** \u2014 Set an accurate title via set_task_title (if the current one is vague or "Untitled")`,
-        ``,
-        `### Transitioning to Building:`,
-        `When your plan is complete and all required properties are set, call the **ExitPlanMode** tool.`,
-        `- If any required properties are missing, ExitPlanMode will be denied with details on what's missing`,
-        `- Once ExitPlanMode succeeds, the system will automatically restart your session in Building mode with the appropriate model`,
-        `- You do NOT need to do anything after calling ExitPlanMode \u2014 the transition is handled for you`,
-        ``,
-        `### Autonomous Guidelines:`,
-        `- Make decisions independently \u2014 do not ask the team for approval at each step`,
-        `- Only escalate when genuinely blocked (ambiguous requirements, missing access, conflicting instructions)`,
-        `- Be thorough in discovery: read relevant files, understand the codebase architecture, then plan`
-      ];
-      if (context) {
-        parts.push(...buildPropertyInstructions(context));
-      }
-      return parts.join("\n");
-    }
+    case "auto":
+      return buildAutoPrompt(context);
     default:
       return null;
   }
@@ -2594,6 +2614,19 @@ async function emitRetryStatus(host, attempt, delayMs) {
   host.connection.emitStatus("running");
   await host.callbacks.onStatusChange("running");
 }
+function handleRateLimitPause(host, rateLimitResetsAt) {
+  host.connection.emitRateLimitPause(rateLimitResetsAt);
+  host.connection.postChatMessage(
+    `Rate limited. The task will be automatically re-queued and resume after ${new Date(rateLimitResetsAt).toLocaleString()}.`
+  );
+}
+function handleRetryError(error, context, host, options, prevImageError) {
+  if (isStaleOrExitedSession(error, context) && context.claudeSessionId) {
+    return handleStaleSession(context, host, options);
+  }
+  if (!isRetriableError(error)) throw error;
+  return { action: "continue", lastErrorWasImage: classifyImageError(error) || prevImageError };
+}
 async function runWithRetry(initialQuery, context, host, options) {
   let lastErrorWasImage = false;
   for (let attempt = 0; attempt <= RETRY_DELAYS_MS.length; attempt++) {
@@ -2607,23 +2640,16 @@ async function runWithRetry(initialQuery, context, host, options) {
       );
       if (modeRestart || host.isStopped()) return;
       if (rateLimitResetsAt) {
-        const resetMs = new Date(rateLimitResetsAt).getTime() - Date.now();
-        if (resetMs > 5 * 6e4) {
-          host.connection.emitRateLimitPause(rateLimitResetsAt);
-          host.connection.postChatMessage(
-            `Rate limited. The task will be automatically re-queued and resume after ${new Date(rateLimitResetsAt).toLocaleString()}.`
-          );
-          return;
-        }
+        handleRateLimitPause(host, rateLimitResetsAt);
+        return;
       }
       if (!retriable) return;
       lastErrorWasImage = IMAGE_ERROR_PATTERN2.test(resultSummary ?? "");
     } catch (error) {
-      if (isStaleOrExitedSession(error, context) && context.claudeSessionId) {
-        return handleStaleSession(context, host, options);
-      }
-      if (classifyImageError(error)) lastErrorWasImage = true;
-      if (!isRetriableError(error)) throw error;
+      const outcome = handleRetryError(error, context, host, options, lastErrorWasImage);
+      if (outcome instanceof Promise) return outcome;
+      if (outcome.action === "return") return;
+      lastErrorWasImage = outcome.lastErrorWasImage;
     }
     if (attempt >= RETRY_DELAYS_MS.length) {
       host.connection.postChatMessage(
@@ -3212,29 +3238,33 @@ var AgentRunner = class {
       await this.setState("error");
     }
   }
+  async handleModeRestartCycle() {
+    if (!this.taskContext) return;
+    await handleAutoModeRestart(
+      { agentMode: this.agentMode, sessionIds: this.sessionIds, taskContext: this.taskContext },
+      this.connection,
+      (s) => this.setState(s),
+      (ctx) => this.runQuerySafe(ctx),
+      async () => {
+        try {
+          return await this.connection.fetchTaskContext();
+        } catch {
+          return null;
+        }
+      }
+    );
+    this.taskContext = await this.connection.fetchTaskContext().catch(() => null) ?? this.taskContext;
+    if (!this.stopped && this._state !== "error") {
+      const nudged = await this.maybeSendPRNudge();
+      if (!nudged) await this.setState("idle");
+    }
+  }
   async runCoreLoop() {
     if (!this.taskContext) return;
     while (!this.stopped) {
       if (this.lastQueryModeRestart) {
         this.lastQueryModeRestart = false;
-        await handleAutoModeRestart(
-          { agentMode: this.agentMode, sessionIds: this.sessionIds, taskContext: this.taskContext },
-          this.connection,
-          (s) => this.setState(s),
-          (ctx) => this.runQuerySafe(ctx),
-          async () => {
-            try {
-              return await this.connection.fetchTaskContext();
-            } catch {
-              return null;
-            }
-          }
-        );
-        this.taskContext = await this.connection.fetchTaskContext().catch(() => null) ?? this.taskContext;
-        if (!this.stopped && this._state !== "error") {
-          const nudged = await this.maybeSendPRNudge();
-          if (!nudged) await this.setState("idle");
-        }
+        await this.handleModeRestartCycle();
         continue;
       }
       if (this._state === "idle") {
@@ -3888,4 +3918,4 @@ export {
   ProjectRunner,
   FileCache
 };
-//# sourceMappingURL=chunk-ACPWJ2SL.js.map
+//# sourceMappingURL=chunk-XRB3VPXH.js.map