@rallycry/conveyor-agent 5.2.0 → 5.3.0

package/dist/{chunk-R37YJZWE.js → chunk-DMWUXQ4M.js}

@@ -752,7 +752,7 @@ function aggregateModelUsage(modelUsage) {
   }
   return { queryInputTokens, contextWindow, totalInputTokens, totalCacheRead, totalCacheCreation };
 }
-function emitContextUpdate(modelUsage, host, context) {
+function emitContextUpdate(modelUsage, host, context, lastAssistantUsage) {
   const usage = aggregateModelUsage(modelUsage);
   let { contextWindow } = usage;
   const settings = context.agentSettings ?? host.config.agentSettings ?? {};
@@ -761,13 +761,15 @@ function emitContextUpdate(modelUsage, host, context) {
     contextWindow = 1e6;
   }
   if (contextWindow > 0) {
+    const currentContextTokens = lastAssistantUsage ? (lastAssistantUsage.input_tokens ?? 0) + (lastAssistantUsage.cache_read_input_tokens ?? 0) + (lastAssistantUsage.cache_creation_input_tokens ?? 0) : usage.queryInputTokens;
     host.connection.sendEvent({
       type: "context_update",
-      contextTokens: usage.queryInputTokens,
+      contextTokens: currentContextTokens,
       contextWindow,
       inputTokens: usage.totalInputTokens,
       cacheReadInputTokens: usage.totalCacheRead,
-      cacheCreationInputTokens: usage.totalCacheCreation
+      cacheCreationInputTokens: usage.totalCacheCreation,
+      totalTokensUsed: usage.queryInputTokens
     });
   }
 }
@@ -783,7 +785,7 @@ function trackCostSpending(host, context, cumulativeTotal) {
     });
   }
 }
