@rallycry/conveyor-agent 4.6.0 → 4.7.1

package/dist/{chunk-XG5DMOJX.js → chunk-EBCQISOA.js}

@@ -498,6 +498,9 @@ import { existsSync } from "fs";
 import { join } from "path";
 var WORKTREE_DIR = ".worktrees";
 function ensureWorktree(projectDir, taskId, branch) {
+  if (projectDir.includes(`/${WORKTREE_DIR}/`)) {
+    return projectDir;
+  }
   const worktreePath = join(projectDir, WORKTREE_DIR, taskId);
   if (existsSync(worktreePath)) {
     if (branch) {
@@ -674,7 +677,8 @@ function handleSuccessResult(event, host, context, startTime) {
     let queryInputTokens = 0;
     let contextWindow = 0;
     for (const data of Object.values(modelUsage)) {
-      queryInputTokens += data.inputTokens ?? 0;
+      const d = data;
+      queryInputTokens += (d.inputTokens ?? 0) + (d.cacheReadInputTokens ?? 0) + (d.cacheCreationInputTokens ?? 0);
       const cw = data.contextWindow ?? 0;
       if (cw > contextWindow) contextWindow = cw;
     }
@@ -2075,11 +2079,11 @@ function getModeTools(agentMode, connection, config, context) {
       return config.mode === "pm" ? buildPmTools(connection, context?.storyPoints, { includePackTools: false }) : buildTaskTools(connection);
   }
 }
-function createConveyorMcpServer(connection, config, context) {
+function createConveyorMcpServer(connection, config, context, agentMode) {
   const commonTools = buildCommonTools(connection, config);
-  const agentMode = context?.agentMode ?? void 0;
-  const modeTools = getModeTools(agentMode, connection, config, context);
-  const discoveryTools = agentMode === "discovery" || agentMode === "auto" ? buildDiscoveryTools(connection, context) : [];
+  const effectiveMode = agentMode ?? context?.agentMode ?? void 0;
+  const modeTools = getModeTools(effectiveMode, connection, config, context);
+  const discoveryTools = effectiveMode === "discovery" || effectiveMode === "auto" ? buildDiscoveryTools(connection, context) : [];
   return createSdkMcpServer({
     name: "conveyor",
     tools: [...commonTools, ...modeTools, ...discoveryTools]
@@ -2322,7 +2326,7 @@ function buildQueryOptions(host, context) {
     allowDangerouslySkipPermissions: !needsCanUseTool,
     canUseTool: buildCanUseTool(host),
     tools: { type: "preset", preset: "claude_code" },
-    mcpServers: { conveyor: createConveyorMcpServer(host.connection, host.config, context) },
+    mcpServers: { conveyor: createConveyorMcpServer(host.connection, host.config, context, mode) },
     hooks: buildHooks(host),
     maxTurns: settings.maxTurns,
     effort: settings.effort,
@@ -3043,7 +3047,7 @@ var AgentRunner = class {
     return true;
   }
   tryPostContextWorktree() {
-    if (process.env.CODESPACES !== "true" && !this.worktreeActive && this.taskContext?.useWorktree) {
+    if (process.env.CODESPACES !== "true" && process.env.CONVEYOR_USE_WORKTREE !== "false" && !this.worktreeActive && this.taskContext?.useWorktree) {
       this.activateWorktree("[conveyor] Using worktree (from task config):");
     }
   }
@@ -3773,4 +3777,4 @@ export {
   ProjectRunner,
   FileCache
 };
-//# sourceMappingURL=chunk-XG5DMOJX.js.map
+//# sourceMappingURL=chunk-EBCQISOA.js.map