@rallycry/conveyor-agent 5.10.2 → 5.11.0

package/dist/{chunk-WPQXAPVA.js → chunk-LBEAK2VJ.js}

@@ -459,6 +459,7 @@ var ProjectConnection = class {
   onSwitchBranch = null;
   onSyncEnvironment = null;
   onGetEnvStatus = null;
+  onRestartStartCommand = null;
   constructor(config) {
     this.config = config;
   }
@@ -522,6 +523,13 @@ var ProjectConnection = class {
         if (this.onGetEnvStatus) this.onGetEnvStatus(cb);
         else cb({ ok: false, data: void 0 });
       });
+      this.socket.on(
+        "projectRunner:restartStartCommand",
+        (_data, cb) => {
+          if (this.onRestartStartCommand) this.onRestartStartCommand(cb);
+          else cb({ ok: false, error: "restartStartCommand handler not registered" });
+        }
+      );
       this.socket.on(
         "projectRunner:runAuthTokenCommand",
         (data, cb) => this.handleRunAuthTokenCommand(data.userEmail, cb)
@@ -564,6 +572,10 @@ var ProjectConnection = class {
     if (!this.socket) return;
     this.socket.emit("conveyor:tagAuditResult", data);
   }
+  emitAuditProgress(data) {
+    if (!this.socket) return;
+    this.socket.emit("conveyor:tagAuditProgress", data);
+  }
   sendHeartbeat() {
     if (!this.socket) return;
     this.socket.emit("projectRunner:heartbeat", {});
@@ -784,6 +796,14 @@ import { randomUUID as randomUUID2 } from "crypto";
 import { execSync as execSync4 } from "child_process";
 
 // src/execution/event-handlers.ts
+function safeVoid(promise, context) {
+  if (promise && typeof promise.catch === "function") {
+    promise.catch((err) => {
+      process.stderr.write(`[safeVoid] ${context}: ${err}
+`);
+    });
+  }
+}
 function epochSecondsToISO(value) {
   if (typeof value === "string") return value;
   if (typeof value !== "number" || value <= 0) return void 0;
@@ -960,13 +980,13 @@ function handleRateLimitEvent(event, host) {
     const resetsAtDisplay = resetsAt ?? "unknown";
     const message = `Rate limit rejected (type: ${rate_limit_info.rateLimitType ?? "unknown"}, resets at: ${resetsAtDisplay})`;
     host.connection.sendEvent({ type: "error", message });
-    void host.callbacks.onEvent({ type: "error", message });
+    safeVoid(host.callbacks.onEvent({ type: "error", message }), "rateLimitRejected");
     return resetsAt;
   } else if (status === "allowed_warning") {
     const utilization = rate_limit_info.utilization ? `${Math.round(rate_limit_info.utilization * 100)}%` : "high";
     const message = `Rate limit warning: ${utilization} utilization (type: ${rate_limit_info.rateLimitType ?? "unknown"})`;
     host.connection.sendEvent({ type: "thinking", message });
-    void host.callbacks.onEvent({ type: "thinking", message });
+    safeVoid(host.callbacks.onEvent({ type: "thinking", message }), "rateLimitWarning");
   }
   return void 0;
 }
@@ -984,34 +1004,46 @@ async function handleSystemEvent(event, host, context, sessionIdStored) {
 }
 function handleSystemSubevents(systemEvent, host) {
   if (systemEvent.subtype === "compact_boundary") {
-    void host.callbacks.onEvent({
-      type: "context_compacted",
-      trigger: systemEvent.compact_metadata.trigger,
-      preTokens: systemEvent.compact_metadata.pre_tokens
-    });
+    safeVoid(
+      host.callbacks.onEvent({
+        type: "context_compacted",
+        trigger: systemEvent.compact_metadata.trigger,
+        preTokens: systemEvent.compact_metadata.pre_tokens
+      }),
+      "compactBoundary"
+    );
   } else if (systemEvent.subtype === "task_started") {
-    void host.callbacks.onEvent({
-      type: "subagent_started",
-      sdkTaskId: systemEvent.task_id,
-      description: systemEvent.description
-    });
+    safeVoid(
+      host.callbacks.onEvent({
+        type: "subagent_started",
+        sdkTaskId: systemEvent.task_id,
+        description: systemEvent.description
+      }),
+      "taskStarted"
+    );
   } else if (systemEvent.subtype === "task_progress") {
-    void host.callbacks.onEvent({
-      type: "subagent_progress",
-      sdkTaskId: systemEvent.task_id,
-      description: systemEvent.description,
-      toolUses: systemEvent.usage?.tool_uses ?? 0,
-      durationMs: systemEvent.usage?.duration_ms ?? 0
-    });
+    safeVoid(
+      host.callbacks.onEvent({
+        type: "subagent_progress",
+        sdkTaskId: systemEvent.task_id,
+        description: systemEvent.description,
+        toolUses: systemEvent.usage?.tool_uses ?? 0,
+        durationMs: systemEvent.usage?.duration_ms ?? 0
+      }),
+      "taskProgress"
+    );
   }
 }
 function handleToolProgressEvent(event, host) {
   const msg = event;
-  void host.callbacks.onEvent({
-    type: "tool_progress",
-    toolName: msg.tool_name ?? "",
-    elapsedSeconds: msg.elapsed_time_seconds ?? 0
-  });
+  safeVoid(
+    host.callbacks.onEvent({
+      type: "tool_progress",
+      toolName: msg.tool_name ?? "",
+      elapsedSeconds: msg.elapsed_time_seconds ?? 0
+    }),
+    "toolProgress"
+  );
 }
 async function handleAssistantCase(event, host, turnToolCalls) {
   await processAssistantEvent(event, host, turnToolCalls);
@@ -1034,6 +1066,7 @@ async function handleResultCase(event, host, context, startTime, isTyping, lastA
 }
 
 // src/execution/event-processor.ts
+var API_ERROR_PATTERN2 = /API Error: [45]\d\d/;
 function stopTypingIfNeeded(host, isTyping) {
   if (isTyping) host.connection.sendTypingStop();
 }
@@ -1055,6 +1088,12 @@ async function processAssistantCase(event, host, state) {
   }
   const usage = await handleAssistantCase(event, host, state.turnToolCalls);
   if (usage) state.lastAssistantUsage = usage;
+  if (!state.sawApiError) {
+    const fullText = event.message.content.filter((b) => b.type === "text").map((b) => b.text).join(" ");
+    if (API_ERROR_PATTERN2.test(fullText)) {
+      state.sawApiError = true;
+    }
+  }
 }
 async function processResultCase(event, host, context, startTime, state) {
   const info = await handleResultCase(
@@ -1078,6 +1117,7 @@ async function processEvents(events, context, host) {
     sessionIdStored: false,
     isTyping: false,
     retriable: false,
+    sawApiError: false,
     resultSummary: void 0,
     rateLimitResetsAt: void 0,
     staleSession: void 0,
@@ -1117,7 +1157,7 @@ async function processEvents(events, context, host) {
   }
   stopTypingIfNeeded(host, state.isTyping);
   return {
-    retriable: state.retriable,
+    retriable: state.retriable || state.sawApiError,
     resultSummary: state.resultSummary,
     rateLimitResetsAt: state.rateLimitResetsAt,
     ...state.staleSession && { staleSession: state.staleSession }
@@ -1478,6 +1518,8 @@ function buildDiscoveryPrompt(context) {
     `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`,
+    `- Do NOT attempt to edit, write, or modify source code files \u2014 these operations will be denied`,
+    `- If you identify code changes needed, describe them in the plan instead of implementing them`,
     `- 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`,
@@ -1742,7 +1784,7 @@ function detectRelaunchScenario(context, trustChatHistory = false) {
   const hasNewUserMessages = messagesAfterAgent.some((m) => m.role === "user");
   return hasNewUserMessages ? "feedback_relaunch" : "idle_relaunch";
 }
-function buildRelaunchWithSession(mode, context, agentMode) {
+function buildRelaunchWithSession(mode, context, agentMode, isAuto) {
   const scenario = detectRelaunchScenario(context);
   if (!context.claudeSessionId || scenario === "fresh") return null;
   const parts = [];
@@ -1790,7 +1832,7 @@ Address the requested changes. Do NOT re-investigate the codebase from scratch o
       `Run \`git log --oneline -10\` to review what you already committed.`,
       `Review the current state of the codebase and verify everything is working correctly.`
     );
-    if (agentMode === "auto" || agentMode === "building") {
+    if (agentMode === "auto" || agentMode === "building" && isAuto) {
       parts.push(
         `If work is incomplete, continue implementing the plan. When finished, commit, push, and use mcp__conveyor__create_pull_request to open a PR.`,
         `Do NOT go idle or wait for instructions \u2014 you are in auto mode.`
@@ -1996,7 +2038,7 @@ Address the requested changes directly. Do NOT re-investigate the codebase from
   }
   return parts;
 }
-function buildInstructions(mode, context, scenario, agentMode) {
+function buildInstructions(mode, context, scenario, agentMode, isAuto) {
   const parts = [`
 ## Instructions`];
   const isPm = mode === "pm";
@@ -2028,7 +2070,7 @@ function buildInstructions(mode, context, scenario, agentMode) {
         `Work on the git branch "${context.githubBranch}". Stay on this branch \u2014 do not checkout or create other branches.`,
         `Run \`git log --oneline -10\` to review what you already committed, then verify the current state is correct.`
       );
-      if (agentMode === "auto" || agentMode === "building") {
+      if (agentMode === "auto" || agentMode === "building" && isAuto) {
         parts.push(
           `If work is incomplete, continue implementing the plan. When finished, commit, push, and use mcp__conveyor__create_pull_request to open a PR.`,
           `Do NOT go idle or wait for instructions \u2014 you are in auto mode.`
@@ -2051,13 +2093,13 @@ function buildInstructions(mode, context, scenario, agentMode) {
 async function buildInitialPrompt(mode, context, isAuto, agentMode) {
   const isPackRunner = mode === "pm" && !!isAuto && !!context.isParentTask;
   if (!isPackRunner) {
-    const sessionRelaunch = buildRelaunchWithSession(mode, context, agentMode);
+    const sessionRelaunch = buildRelaunchWithSession(mode, context, agentMode, isAuto);
     if (sessionRelaunch) return sessionRelaunch;
   }
   const isPm = mode === "pm";
   const scenario = detectRelaunchScenario(context, isPm);
   const body = await buildTaskBody(context);
-  const instructions = isPackRunner ? buildPackRunnerInstructions(context, scenario) : buildInstructions(mode, context, scenario, agentMode);
+  const instructions = isPackRunner ? buildPackRunnerInstructions(context, scenario) : buildInstructions(mode, context, scenario, agentMode, isAuto);
   return [...body, ...instructions].join("\n");
 }
 
@@ -2319,11 +2361,14 @@ function buildCreatePullRequestTool(connection) {
     "Create a GitHub pull request for this task. Use this instead of gh CLI or git commands to create PRs.",
     {
       title: z.string().describe("The PR title"),
-      body: z.string().describe("The PR description/body in markdown")
+      body: z.string().describe("The PR description/body in markdown"),
+      branch: z.string().optional().describe(
+        "The head branch name for the PR. If the task doesn't have a branch set, this will be used. Defaults to the task's existing branch."
+      )
     },
-    async ({ title, body }) => {
+    async ({ title, body, branch }) => {
       try {
-        const result = await connection.createPR({ title, body });
+        const result = await connection.createPR({ title, body, branch });
         connection.sendEvent({
           type: "pr_created",
           url: result.url,
@@ -2811,7 +2856,9 @@ async function handleAskUserQuestion(host, input) {
   }
   return { behavior: "allow", updatedInput: { questions: input.questions, answers } };
 }
+var DENIAL_WARNING_THRESHOLD = 3;
 function buildCanUseTool(host) {
+  let consecutiveDenials = 0;
   return async (toolName, input) => {
     if (toolName === "ExitPlanMode" && (host.agentMode === "auto" || host.agentMode === "discovery") && !host.hasExitedPlanMode) {
       return await handleExitPlanMode(host, input);
@@ -2819,23 +2866,39 @@ function buildCanUseTool(host) {
     if (toolName === "AskUserQuestion") {
       return await handleAskUserQuestion(host, input);
     }
+    let result;
     switch (host.agentMode) {
       case "discovery":
-        return handleDiscoveryToolAccess(toolName, input);
+        result = handleDiscoveryToolAccess(toolName, input);
+        break;
       case "building":
-        return handleBuildingToolAccess(toolName, input);
+        result = handleBuildingToolAccess(toolName, input);
+        break;
       case "review":
-        return handleReviewToolAccess(toolName, input, host.isParentTask);
+        result = handleReviewToolAccess(toolName, input, host.isParentTask);
+        break;
       case "auto":
-        return handleAutoToolAccess(toolName, input, host.hasExitedPlanMode, host.isParentTask);
+        result = handleAutoToolAccess(toolName, input, host.hasExitedPlanMode, host.isParentTask);
+        break;
       default:
-        return { behavior: "allow", updatedInput: input };
+        result = { behavior: "allow", updatedInput: input };
+    }
+    if (result.behavior === "deny") {
+      consecutiveDenials++;
+      if (consecutiveDenials === DENIAL_WARNING_THRESHOLD) {
+        host.connection.postChatMessage(
+          `\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.`
+        );
+      }
+    } else {
+      consecutiveDenials = 0;
     }
+    return result;
   };
 }
 
 // src/execution/query-executor.ts
-var API_ERROR_PATTERN2 = /API Error: [45]\d\d/;
+var API_ERROR_PATTERN3 = /API Error: [45]\d\d/;
 var IMAGE_ERROR_PATTERN2 = /Could not process image/i;
 var RETRY_DELAYS_MS = [6e4, 12e4, 18e4, 3e5];
 function buildHooks(host) {
@@ -3083,12 +3146,17 @@ function isStaleOrExitedSession(error, context) {
   if (error.message.includes("No conversation found with session ID")) return true;
   return !!context.claudeSessionId && error.message.includes("process exited");
 }
+function getErrorMessage(error) {
+  if (error instanceof Error) return error.message;
+  if (typeof error === "string") return error;
+  return String(error);
+}
 function isRetriableError(error) {
-  if (!(error instanceof Error)) return false;
-  return API_ERROR_PATTERN2.test(error.message) || IMAGE_ERROR_PATTERN2.test(error.message);
+  const message = getErrorMessage(error);
+  return API_ERROR_PATTERN3.test(message) || IMAGE_ERROR_PATTERN2.test(message);
 }
 function classifyImageError(error) {
-  return error instanceof Error && IMAGE_ERROR_PATTERN2.test(error.message);
+  return IMAGE_ERROR_PATTERN2.test(getErrorMessage(error));
 }
 async function emitRetryStatus(host, attempt, delayMs) {
   const delayMin = Math.round(delayMs / 6e4);
@@ -4344,14 +4412,15 @@ var TOOL_MAPPERS = {
   recommend_merge_tags: mapMergeTags,
   recommend_rename_tag: mapRenameTag
 };
-function collectRecommendation(toolName, input, collector) {
+function collectRecommendation(toolName, input, collector, onRecommendation) {
   const mapper = TOOL_MAPPERS[toolName];
   if (!mapper) return JSON.stringify({ error: `Unknown tool: ${toolName}` });
   const rec = { id: randomUUID3(), ...mapper(input) };
   collector.recommendations.push(rec);
+  onRecommendation?.({ tagName: rec.tagName ?? rec.type, type: rec.type });
   return JSON.stringify({ success: true, recommendationId: rec.id });
 }
-function createAuditMcpServer(collector) {
+function createAuditMcpServer(collector, onRecommendation) {
   const auditTools = [
     tool4(
       "recommend_create_tag",
@@ -4366,7 +4435,8 @@ function createAuditMcpServer(collector) {
         const result = collectRecommendation(
           "recommend_create_tag",
           args,
-          collector
+          collector,
+          onRecommendation
         );
         return { content: [{ type: "text", text: result }] };
       }
@@ -4384,7 +4454,8 @@ function createAuditMcpServer(collector) {
         const result = collectRecommendation(
           "recommend_update_description",
           args,
-          collector
+          collector,
+          onRecommendation
         );
         return { content: [{ type: "text", text: result }] };
       }
@@ -4404,7 +4475,8 @@ function createAuditMcpServer(collector) {
         const result = collectRecommendation(
           "recommend_context_link",
           args,
-          collector
+          collector,
+          onRecommendation
         );
         return { content: [{ type: "text", text: result }] };
       }
@@ -4424,7 +4496,8 @@ function createAuditMcpServer(collector) {
         const result = collectRecommendation(
           "flag_documentation_gap",
           args,
-          collector
+          collector,
+          onRecommendation
         );
         return { content: [{ type: "text", text: result }] };
       }
@@ -4443,7 +4516,8 @@ function createAuditMcpServer(collector) {
         const result = collectRecommendation(
           "recommend_merge_tags",
           args,
-          collector
+          collector,
+          onRecommendation
         );
         return { content: [{ type: "text", text: result }] };
       }
@@ -4461,7 +4535,8 @@ function createAuditMcpServer(collector) {
         const result = collectRecommendation(
           "recommend_rename_tag",
           args,
-          collector
+          collector,
+          onRecommendation
         );
         return { content: [{ type: "text", text: result }] };
       }
@@ -4535,13 +4610,32 @@ function buildAuditSystemPrompt(projectName, tags, heatmapData, projectDir) {
     "Analyze actual file contents, not just file names."
   ].join("\n");
 }
+function emitToolCallProgress(event, request, connection) {
+  if (event.type !== "assistant") return;
+  const assistantEvent = event;
+  for (const block of assistantEvent.message.content) {
+    if (block.type === "tool_use" && block.name) {
+      const inputStr = typeof block.input === "string" ? block.input : JSON.stringify(block.input);
+      connection.emitAuditProgress({
+        requestId: request.requestId,
+        activity: {
+          tool: block.name,
+          input: inputStr.slice(0, 500),
+          timestamp: (/* @__PURE__ */ new Date()).toISOString()
+        }
+      });
+    }
+  }
+}
 async function runAuditQuery(request, connection, projectDir) {
+  connection.emitAgentStatus("fetching_context");
   let agentCtx = null;
   try {
     agentCtx = await connection.fetchAgentContext();
   } catch {
     logger5.warn("Could not fetch agent context for audit, using defaults");
   }
+  connection.emitAgentStatus("running");
   const model = agentCtx?.model || FALLBACK_MODEL2;
   const settings = agentCtx?.agentSettings ?? {};
   const collector = {
@@ -4549,6 +4643,13 @@ async function runAuditQuery(request, connection, projectDir) {
     summary: "Audit completed.",
     complete: false
   };
+  const onRecommendation = (rec) => {
+    connection.emitEvent({
+      type: "audit_recommendation",
+      tagName: rec.tagName,
+      recommendationType: rec.type
+    });
+  };
   const systemPrompt = buildAuditSystemPrompt(
     request.projectName,
     request.tags,
@@ -4572,20 +4673,28 @@ async function runAuditQuery(request, connection, projectDir) {
       permissionMode: "bypassPermissions",
       allowDangerouslySkipPermissions: true,
       tools: { type: "preset", preset: "claude_code" },
-      mcpServers: { "tag-audit": createAuditMcpServer(collector) },
+      mcpServers: { "tag-audit": createAuditMcpServer(collector, onRecommendation) },
       maxTurns: settings.maxTurns ?? 30,
       maxBudgetUsd: settings.maxBudgetUsd ?? 5,
       effort: settings.effort,
       thinking: settings.thinking
     }
   });
+  const responseParts = [];
+  const turnToolCalls = [];
+  const isTyping = { value: false };
   for await (const event of events) {
-    if (event.type === "result") break;
+    emitToolCallProgress(event, request, connection);
+    const done = processEventStream(event, connection, responseParts, turnToolCalls, isTyping);
+    if (done) break;
+  }
+  if (isTyping.value) {
+    connection.emitEvent({ type: "agent_typing_stop" });
   }
   return collector;
 }
 async function handleProjectAuditRequest(request, connection, projectDir) {
-  connection.emitAgentStatus("busy");
+  connection.emitAgentStatus("running");
   try {
     const collector = await runAuditQuery(request, connection, projectDir);
     const result = {
@@ -5063,6 +5172,11 @@ var ProjectRunner = class {
     this.connection.onGetEnvStatus = (cb) => {
       this.handleGetEnvStatus(cb);
     };
+    this.connection.onRestartStartCommand = (cb) => {
+      void this.restartStartCommand().then(() => cb({ ok: true })).catch(
+        (err) => cb({ ok: false, error: err instanceof Error ? err.message : "Restart failed" })
+      );
+    };
     try {
       const context = await this.connection.fetchAgentContext();
       this.branchSwitchCommand = context?.branchSwitchCommand ?? process.env.CONVEYOR_BRANCH_SWITCH_COMMAND;
@@ -5274,4 +5388,4 @@ export {
   ProjectRunner,
   FileCache
 };
-//# sourceMappingURL=chunk-WPQXAPVA.js.map
+//# sourceMappingURL=chunk-LBEAK2VJ.js.map