-function handleSuccessResult(event, host, context, startTime) {
+function handleSuccessResult(event, host, context, startTime, lastAssistantUsage) {
   const durationMs = Date.now() - startTime;
   const summary = event.result || "Task completed.";
   const retriable = isRetriableMessage(summary);
@@ -794,28 +796,38 @@ function handleSuccessResult(event, host, context, startTime) {
   }
   host.connection.sendEvent({ type: "completed", summary, costUsd: cumulativeTotal, durationMs });
   if (modelUsage && typeof modelUsage === "object") {
-    emitContextUpdate(modelUsage, host, context);
+    emitContextUpdate(modelUsage, host, context, lastAssistantUsage);
   }
   trackCostSpending(host, context, cumulativeTotal);
   return { totalCostUsd: cumulativeTotal, retriable };
 }
 function handleErrorResult(event, host) {
   const errorMsg = event.errors.length > 0 ? event.errors.join(", ") : `Agent stopped: ${event.subtype}`;
+  const isStaleSession = errorMsg.includes("No conversation found with session ID");
+  if (isStaleSession) {
+    return { retriable: false, staleSession: true };
+  }
   const retriable = isRetriableMessage(errorMsg);
   host.connection.sendEvent({ type: "error", message: errorMsg });
   return { retriable };
 }
-function handleResultEvent(event, host, context, startTime) {
+function handleResultEvent(event, host, context, startTime, lastAssistantUsage) {
   const resultSummary = event.subtype === "success" ? event.result : event.errors.join(", ");
   if (event.subtype === "success") {
-    const result2 = handleSuccessResult(event, host, context, startTime);
+    const result2 = handleSuccessResult(
+      event,
+      host,
+      context,
+      startTime,
+      lastAssistantUsage
+    );
     return { ...result2, resultSummary };
   }
   const result = handleErrorResult(event, host);
   return { totalCostUsd: 0, ...result, resultSummary };
 }
-async function emitResultEvent(event, host, context, startTime) {
-  const result = handleResultEvent(event, host, context, startTime);
+async function emitResultEvent(event, host, context, startTime, lastAssistantUsage) {
+  const result = handleResultEvent(event, host, context, startTime, lastAssistantUsage);
   const durationMs = Date.now() - startTime;
   if (event.subtype === "success") {
     const successEvent = event;
@@ -826,12 +838,16 @@ async function emitResultEvent(event, host, context, startTime) {
       costUsd: result.totalCostUsd,
       durationMs
     });
-  } else {
+  } else if (!result.staleSession) {
     const errorEvent = event;
     const errorMsg = errorEvent.errors.length > 0 ? errorEvent.errors.join(", ") : `Agent stopped: ${errorEvent.subtype}`;
     await host.callbacks.onEvent({ type: "error", message: errorMsg });
   }
-  return { retriable: result.retriable, resultSummary: result.resultSummary };
+  return {
+    retriable: result.retriable,
+    resultSummary: result.resultSummary,
+    staleSession: result.staleSession
+  };
 }
 function handleRateLimitEvent(event, host) {
   const { rate_limit_info } = event;
@@ -878,6 +894,8 @@ async function processEvents(events, context, host) {
   let retriable = false;
   let resultSummary;
   let rateLimitResetsAt;
+  let staleSession;
+  let lastAssistantUsage;
   const turnToolCalls = [];
   for await (const event of events) {
     if (host.isStopped()) break;
@@ -899,7 +917,12 @@ async function processEvents(events, context, host) {
           setTimeout(() => host.connection.sendTypingStart(), 200);
           isTyping = true;
         }
-        await processAssistantEvent(event, host, turnToolCalls);
+        const assistantEvent = event;
+        await processAssistantEvent(assistantEvent, host, turnToolCalls);
+        const msgUsage = assistantEvent.message.usage;
+        if (msgUsage) {
+          lastAssistantUsage = msgUsage;
+        }
         break;
       }
       case "result": {
@@ -911,10 +934,14 @@ async function processEvents(events, context, host) {
           event,
           host,
           context,
-          startTime
+          startTime,
+          lastAssistantUsage
         );
         retriable = resultInfo.retriable;
         resultSummary = resultInfo.resultSummary;
+        if (resultInfo.staleSession) {
+          staleSession = true;
+        }
         break;
       }
       case "rate_limit_event": {
@@ -927,7 +954,12 @@ async function processEvents(events, context, host) {
   if (isTyping) {
     host.connection.sendTypingStop();
   }
-  return { retriable, resultSummary, rateLimitResetsAt };
+  return {
+    retriable,
+    resultSummary,
+    rateLimitResetsAt,
+    ...staleSession && { staleSession }
+  };
 }
 
 // src/execution/query-executor.ts
@@ -1323,7 +1355,7 @@ Your responses are sent directly to the task chat \u2014 the team sees everythin
   );
   if (!isPm || isPmActive) {
     parts.push(
-      `Use the create_pull_request tool to open PRs \u2014 do NOT use gh CLI or shell commands for PR creation.`
+      `Use the mcp__conveyor__create_pull_request tool to open PRs \u2014 do NOT use gh CLI or shell commands for PR creation.`
     );
   }
   const modePrompt = buildModePrompt(agentMode, context);
@@ -1394,7 +1426,7 @@ Address the requested changes. Do NOT re-investigate the codebase from scratch o
       );
     } else {
       parts.push(
-        `When finished, use the create_pull_request tool to open a PR. Do NOT use gh CLI.`
+        `When finished, use the mcp__conveyor__create_pull_request tool to open a PR. Do NOT use gh CLI.`
       );
     }
   } else {
@@ -1501,12 +1533,12 @@ function buildFreshInstructions(isPm, isAutoMode, context, agentMode) {
       `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.`,
+      `When finished, commit and push your changes, then use the mcp__conveyor__create_pull_request tool to open a PR. Do NOT use gh CLI.`,
       `
 CRITICAL: You are in Auto mode. Do NOT report status, ask for confirmation, or go idle without making code changes.`,
       `Your FIRST action must be reading source files from the plan, then immediately writing code.`,
       `Do NOT summarize the plan or say "ready to implement" \u2014 start implementing.`,
-      `When all changes are committed and pushed, use create_pull_request to open a PR.`,
+      `When all changes are committed and pushed, use mcp__conveyor__create_pull_request to open a PR.`,
       `If you are genuinely blocked, explain the specific blocker \u2014 do not go idle silently.`
     ];
   }
@@ -1540,14 +1572,14 @@ CRITICAL: You are in Auto mode. Do NOT report status, ask for confirmation, or g
     `Your FIRST action should be reading the relevant source files mentioned in the plan, then writing code. Do NOT run install, build, lint, test, or dev server commands first \u2014 the environment is already set up.`,
     `Work on the git branch "${context.githubBranch}". Stay on this branch for the entire task. Do not checkout or create other branches.`,
     `Your replies are visible to the team in chat \u2014 briefly describe what you're doing when you begin meaningful implementation, and again when the PR is ready.`,
-    `When finished, commit your changes, then run \`git fetch origin ${context.githubBranch}\` and \`git push origin ${context.githubBranch}\` (use --force-with-lease if push fails). Then use the create_pull_request tool to open a PR. Do NOT use gh CLI or any other method to create PRs.`
+    `When finished, commit your changes, then run \`git fetch origin ${context.githubBranch}\` and \`git push origin ${context.githubBranch}\` (use --force-with-lease if push fails). Then use the mcp__conveyor__create_pull_request tool to open a PR. Do NOT use gh CLI or any other method to create PRs.`
   ];
   if (isAutoMode) {
     parts.push(
       `
 CRITICAL: You are in Auto mode. Do NOT report status, ask for confirmation, or go idle without making code changes.`,
       `Do NOT summarize the plan or say "ready to implement" \u2014 start implementing immediately.`,
-      `When all changes are committed and pushed, you MUST use create_pull_request to open a PR before finishing.`,
+      `When all changes are committed and pushed, you MUST use mcp__conveyor__create_pull_request to open a PR before finishing.`,
       `If you are genuinely blocked, explain the specific blocker \u2014 do not go idle silently.`
     );
   }
