@rallycry/conveyor-agent 4.4.0 → 4.5.0

package/dist/{chunk-FS3A4THO.js → chunk-7Y3RP3ZA.js}

@@ -253,6 +253,10 @@ var ConveyorConnection = class _ConveyorConnection {
     if (!this.socket) return;
     this.socket.emit("agentRunner:statusUpdate", { status });
   }
+  emitRateLimitPause(resetsAt) {
+    if (!this.socket) return;
+    this.socket.emit("agentRunner:rateLimitPause", { resetsAt });
+  }
   sendHeartbeat() {
     if (!this.socket) return;
     this.socket.emit("agentRunner:heartbeat", {});
@@ -727,16 +731,19 @@ function handleRateLimitEvent(event, host) {
   const { rate_limit_info } = event;
   const status = rate_limit_info.status;
   if (status === "rejected") {
-    const resetsAt = rate_limit_info.resetsAt ? new Date(rate_limit_info.resetsAt).toISOString() : "unknown";
-    const message = `Rate limit rejected (type: ${rate_limit_info.rateLimitType ?? "unknown"}, resets at: ${resetsAt})`;
+    const resetsAt = rate_limit_info.resetsAt ? new Date(rate_limit_info.resetsAt).toISOString() : void 0;
+    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 });
+    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 });
   }
+  return void 0;
 }
 async function processEvents(events, context, host) {
   const startTime = Date.now();
@@ -744,6 +751,7 @@ async function processEvents(events, context, host) {
   let isTyping = false;
   let retriable = false;
   let resultSummary;
+  let rateLimitResetsAt;
   const turnToolCalls = [];
   for await (const event of events) {
     if (host.isStopped()) break;
@@ -793,7 +801,8 @@ async function processEvents(events, context, host) {
         break;
       }
       case "rate_limit_event": {
-        handleRateLimitEvent(event, host);
+        const resetsAt = handleRateLimitEvent(event, host);
+        if (resetsAt) rateLimitResetsAt = resetsAt;
         break;
       }
     }
@@ -801,7 +810,7 @@ async function processEvents(events, context, host) {
   if (isTyping) {
     host.connection.sendTypingStop();
   }
-  return { retriable, resultSummary };
+  return { retriable, resultSummary, rateLimitResetsAt };
 }
 
 // src/execution/query-executor.ts
@@ -974,16 +983,28 @@ function buildModePrompt(agentMode, context) {
 ## 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 have MCP tools: update_task (title, description, plan, tags, SP, icon)`,
+        `- You can write plan files in .claude/plans/ only \u2014 no other file writes`,
         `- You can create and manage subtasks`,
-        `- You cannot write code or edit files (except .claude/plans/)`,
         `- 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)`,
-        `- When planning for yourself: use update_task to save the plan, then set_story_points, set_task_title, set_task_icon`
+        ``,
+        `### 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));
@@ -1357,7 +1378,15 @@ ${context.plan}`);
   }
   return parts;
 }