@@ -1584,7 +1616,7 @@ Address the requested changes directly. Do NOT re-investigate the codebase from
     );
   } else {
     parts.push(
-      `When finished, use the create_pull_request tool to open a PR. Do NOT use gh CLI or any other method to create PRs.`
+      `When finished, use the mcp__conveyor__create_pull_request tool to open a PR. Do NOT use gh CLI or any other method to create PRs.`
     );
   }
   return parts;
@@ -1896,6 +1928,30 @@ function buildGetTaskIncidentsTool(connection) {
     { annotations: { readOnlyHint: true } }
   );
 }
+function buildCreatePullRequestTool(connection) {
+  return tool(
+    "create_pull_request",
+    "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")
+    },
+    async ({ title, body }) => {
+      try {
+        const result = await connection.createPR({ title, body });
+        connection.sendEvent({
+          type: "pr_created",
+          url: result.url,
+          number: result.number
+        });
+        return textResult(`Pull request #${result.number} created: ${result.url}`);
+      } catch (error) {
+        const msg = error instanceof Error ? error.message : "Unknown error";
+        return textResult(`Failed to create pull request: ${msg}`);
+      }
+    }
+  );
+}
 function buildCommonTools(connection, config) {
   return [
     buildReadTaskChatTool(connection),
@@ -1907,7 +1963,8 @@ function buildCommonTools(connection, config) {
     buildListTaskFilesTool(connection),
     buildGetTaskFileTool(connection),
     buildSearchIncidentsTool(connection),
-    buildGetTaskIncidentsTool(connection)
+    buildGetTaskIncidentsTool(connection),
+    buildCreatePullRequestTool(connection)
   ];
 }
 
@@ -2075,42 +2132,12 @@ function buildPackTools(connection) {
   ];
 }
 
-// src/tools/task-tools.ts
+// src/tools/discovery-tools.ts
 import { tool as tool3 } from "@anthropic-ai/claude-agent-sdk";
 import { z as z3 } from "zod";
-function buildTaskTools(connection) {
-  return [
-    tool3(
-      "create_pull_request",
-      "Create a GitHub pull request for this task. Use this instead of gh CLI or git commands to create PRs.",
-      {
-        title: z3.string().describe("The PR title"),
-        body: z3.string().describe("The PR description/body in markdown")
-      },
-      async ({ title, body }) => {
-        try {
-          const result = await connection.createPR({ title, body });
-          connection.sendEvent({
-            type: "pr_created",
-            url: result.url,
-            number: result.number
-          });
-          return textResult(`Pull request #${result.number} created: ${result.url}`);
-        } catch (error) {
-          const msg = error instanceof Error ? error.message : "Unknown error";
-          return textResult(`Failed to create pull request: ${msg}`);
-        }
-      }
-    )
-  ];
-}
-
-// src/tools/discovery-tools.ts
-import { tool as tool4 } from "@anthropic-ai/claude-agent-sdk";
-import { z as z4 } from "zod";
 function buildIconTools(connection) {
   return [
-    tool4(
+    tool3(
       "list_icons",
       "List available icons (default library + user-created). Returns icon IDs, names, and whether they're defaults. Call this FIRST before set_task_icon to check for existing matches.",
       {},
@@ -2126,11 +2153,11 @@ function buildIconTools(connection) {
       },
       { annotations: { readOnlyHint: true } }
     ),
-    tool4(
+    tool3(
       "set_task_icon",
       "Assign an existing icon to this task by its ID. Use list_icons first to find a matching icon.",
       {
-        iconId: z4.string().describe("The icon ID to assign")
+        iconId: z3.string().describe("The icon ID to assign")
       },
       async ({ iconId }) => {
         try {
@@ -2143,14 +2170,14 @@ function buildIconTools(connection) {
         }
       }
     ),
-    tool4(
+    tool3(
       "generate_task_icon",
       "Generate a new SVG icon using AI and assign it to this task. Only use if no existing icon from list_icons is a good fit. Provide a concise visual description.",
       {
-        prompt: z4.string().describe(
+        prompt: z3.string().describe(
           "Description of the icon to generate (e.g. 'minimal flat gear and wrench icon')"
         ),
-        aspectRatio: z4.enum(["auto", "portrait", "landscape", "square"]).optional().describe("Icon aspect ratio, defaults to square")
+        aspectRatio: z3.enum(["auto", "portrait", "landscape", "square"]).optional().describe("Icon aspect ratio, defaults to square")
       },
       async ({ prompt, aspectRatio }) => {
         try {
@@ -2168,10 +2195,10 @@ function buildIconTools(connection) {
 function buildDiscoveryTools(connection, context) {
   const spDescription = buildStoryPointDescription(context?.storyPoints);
   return [
-    tool4(
+    tool3(
       "set_story_points",
       "Set the story point estimate for this task. Use after understanding the scope of the work.",
-      { value: z4.number().describe(spDescription) },
+      { value: z3.number().describe(spDescription) },
       async ({ value }) => {
         try {
           await Promise.resolve(connection.updateTaskProperties({ storyPointValue: value }));
@@ -2183,11 +2210,11 @@ function buildDiscoveryTools(connection, context) {
         }
       }
     ),
-    tool4(
+    tool3(
       "set_task_tags",
       "Assign tags to this task from the project's available tags. Use the tag IDs from the project tags list.",
       {
-        tagIds: z4.array(z4.string()).describe("Array of tag IDs to assign")
+        tagIds: z3.array(z3.string()).describe("Array of tag IDs to assign")
       },
       async ({ tagIds }) => {
         try {
@@ -2200,11 +2227,11 @@ function buildDiscoveryTools(connection, context) {
         }
       }
     ),
-    tool4(
+    tool3(
       "set_task_title",
       "Update the task title to better reflect the planned work.",
       {
-        title: z4.string().describe("The new task title")
+        title: z3.string().describe("The new task title")
       },
       async ({ title }) => {
         try {
@@ -2231,10 +2258,7 @@ function imageBlock(data, mimeType) {
 function getModeTools(agentMode, connection, config, context) {
   switch (agentMode) {
     case "building":
-      return context?.isParentTask ? [
-        ...buildTaskTools(connection),
-        ...buildPmTools(connection, context?.storyPoints, { includePackTools: true })
-      ] : buildTaskTools(connection);
+      return context?.isParentTask ? buildPmTools(connection, context?.storyPoints, { includePackTools: true }) : [];
     case "review":
     case "auto":
     case "discovery":
@@ -2243,7 +2267,7 @@ function getModeTools(agentMode, connection, config, context) {
         includePackTools: !!context?.isParentTask
       });
     default:
-      return config.mode === "pm" ? buildPmTools(connection, context?.storyPoints, { includePackTools: false }) : buildTaskTools(connection);
+      return config.mode === "pm" ? buildPmTools(connection, context?.storyPoints, { includePackTools: false }) : [];
   }
 }
 function createConveyorMcpServer(connection, config, context, agentMode) {
@@ -2696,16 +2720,15 @@ 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, rateLimitResetsAt } = await processEvents(
-        agentQuery,
-        context,
-        host
-      );
+      const { retriable, resultSummary, modeRestart, rateLimitResetsAt, staleSession } = await processEvents(agentQuery, context, host);
       if (modeRestart || host.isStopped()) return;
       if (rateLimitResetsAt) {
         handleRateLimitPause(host, rateLimitResetsAt);
         return;
       }
+      if (staleSession && context.claudeSessionId) {
+        return handleStaleSession(context, host, options);
+      }
       if (!retriable) return;
       lastErrorWasImage = IMAGE_ERROR_PATTERN2.test(resultSummary ?? "");
     } catch (error) {
@@ -2925,39 +2948,6 @@ async function runSetupSafe(runnerConfig, connection, callbacks, setupLog, _effe
   if (!await checkoutTaskBranch(runnerConfig, connection, callbacks, setupLog)) {
     return { ok: false, deferredStartConfig: null };
   }
-  const taskBranch = process.env.CONVEYOR_TASK_BRANCH;
-  if (taskBranch) {
-    pushSetupLog(setupLog, `[conveyor] Switching to task branch ${taskBranch}...`);
-    connection.sendEvent({
-      type: "setup_output",
-      stream: "stdout",
-      data: `Switching to task branch ${taskBranch}...
-`
-    });
-    try {
-      await runSetupCommand(
-        `git fetch origin ${taskBranch} && git checkout ${taskBranch}`,
-        runnerConfig.workspaceDir,
-        (stream, data) => {
-          connection.sendEvent({ type: "setup_output", stream, data });
-          for (const line of data.split("\n").filter(Boolean)) {
-            pushSetupLog(setupLog, `[${stream}] ${line}`);
-          }
-        }
-      );
-      pushSetupLog(setupLog, `[conveyor] Switched to ${taskBranch}`);
-    } catch (error) {
-      const message = `Failed to checkout ${taskBranch}: ${error instanceof Error ? error.message : "unknown error"}`;
-      connection.sendEvent({ type: "setup_error", message });
-      await callbacks.onEvent({ type: "setup_error", message });
-      connection.postChatMessage(
-        `Failed to switch to task branch \`${taskBranch}\`.
-
-${message}`
-      );
-      return { ok: false, deferredStartConfig: null };
-    }
-  }
   const config = await loadConveyorConfig(runnerConfig.workspaceDir);
   if (!config) {
     connection.sendEvent({ type: "setup_complete" });
@@ -3295,47 +3285,38 @@ var AgentRunner = class {
     } catch {
     }
   }
-  async maybeSendPRNudge() {
+  needsPRNudge() {
     if (!this.config.isAuto || this.stopped) return false;
     const maxNudges = this.taskContext?.agentSettings?.maxPrNudges ?? this.config.agentSettings?.maxPrNudges ?? 3;
     if (this.prNudgeCount >= maxNudges) return false;
+    const status = this.taskContext?.status;
+    return status === "InProgress" && !this.taskContext?.githubPRUrl;
+  }
+  async maybeSendPRNudge() {
     const fresh = await this.connection.fetchTaskContext().catch(() => null);
     if (fresh) this.taskContext = fresh;
-    const status = this.taskContext?.status;
-    const hasPR = !!this.taskContext?.githubPRUrl;
-    if (status === "InProgress" && !hasPR) {
-      this.prNudgeCount++;
-      const ctx = this.taskContext ?? fresh;
-      if (!ctx) return false;
-      if (this.prNudgeCount >= maxNudges) {
-        this.connection.postChatMessage(
-          `Auto-mode agent failed to open a PR after ${maxNudges} nudges. Shutting down.`
-        );
-        this.stop();
-        return true;
-      }
-      if (this.prNudgeCount === 1) {
-        this.connection.postChatMessage(
-          "Auto-nudge: Task is still In Progress with no PR. Prompting agent to continue..."
-        );
-        await this.setState("running");
-        await this.runQuerySafe(
-          ctx,
-          "You are in Auto mode and your task is still In Progress with no pull request. You MUST create a pull request before finishing. Use the create_pull_request tool now to open a PR for your changes. If you are blocked, explain what is preventing you from creating a PR."
-        );
-      } else {
-        this.connection.postChatMessage(
-          `Auto-nudge (attempt ${this.prNudgeCount}/${maxNudges}): Task still has no PR. Prompting agent again...`
-        );
-        await this.setState("running");
-        await this.runQuerySafe(
-          ctx,
-          `This is reminder ${this.prNudgeCount} of ${maxNudges}. You MUST open a pull request using create_pull_request NOW or explain what is blocking you. Do NOT go idle \u2014 either create the PR or describe the specific blocker.`
-        );
-      }
+    if (!this.needsPRNudge()) return false;
+    this.prNudgeCount++;
+    const ctx = this.taskContext ?? fresh;
+    if (!ctx) return false;
+    const maxNudges = this.taskContext?.agentSettings?.maxPrNudges ?? this.config.agentSettings?.maxPrNudges ?? 3;
+    if (this.prNudgeCount >= maxNudges) {
+      this.connection.postChatMessage(
+        `Auto-mode agent failed to open a PR after ${maxNudges} nudges. Shutting down.`
+      );
+      this.stop();
       return true;
     }
-    return false;
+    await this.sendPRNudgeQuery(ctx, maxNudges);
+    return true;
+  }
+  async sendPRNudgeQuery(ctx, maxNudges) {
+    const isFirst = this.prNudgeCount === 1;
+    const chatMsg = isFirst ? "Auto-nudge: Task is still In Progress with no PR. Prompting agent to continue..." : `Auto-nudge (attempt ${this.prNudgeCount}/${maxNudges}): Task still has no PR. Prompting agent again...`;
+    const prompt = isFirst ? "You are in Auto mode and your task is still In Progress with no pull request. You MUST create a pull request before finishing. Use the create_pull_request tool now to open a PR for your changes. If you are blocked, explain what is preventing you from creating a PR." : `This is reminder ${this.prNudgeCount} of ${maxNudges}. You MUST open a pull request using create_pull_request NOW or explain what is blocking you. Do NOT go idle \u2014 either create the PR or describe the specific blocker.`;
+    this.connection.postChatMessage(chatMsg);
+    await this.setState("running");
+    await this.runQuerySafe(ctx, prompt);
   }
   async executeInitialMode() {
     if (!this.taskContext) return;
@@ -3838,7 +3819,7 @@ var ProjectRunner = class {
       projectId: config.projectId
     });
   }
-  async checkoutWorkspaceBranch() {
+  checkoutWorkspaceBranch() {
     const workspaceBranch = process.env.CONVEYOR_WORKSPACE_BRANCH;
     if (!workspaceBranch) return;
     try {
@@ -3853,7 +3834,7 @@ var ProjectRunner = class {
     }
   }
   async start() {
-    await this.checkoutWorkspaceBranch();
+    this.checkoutWorkspaceBranch();
     await this.connection.connect();
     this.connection.onTaskAssignment((assignment) => {
       this.handleAssignment(assignment);
@@ -4068,4 +4049,4 @@ export {
   ProjectRunner,
   FileCache
 };
-//# sourceMappingURL=chunk-R37YJZWE.js.map
+//# sourceMappingURL=chunk-DMWUXQ4M.js.map