-function buildFreshInstructions(isPm, isAutoMode, context) {
+function buildFreshInstructions(isPm, isAutoMode, context, agentMode) {
+  if (isPm && agentMode === "building") {
+    return [
+      `Your plan has been approved. Begin implementing it now.`,
+      `Work on the git branch "${context.githubBranch}". Stay on this branch \u2014 do not checkout or create other branches.`,
+      `Start by reading the relevant source files mentioned in the plan, then write code.`,
+      `When finished, commit and push your changes, then use the create_pull_request tool to open a PR. Do NOT use gh CLI.`
+    ];
+  }
   if (isAutoMode && isPm) {
     return [
       `You are operating autonomously. Begin planning immediately.`,
@@ -1432,11 +1461,22 @@ function buildInstructions(mode, context, scenario, agentMode) {
 ## Instructions`];
   const isPm = mode === "pm";
   if (scenario === "fresh") {
-    parts.push(...buildFreshInstructions(isPm, agentMode === "auto", context));
+    parts.push(...buildFreshInstructions(isPm, agentMode === "auto", context, agentMode));
     return parts;
   }
   if (scenario === "idle_relaunch") {
-    if (isPm) {
+    if (isPm && (agentMode === "building" || agentMode === "review")) {
+      parts.push(
+        `You were relaunched but no new instructions have been given since your last run.`,
+        `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.`,
+        `Reply with a brief status update summarizing where things stand (visible in chat).`,
+        `Then wait for further instructions \u2014 do NOT redo work that was already completed.`
+      );
+      if (context.githubPRUrl) {
+        parts.push(`An existing PR is open at ${context.githubPRUrl}. Do not create a new PR.`);
+      }
+    } else if (isPm) {
       parts.push(
         `You were relaunched but no new instructions have been given since your last run.`,
         `You are the project manager for this task.`,
@@ -2130,6 +2170,12 @@ async function handleExitPlanMode(host, input) {
     }
     await host.connection.triggerIdentification();
     host.hasExitedPlanMode = true;
+    if (host.agentMode === "discovery") {
+      host.connection.postChatMessage(
+        "Task identified and moved to Open. Switch to Build mode when ready to start implementation."
+      );
+      return { behavior: "allow", updatedInput: input };
+    }
     const newMode = host.isParentTask ? "review" : "building";
     host.pendingModeRestart = true;
     if (host.onModeTransition) {
@@ -2169,7 +2215,7 @@ async function handleAskUserQuestion(host, input) {
 }
 function buildCanUseTool(host) {
   return async (toolName, input) => {
-    if (toolName === "ExitPlanMode" && host.agentMode === "auto" && !host.hasExitedPlanMode) {
+    if (toolName === "ExitPlanMode" && (host.agentMode === "auto" || host.agentMode === "discovery") && !host.hasExitedPlanMode) {
       return await handleExitPlanMode(host, input);
     }
     if (toolName === "AskUserQuestion") {
@@ -2235,9 +2281,6 @@ function buildSandboxConfig(host) {
     }
   };
 }
-function isActiveBuildMode(mode, hasExitedPlanMode) {
-  return mode === "building" || mode === "review" || mode === "auto" && hasExitedPlanMode;
-}
 function isReadOnlyMode(mode, hasExitedPlanMode) {
   return mode === "discovery" || mode === "help" || mode === "auto" && !hasExitedPlanMode;
 }
@@ -2250,7 +2293,9 @@ function buildDisallowedTools(settings, mode, hasExitedPlanMode) {
 function buildQueryOptions(host, context) {
   const settings = context.agentSettings ?? host.config.agentSettings ?? {};
   const mode = host.agentMode;
-  const shouldSandbox = host.config.mode === "pm" && isActiveBuildMode(mode, host.hasExitedPlanMode) && context.useSandbox !== false;
+  const isCloud = host.config.mode === "pm";
+  const isReadOnly = isReadOnlyMode(mode, host.hasExitedPlanMode);
+  const needsCanUseTool = isCloud && isReadOnly;
   const systemPromptText = buildSystemPrompt(
     host.config.mode,
     context,
@@ -2268,8 +2313,8 @@ function buildQueryOptions(host, context) {
     },
     settingSources,
     cwd: host.config.workspaceDir,
-    permissionMode: shouldSandbox ? "acceptEdits" : "bypassPermissions",
-    allowDangerouslySkipPermissions: !shouldSandbox,
+    permissionMode: needsCanUseTool ? "acceptEdits" : "bypassPermissions",
+    allowDangerouslySkipPermissions: !needsCanUseTool,
     canUseTool: buildCanUseTool(host),
     tools: { type: "preset", preset: "claude_code" },
     mcpServers: { conveyor: createConveyorMcpServer(host.connection, host.config, context) },
@@ -2282,7 +2327,7 @@ function buildQueryOptions(host, context) {
     disallowedTools: buildDisallowedTools(settings, mode, host.hasExitedPlanMode),
     enableFileCheckpointing: settings.enableFileCheckpointing
   };
-  if (shouldSandbox) {
+  if (needsCanUseTool) {
     baseOptions.sandbox = buildSandboxConfig(host);
   }
   return baseOptions;
@@ -2452,12 +2497,23 @@ async function runWithRetry(initialQuery, context, host, options) {
     if (host.isStopped()) return;
     const agentQuery = attempt === 0 ? initialQuery : buildRetryQuery(host, context, options, lastErrorWasImage);
     try {
-      const { retriable, resultSummary, modeRestart } = await processEvents(
+      const { retriable, resultSummary, modeRestart, rateLimitResetsAt } = await processEvents(
         agentQuery,
         context,
         host
       );
-      if (modeRestart || !retriable || host.isStopped()) return;
+      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;
+        }
+      }
+      if (!retriable) return;
       lastErrorWasImage = IMAGE_ERROR_PATTERN2.test(resultSummary ?? "");
     } catch (error) {
       if (isStaleOrExitedSession(error, context) && context.claudeSessionId) {
@@ -2748,13 +2804,8 @@ async function handleAutoModeRestart(state, connection, setState, runQuerySafe,
   const newMode = state.agentMode;
   const isParentTask = !!taskContext.isParentTask;
   const newModel = getModelForMode(taskContext, newMode, isParentTask);
-  const resumeSessionId = newModel ? state.sessionIds.get(newModel) : null;
-  if (resumeSessionId) {
-    taskContext.claudeSessionId = resumeSessionId;
-  } else {
-    taskContext.claudeSessionId = null;
-    connection.storeSessionId("");
-  }
+  taskContext.claudeSessionId = null;
+  connection.storeSessionId("");
   if (newModel) taskContext.model = newModel;
   taskContext.agentMode = newMode;
   connection.emitModeTransition({ fromMode: "auto", toMode: newMode ?? "building" });
@@ -3168,6 +3219,10 @@ var AgentRunner = class {
     this.connection.postChatMessage(
       `Mode switched to **${effectiveMode}**${effectiveMode === "building" ? " \u2014 I now have direct coding access." : ""}`
     );
+    if (effectiveMode === "building" && this.taskContext?.status === "Open") {
+      this.connection.updateStatus("InProgress");
+      this.taskContext.status = "InProgress";
+    }
   }
   stop() {
     this.stopped = true;
@@ -3641,4 +3696,4 @@ export {
   ProjectRunner,
   FileCache
 };
-//# sourceMappingURL=chunk-FS3A4THO.js.map
+//# sourceMappingURL=chunk-7Y3RP3ZA.js.map