@rallycry/conveyor-agent 6.1.1 → 6.3.0

package/dist/{chunk-4NL6FASS.js → chunk-WBBX5AIX.js}

@@ -158,6 +158,24 @@ function searchIncidents(socket, status, source) {
 function getTaskIncidents(socket, taskId) {
   return emitRpc(requireSocket(socket), "agentRunner:getTaskIncidents", { taskId });
 }
+function requestScaleUp(socket, tier, reason) {
+  return emitRpc(requireSocket(socket), "agentRunner:scaleUp", { tier, reason });
+}
+function addDependency(socket, dependsOnSlugOrId) {
+  return emitRpcVoid(requireSocket(socket), "agentRunner:addDependency", { dependsOnSlugOrId });
+}
+function removeDependency(socket, dependsOnSlugOrId) {
+  return emitRpcVoid(requireSocket(socket), "agentRunner:removeDependency", { dependsOnSlugOrId });
+}
+function getDependencies(socket) {
+  return emitRpc(requireSocket(socket), "agentRunner:getDependencies", {});
+}
+function createFollowUpTask(socket, data) {
+  return emitRpc(requireSocket(socket), "agentRunner:createFollowUpTask", data);
+}
+function queryGcpLogs(socket, params) {
+  return emitRpc(requireSocket(socket), "agentRunner:queryGcpLogs", params);
+}
 
 // src/connection/task-connection.ts
 var ConveyorConnection = class _ConveyorConnection {
@@ -165,6 +183,7 @@ var ConveyorConnection = class _ConveyorConnection {
   config;
   eventBuffer = [];
   flushTimer = null;
+  lastEmittedStatus = null;
   static EVENT_BATCH_MS = 500;
   earlyMessages = [];
   earlyStop = false;
@@ -252,6 +271,9 @@ var ConveyorConnection = class _ConveyorConnection {
       this.socket.io.on("reconnect", (attempt) => {
         process.stderr.write(`[conveyor] Reconnected after ${attempt} attempt(s)
 `);
+        if (this.socket && this.lastEmittedStatus) {
+          this.socket.emit("agentRunner:statusUpdate", { status: this.lastEmittedStatus });
+        }
       });
       this.socket.io.on("reconnect_error", (err) => {
         process.stderr.write(`[conveyor] Reconnection error: ${err.message}
@@ -296,6 +318,7 @@ var ConveyorConnection = class _ConveyorConnection {
   }
   updateStatus(status) {
     if (!this.socket) throw new Error("Not connected");
+    this.lastEmittedStatus = status;
     this.socket.emit("agentRunner:statusUpdate", { status });
   }
   postChatMessage(content) {
@@ -387,6 +410,7 @@ var ConveyorConnection = class _ConveyorConnection {
   }
   emitStatus(status) {
     if (!this.socket) return;
+    this.lastEmittedStatus = status;
     this.socket.emit("agentRunner:statusUpdate", { status });
   }
   emitRateLimitPause(resetsAt) {
@@ -455,7 +479,7 @@ var ConveyorConnection = class _ConveyorConnection {
     return triggerIdentification(this.socket);
   }
   async refreshAuthToken() {
-    const codespaceName = process.env.CODESPACE_NAME;
+    const codespaceName = process.env.CODESPACE_NAME || process.env.CLAUDESPACE_NAME;
     const apiUrl = process.env.CONVEYOR_API_URL ?? this.config.conveyorApiUrl;
     if (!codespaceName || !apiUrl) return false;
     try {
@@ -497,10 +521,32 @@ var ConveyorConnection = class _ConveyorConnection {
   getTaskIncidents(taskId) {
     return getTaskIncidents(this.socket, taskId);
   }
+  requestScaleUp(tier, reason) {
+    return requestScaleUp(this.socket, tier, reason);
+  }
+  addDependency(dependsOnSlugOrId) {
+    return addDependency(this.socket, dependsOnSlugOrId);
+  }
+  removeDependency(dependsOnSlugOrId) {
+    return removeDependency(this.socket, dependsOnSlugOrId);
+  }
+  getDependencies() {
+    return getDependencies(this.socket);
+  }
+  createFollowUpTask(data) {
+    return createFollowUpTask(this.socket, data);
+  }
+  queryGcpLogs(params) {
+    return queryGcpLogs(this.socket, params);
+  }
   disconnect() {
     this.flushEvents();
-    this.socket?.disconnect();
-    this.socket = null;
+    if (this.socket) {
+      this.socket.io.reconnection(false);
+      this.socket.removeAllListeners();
+      this.socket.disconnect();
+      this.socket = null;
+    }
   }
 };
 
@@ -617,6 +663,7 @@ var ProjectConnection = class {
       this.socket.io.on("reconnect", (attempt) => {
         process.stderr.write(`[conveyor] Project socket reconnected after ${attempt} attempt(s)
 `);
+        this.socket?.emit("projectRunner:heartbeat", {});
       });
       this.socket.io.on("reconnect_error", (err) => {
         process.stderr.write(`[conveyor] Project socket reconnection error: ${err.message}
@@ -792,8 +839,12 @@ var ProjectConnection = class {
     }
   }
   disconnect() {
-    this.socket?.disconnect();
-    this.socket = null;
+    if (this.socket) {
+      this.socket.io.reconnection(false);
+      this.socket.removeAllListeners();
+      this.socket.disconnect();
+      this.socket = null;
+    }
   }
 };
 
@@ -849,6 +900,82 @@ function getCurrentBranch(cwd) {
     return null;
   }
 }
+function hasUnpushedCommits(cwd) {
+  try {
+    const currentBranch = getCurrentBranch(cwd);
+    if (!currentBranch) return false;
+    try {
+      execSync2(`git rev-parse origin/${currentBranch}`, {
+        cwd,
+        stdio: ["ignore", "pipe", "ignore"]
+      });
+    } catch {
+      try {
+        execSync2("git rev-parse HEAD", {
+          cwd,
+          stdio: ["ignore", "pipe", "ignore"]
+        });
+        return true;
+      } catch {
+        return false;
+      }
+    }
+    const ahead = execSync2(`git rev-list --count HEAD --not origin/${currentBranch}`, {
+      cwd,
+      stdio: ["ignore", "pipe", "ignore"]
+    }).toString().trim();
+    return parseInt(ahead, 10) > 0;
+  } catch {
+    return false;
+  }
+}
+function stageAndCommit(cwd, message) {
+  try {
+    execSync2("git add -A", {
+      cwd,
+      stdio: ["ignore", "pipe", "ignore"]
+    });
+    if (!hasUncommittedChanges(cwd)) {
+      return null;
+    }
+    execSync2(`git commit -m "${message}"`, {
+      cwd,
+      stdio: ["ignore", "pipe", "ignore"]
+    });
+    const hash = execSync2("git rev-parse HEAD", {
+      cwd,
+      stdio: ["ignore", "pipe", "ignore"]
+    }).toString().trim();
+    return hash;
+  } catch {
+    return null;
+  }
+}
+function pushToOrigin(cwd) {
+  try {
+    const currentBranch = getCurrentBranch(cwd);
+    if (!currentBranch) return false;
+    try {
+      execSync2(`git push origin ${currentBranch}`, {
+        cwd,
+        stdio: ["ignore", "pipe", "ignore"]
+      });
+      return true;
+    } catch {
+      try {
+        execSync2(`git push --force-with-lease origin ${currentBranch}`, {
+          cwd,
+          stdio: ["ignore", "pipe", "ignore"]
+        });
+        return true;
+      } catch {
+        return false;
+      }
+    }
+  } catch {
+    return false;
+  }
+}
 
 // src/runner/worktree.ts
 var WORKTREE_DIR = ".worktrees";
@@ -957,6 +1084,51 @@ function unshallowRepo(workspaceDir) {
 import { randomUUID as randomUUID2 } from "crypto";
 import { execSync as execSync5 } from "child_process";
 
+// src/harness/types.ts
+function defineTool(name, description, schema, handler, options) {
+  return {
+    name,
+    description,
+    schema,
+    handler,
+    annotations: options?.annotations
+  };
+}
+
+// src/harness/claude-code/index.ts
+import { query, tool, createSdkMcpServer } from "@anthropic-ai/claude-agent-sdk";
+var ClaudeCodeHarness = class {
+  async *executeQuery(opts) {
+    const sdkEvents = query({
+      prompt: opts.prompt,
+      options: {
+        ...opts.options,
+        ...opts.resume ? { resume: opts.resume } : {}
+      }
+    });
+    for await (const event of sdkEvents) {
+      yield event;
+    }
+  }
+  createMcpServer(config) {
+    const sdkTools = config.tools.map(
+      (t) => tool(
+        t.name,
+        t.description,
+        t.schema,
+        t.handler,
+        t.annotations ? { annotations: t.annotations } : void 0
+      )
+    );
+    return createSdkMcpServer({ name: config.name, tools: sdkTools });
+  }
+};
+
+// src/harness/index.ts
+function createHarness() {
+  return new ClaudeCodeHarness();
+}
+
 // src/connection/tunnel-client.ts
 import { request as httpRequest } from "http";
 var logger2 = createServiceLogger("TunnelClient");
@@ -1229,11 +1401,11 @@ async function processAssistantEvent(event, host, turnToolCalls) {
   const { content } = event.message;
   const turnTextParts = [];
   for (const block of content) {
-    if (block.type === "text") {
+    if (block.type === "text" && block.text) {
       turnTextParts.push(block.text);
       host.connection.sendEvent({ type: "message", content: block.text });
       await host.callbacks.onEvent({ type: "message", content: block.text });
-    } else if (block.type === "tool_use") {
+    } else if (block.type === "tool_use" && block.name) {
       const inputStr = typeof block.input === "string" ? block.input : JSON.stringify(block.input);
       const isContentTool = ["edit", "write"].includes(block.name.toLowerCase());
       const inputLimit = isContentTool ? 1e4 : 500;
@@ -1322,7 +1494,9 @@ function handleSuccessResult(event, host, context, startTime, lastAssistantUsage
   const cumulativeTotal = host.costTracker.addQueryCost(event.total_cost_usd);
   const { modelUsage } = event;
   if (modelUsage && typeof modelUsage === "object") {
-    host.costTracker.addModelUsage(modelUsage);
+    host.costTracker.addModelUsage(
+      modelUsage
+    );
   }
   host.connection.sendEvent({ type: "completed", summary, costUsd: cumulativeTotal, durationMs });
   if (modelUsage && typeof modelUsage === "object") {
@@ -1603,11 +1777,6 @@ async function processEvents(events, context, host) {
   };
 }
 
-// src/execution/query-executor.ts
-import {
-  query
-} from "@anthropic-ai/claude-agent-sdk";
-
 // src/execution/pack-runner-prompt.ts
 function findLastAgentMessageIndex(history) {
   for (let i = history.length - 1; i >= 0; i--) {
@@ -1636,11 +1805,11 @@ function buildPackRunnerSystemPrompt(context, config, setupLog) {
   const parts = [
     `You are an autonomous Pack Runner managing child tasks for the "${context.title}" project.`,
     `You are running locally with full access to the repository and task management tools.`,
-    `Your job is to sequentially execute child tasks by firing cloud builds, reviewing their PRs, and merging them.`,
+    `Your job is to execute child tasks by firing cloud builds, reviewing their PRs, and merging them \u2014 respecting dependency chains for parallel execution.`,
     ``,
     `## Child Task Status Lifecycle`,
     `- "Planning" \u2014 Not ready for execution. Skip it (or escalate if blocking).`,
-    `- "Open" \u2014 Ready to execute. Use start_child_cloud_build to fire it.`,
+    `- "Open" \u2014 Ready to execute (if dependencies are met). Use start_child_cloud_build to fire it.`,
     `- "InProgress" \u2014 Currently being worked on by a Task Runner. Wait \u2014 it will move to ReviewPR when done.`,
     `- "ReviewPR" \u2014 Task Runner finished and opened a PR. Review and merge it.`,
     `- "Hold" \u2014 PR exists but is on hold for team review. Do not merge \u2014 skip and move on.`,
@@ -1651,32 +1820,35 @@ function buildPackRunnerSystemPrompt(context, config, setupLog) {
     `Follow this loop each time you are launched or relaunched:`,
     ``,
     `1. Call list_subtasks to see the current state of all child tasks.`,
-    `   The response includes PR info (githubPRNumber, githubPRUrl) and agent assignment (agentId).`,
+    `   The response includes PR info, agent assignment, and **dependency info** (dependencies array + allDependenciesMet flag).`,
     ``,
-    `2. Evaluate each child by status (in ordinal order):`,
-    `   - "ReviewPR": Review and merge its PR with approve_and_merge_pr.`,
-    `     - If merge fails due to pending CI: post a status update to chat, state you are going idle, and the system will relaunch you to try again.`,
-    `     - If merge fails due to failed CI: use get_task_cli(childTaskId) to check what went wrong. Escalate to the team in chat.`,
-    `   - "InProgress": A Task Runner is actively working on this child. Do nothing \u2014 wait for it to finish.`,
-    `   - "Open": This is the next child to execute. Fire it with start_child_cloud_build.`,
-    `     - If it fails because the child is missing story points or an agent: notify the team in chat and go idle.`,
+    `2. Evaluate children by status and dependency readiness:`,
+    `   - "ReviewPR": Review and merge its PR with approve_and_merge_pr. (Highest priority)`,
+    `     - If merge fails due to pending CI: post a status update to chat, state you are going idle.`,
+    `     - If merge fails due to failed CI: use get_task_cli(childTaskId) to check. Escalate to team.`,
+    `   - "InProgress": A Task Runner is actively working. Do nothing \u2014 wait.`,
+    `   - "Open" + allDependenciesMet=true: Ready to fire. Use start_child_cloud_build.`,
+    `   - "Open" + allDependenciesMet=false: Blocked \u2014 skip for now. Will be unblocked when deps complete.`,
     `   - "Hold": On hold \u2014 team must review before merge. Skip.`,
     `   - "ReviewDev" / "Complete": Already done. Skip.`,
-    `   - "Planning": Not ready. If this is blocking progress, notify the team.`,
+    `   - "Planning": Not ready. If blocking progress, notify team.`,
     ``,
-    `3. After merging a PR: run \`git pull origin ${context.baseBranch}\` to get the merged changes before firing the next child.`,
+    `3. Fire ALL ready "Open" tasks whose dependencies are met, not just one. Independent tasks can run in parallel.`,
     ``,
-    `4. After firing a child build: report which task you fired to chat, then explicitly state you are going idle. The system will relaunch you when the child completes or changes status.`,
+    `4. After merging a PR: run \`git pull origin ${context.baseBranch}\` then re-check list_subtasks \u2014 previously blocked tasks may now be ready.`,
     ``,
-    `5. When ALL children are in "ReviewDev", "Complete", or "Hold" (no "Open", "InProgress", or "ReviewPR" remaining): do a final review, summarize results in chat, and mark this parent task complete with force_update_task_status("Complete").`,
+    `5. After firing all ready tasks: report which tasks you fired to chat, then state you are going idle.`,
+    ``,
+    `6. When ALL children are in "ReviewDev", "Complete", or "Hold" (no "Open", "InProgress", or "ReviewPR" remaining): do a final review, summarize results in chat, and mark this parent task complete with force_update_task_status("Complete").`,
     ``,
     `## Important Rules`,
-    `- Process children ONE at a time, in ordinal order.`,
-    `- After firing a child build OR when waiting on CI, explicitly state you are going idle. The system will disconnect you and relaunch when there's a status change.`,
+    `- When dependencies are set on children, use them to determine execution order. Fire all ready tasks in parallel.`,
+    `- When NO dependencies are set on any children, fall back to ordinal order (one at a time). This preserves backward compatibility.`,
+    `- After firing builds OR when waiting on CI, explicitly state you are going idle. The system will disconnect you and relaunch when there's a status change.`,
     `- Do NOT attempt to write code yourself. Your role is coordination only.`,
     `- If a child is stuck in "InProgress" for an unusually long time, use get_task_cli(childTaskId) to check its logs and escalate to the team if it appears stuck.`,
     `- You can use get_task(childTaskId) to get a child's full details including PR URL and branch.`,
-    `- list_subtasks returns PR info (githubPRNumber, githubPRUrl) and agent assignment (agentId) for each child \u2014 use this to verify readiness before firing builds.`,
+    `- list_subtasks returns PR info (githubPRNumber, githubPRUrl), agent assignment (agentId), and dependency info for each child \u2014 use this to verify readiness before firing builds.`,
     `- You can use read_task_chat to check for team messages.`
   ];
   if (context.storyPoints && context.storyPoints.length > 0) {
@@ -1715,11 +1887,12 @@ function buildPackRunnerInstructions(context, scenario) {
     );
   } else if (scenario === "idle_relaunch") {
     parts.push(
-      `You have been relaunched \u2014 a child task likely changed status (completed work, opened a PR, or was merged).`,
+      `You have been relaunched \u2014 a child task likely changed status.`,
       `Call list_subtasks to check the current state of all children.`,
       `Look for children in "ReviewPR" status first \u2014 review and merge their PRs.`,
-      `If a child you previously fired is now in "ReviewDev", it was merged. Pull latest with \`git pull origin ${context.baseBranch}\` and continue to the next "Open" child.`,
-      `If no children need action (all InProgress or waiting), state you are going idle.`
+      `Check if any previously blocked tasks now have allDependenciesMet=true \u2014 fire them.`,
+      `If a child you previously fired is now in "ReviewDev", pull latest with \`git pull origin ${context.baseBranch}\`.`,
+      `If no children need action, state you are going idle.`
     );
   } else {
     const lastAgentIdx = findLastAgentMessageIndex(context.chatHistory);
@@ -1977,7 +2150,7 @@ function buildDiscoveryPrompt(context) {
     `### 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 update_task_properties), **title** (via update_task_properties)`,
-    `- ExitPlanMode validates these properties and moves the task to Open status`,
+    `- ExitPlanMode validates these properties and marks planning as complete`,
     `- It does NOT start building \u2014 the team controls when to switch to Build mode`
   ];
   if (context) parts.push(...buildPropertyInstructions(context));
@@ -2018,8 +2191,8 @@ function buildModePrompt(agentMode, context) {
   switch (agentMode) {
     case "discovery":
       return buildDiscoveryPrompt(context);
-    case "building":
-      return [
+    case "building": {
+      const parts = [
         `
 ## Mode: Building`,
         `You are in Building mode \u2014 executing the plan.`,
@@ -2027,7 +2200,22 @@ function buildModePrompt(agentMode, context) {
         `- Safety rules: no destructive operations, use --force-with-lease instead of --force`,
         `- If this is a leaf task (no children): execute the plan directly`,
         `- Goal: implement the plan, run tests, open a PR when done`
-      ].join("\n");
+      ];
+      if (process.env.CLAUDESPACE_NAME) {
+        parts.push(
+          ``,
+          `### Resource Management`,
+          `Your pod starts with minimal resources (0.25 CPU / 1 Gi). You MUST call \`scale_up_resources\``,
+          `BEFORE running any of these operations \u2014 they WILL fail or OOM at baseline resources:`,
+          `- **light** (1 CPU / 4 Gi) \u2014 bun/npm/yarn install, pip install, basic dev servers, light builds`,
+          `- **standard** (2 CPU / 8 Gi) \u2014 full dev servers, test suites, typecheck, lint`,
+          `- **heavy** (4 CPU / 16 Gi) \u2014 E2E/browser automation, large parallel builds`,
+          `Scaling is one-way (up only) and capped by project limits.`,
+          `CRITICAL: Always scale to at least "light" before running any package install command.`
+        );
+      }
+      return parts.join("\n");
+    }
     case "review":
       return [
         `
@@ -2262,7 +2450,7 @@ Your responses are sent directly to the task chat \u2014 the team sees everythin
   );
   if (!isPm || isPmActive) {
     parts.push(
-      `Use the mcp__conveyor__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 it automatically stages, commits, and pushes changes before creating the PR. Do NOT use gh CLI or shell commands for PR creation.`
     );
   }
   if (options?.hasDebugTools) {
@@ -2475,12 +2663,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 mcp__conveyor__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.`,
       `
 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 mcp__conveyor__create_pull_request to open a PR.`,
+      `When all changes are ready, 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.`
     ];
   }
@@ -2514,14 +2702,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 mcp__conveyor__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.`
   ];
   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 mcp__conveyor__create_pull_request to open a PR before finishing.`,
+      `When all changes are ready, 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.`
     );
   }
@@ -2550,7 +2738,7 @@ New messages since your last run:`,
     ...newMessages.map((m) => `[${m.userName ?? "user"}]: ${m.content}`),
     `
 Address the requested changes directly. Do NOT re-investigate the codebase from scratch or write a new plan \u2014 go straight to implementing the feedback.`,
-    `Commit and push your updates.`
+    `Implement your updates and open a PR when finished.`
   ];
   if (context.githubPRUrl) {
     parts.push(
@@ -2601,7 +2789,7 @@ function buildInstructions(mode, context, scenario, agentMode, isAuto) {
       );
       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.`,
+          `If work is incomplete, continue implementing the plan. When finished, use mcp__conveyor__create_pull_request to open a PR.`,
           `Do NOT go idle or wait for instructions \u2014 you are in auto mode.`
         );
       } else {
@@ -2632,11 +2820,7 @@ async function buildInitialPrompt(mode, context, isAuto, agentMode) {
   return [...body, ...instructions].join("\n");
 }
 
-// src/tools/index.ts
-import { createSdkMcpServer } from "@anthropic-ai/claude-agent-sdk";
-
 // src/tools/common-tools.ts
-import { tool } from "@anthropic-ai/claude-agent-sdk";
 import { z } from "zod";
 function isImageMimeType(mimeType) {
   return mimeType.startsWith("image/");
@@ -2657,7 +2841,7 @@ function formatCliEvent(e) {
   return formatter ? formatter(e) : JSON.stringify(e);
 }
 function buildReadTaskChatTool(connection) {
-  return tool(
+  return defineTool(
     "read_task_chat",
     "Read recent messages from a task chat. Omit task_id to read the current task's chat, or provide a child task ID to read a child's chat.",
     {
@@ -2680,7 +2864,7 @@ function buildReadTaskChatTool(connection) {
   );
 }
 function buildPostToChatTool(connection) {
-  return tool(
+  return defineTool(
     "post_to_chat",
     "Post a message to a task chat. Your normal replies already appear in chat \u2014 only use this for explicit out-of-band updates or posting to a child task's chat.",
     {
@@ -2704,7 +2888,7 @@ function buildPostToChatTool(connection) {
   );
 }
 function buildForceUpdateTaskStatusTool(connection) {
-  return tool(
+  return defineTool(
     "force_update_task_status",
     "EMERGENCY ONLY: Force-override a task's Kanban status. Status transitions happen automatically (building sets InProgress, PR creation sets ReviewPR, merge sets ReviewDev). Only use this if an automatic transition failed or a task is stuck in the wrong status. Omit task_id to update the current task, or provide a child task ID.",
     {
@@ -2728,7 +2912,7 @@ function buildForceUpdateTaskStatusTool(connection) {
   );
 }
 function buildGetTaskPlanTool(connection, config) {
-  return tool(
+  return defineTool(
     "get_task_plan",
     "Re-read the latest task plan in case it was updated",
     {},
@@ -2744,7 +2928,7 @@ function buildGetTaskPlanTool(connection, config) {
   );
 }
 function buildGetTaskTool(connection) {
-  return tool(
+  return defineTool(
     "get_task",
     "Look up a task by slug or ID to get its title, description, plan, and status",
     {
@@ -2764,7 +2948,7 @@ function buildGetTaskTool(connection) {
   );
 }
 function buildGetTaskCliTool(connection) {
-  return tool(
+  return defineTool(
     "get_task_cli",
     "Read CLI execution logs from a task. Returns agent reasoning, tool calls, setup output, and other execution events. Use 'source' to filter: 'agent' for agent reasoning/tool calls only, 'application' for setup/dev-server output only.",
     {
@@ -2792,7 +2976,7 @@ function buildGetTaskCliTool(connection) {
   );
 }
 function buildListTaskFilesTool(connection) {
-  return tool(
+  return defineTool(
     "list_task_files",
     "List all files attached to this task with metadata (name, type, size) and download URLs",
     {},
@@ -2817,7 +3001,7 @@ function buildListTaskFilesTool(connection) {
   );
 }
 function buildGetTaskFileTool(connection) {
-  return tool(
+  return defineTool(
     "get_task_file",
     "Get a specific task file's content and download URL by file ID",
     { fileId: z.string().describe("The file ID to retrieve") },
@@ -2844,7 +3028,7 @@ function buildGetTaskFileTool(connection) {
   );
 }
 function buildSearchIncidentsTool(connection) {
-  return tool(
+  return defineTool(
     "search_incidents",
     "Search incidents in the current project. Optionally filter by status (Open, Acknowledged, Investigating, Resolved, Closed) or source.",
     {
@@ -2865,7 +3049,7 @@ function buildSearchIncidentsTool(connection) {
   );
 }
 function buildGetTaskIncidentsTool(connection) {
-  return tool(
+  return defineTool(
     "get_task_incidents",
     "Get all incidents linked to the current task (or a specified task). Returns full incident details including title, description, severity, status, and source.",
     {
@@ -2884,20 +3068,56 @@ function buildGetTaskIncidentsTool(connection) {
     { annotations: { readOnlyHint: true } }
   );
 }
-function buildCreatePullRequestTool(connection) {
-  return tool(
+function buildCreatePullRequestTool(connection, config) {
+  return defineTool(
     "create_pull_request",
-    "Create a GitHub pull request for this task. Use this instead of gh CLI or git commands to create PRs.",
+    "Create a GitHub pull request for this task. Automatically stages uncommitted changes, commits them, and pushes before creating the PR. 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"),
       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."
+      ),
+      baseBranch: z.string().optional().describe(
+        "The base branch to target for the PR (e.g. 'main', 'develop'). Defaults to the project's configured dev branch."
+      ),
+      commitMessage: z.string().optional().describe(
+        "Commit message for staging uncommitted changes. If not provided, a default message based on the PR title will be used."
       )
     },
-    async ({ title, body, branch }) => {
+    async ({ title, body, branch, baseBranch, commitMessage }) => {
       try {
-        const result = await connection.createPR({ title, body, branch });
+        const cwd = config.workspaceDir;
+        if (hasUncommittedChanges(cwd)) {
+          const message = commitMessage || `${title}
+
+Co-Authored-By: Claude Sonnet 4 <noreply@anthropic.com>`;
+          const commitHash = stageAndCommit(cwd, message);
+          if (commitHash) {
+            connection.sendEvent({
+              type: "message",
+              content: `Auto-committed changes: ${commitHash.slice(0, 7)}`
+            });
+          } else {
+            return textResult(
+              "Failed to stage and commit changes. Please check git status and commit manually before creating PR."
+            );
+          }
+        }
+        if (hasUnpushedCommits(cwd)) {
+          const pushSuccess = pushToOrigin(cwd);
+          if (pushSuccess) {
+            connection.sendEvent({
+              type: "message",
+              content: "Auto-pushed committed changes to origin"
+            });
+          } else {
+            return textResult(
+              "Failed to push changes to origin. Please check git status and push manually before creating PR."
+            );
+          }
+        }
+        const result = await connection.createPR({ title, body, branch, baseBranch });
         connection.sendEvent({
           type: "pr_created",
           url: result.url,
@@ -2911,8 +3131,174 @@ function buildCreatePullRequestTool(connection) {
     }
   );
 }
+function buildQueryGcpLogsTool(connection) {
+  return defineTool(
+    "query_gcp_logs",
+    "Query GCP Cloud Logging for the current project. Returns log entries matching the given filters. Use severity to filter by minimum log level. The project's GCP credentials are used automatically.",
+    {
+      filter: z.string().optional().describe(
+        `Cloud Logging filter expression (e.g., 'resource.type="gce_instance"'). Max 1000 chars.`
+      ),
+      start_time: z.string().optional().describe("Start time in ISO 8601 format (e.g., '2024-01-01T00:00:00Z')"),
+      end_time: z.string().optional().describe("End time in ISO 8601 format (e.g., '2024-01-02T00:00:00Z')"),
+      severity: z.enum([
+        "DEFAULT",
+        "DEBUG",
+        "INFO",
+        "NOTICE",
+        "WARNING",
+        "ERROR",
+        "CRITICAL",
+        "ALERT",
+        "EMERGENCY"
+      ]).optional().describe("Minimum severity level to filter by (default: all levels)"),
+      page_size: z.number().optional().describe("Number of log entries to return (default 100, max 500)")
+    },
+    async ({ filter, start_time, end_time, severity, page_size }) => {
+      try {
+        const result = await connection.queryGcpLogs({
+          filter,
+          startTime: start_time,
+          endTime: end_time,
+          severity,
+          pageSize: page_size
+        });
+        if (result.entries.length === 0) {
+          return textResult("No log entries found matching the given filters.");
+        }
+        const summary = `Found ${result.entries.length} log entries${result.hasMore ? " (more available \u2014 refine filters or increase page_size)" : ""}.`;
+        const formatted = result.entries.map((e) => `[${e.timestamp}] [${e.severity}] ${e.message}`).join("\n");
+        return textResult(`${summary}
+
+${formatted}`);
+      } catch (error) {
+        return textResult(
+          `Failed to query GCP logs: ${error instanceof Error ? error.message : "Unknown error"}`
+        );
+      }
+    },
+    { annotations: { readOnlyHint: true } }
+  );
+}
+function buildScaleUpResourcesTool(connection) {
+  return defineTool(
+    "scale_up_resources",
+    "Scale up the pod's CPU and memory resources. Use before running dev servers, tests, builds, or other resource-intensive operations. Tiers: 'light' (1 CPU / 4 Gi \u2014 installs, basic dev servers), 'standard' (2 CPU / 8 Gi \u2014 full dev servers, test suites, typecheck), 'heavy' (4 CPU / 16 Gi \u2014 E2E tests, large parallel builds). Scaling is one-way (up only) and capped by project limits.",
+    {
+      tier: z.enum(["light", "standard", "heavy"]).describe("The resource tier to scale up to"),
+      reason: z.string().optional().describe("Brief reason for scaling (e.g., 'running test suite')")
+    },
+    async ({ tier, reason }) => {
+      try {
+        const result = await connection.requestScaleUp(tier, reason);
+        if (result.success) {
+          if (result.currentTier === result.previousTier) {
+            return textResult(
+              `Already at ${result.currentTier} tier (${result.cpu} CPU / ${result.memory} Gi). No scaling needed.`
+            );
+          }
+          return textResult(
+            `Scaled to ${result.cpu} CPU / ${result.memory} Gi (${result.currentTier} tier, was ${result.previousTier}).`
+          );
+        }
+        return textResult(
+          `Scale-up not available: ${result.error ?? "unknown error"}. Continuing at current resources.`
+        );
+      } catch (error) {
+        return textResult(
+          `Scale-up failed: ${error instanceof Error ? error.message : "unknown error"}. Continuing at current resources.`
+        );
+      }
+    }
+  );
+}
+function buildAddDependencyTool(connection) {
+  return defineTool(
+    "add_dependency",
+    "Add a dependency \u2014 this task cannot start until the specified task is merged to dev",
+    {
+      depends_on_slug_or_id: z.string().describe("Slug or ID of the task this task depends on")
+    },
+    async ({ depends_on_slug_or_id }) => {
+      try {
+        await connection.addDependency(depends_on_slug_or_id);
+        return textResult(`Dependency added: this task now depends on "${depends_on_slug_or_id}"`);
+      } catch (error) {
+        return textResult(
+          `Failed to add dependency: ${error instanceof Error ? error.message : "Unknown error"}`
+        );
+      }
+    }
+  );
+}
+function buildRemoveDependencyTool(connection) {
+  return defineTool(
+    "remove_dependency",
+    "Remove a dependency from this task",
+    {
+      depends_on_slug_or_id: z.string().describe("Slug or ID of the task to remove as dependency")
+    },
+    async ({ depends_on_slug_or_id }) => {
+      try {
+        await connection.removeDependency(depends_on_slug_or_id);
+        return textResult("Dependency removed");
+      } catch (error) {
+        return textResult(
+          `Failed to remove dependency: ${error instanceof Error ? error.message : "Unknown error"}`
+        );
+      }
+    }
+  );
+}
+function buildGetDependenciesTool(connection) {
+  return defineTool(
+    "get_dependencies",
+    "Get this task's dependencies and their current status (met = merged to dev)",
+    {},
+    async () => {
+      try {
+        const deps = await connection.getDependencies();
+        return textResult(JSON.stringify(deps, null, 2));
+      } catch (error) {
+        return textResult(
+          `Failed to get dependencies: ${error instanceof Error ? error.message : "Unknown error"}`
+        );
+      }
+    },
+    { annotations: { readOnlyHint: true } }
+  );
+}
+function buildCreateFollowUpTaskTool(connection) {
+  return defineTool(
+    "create_follow_up_task",
+    "Create a follow-up task in this project that depends on the current task. Use for out-of-scope work, v1.1 features, or cleanup that should happen after this task merges.",
+    {
+      title: z.string().describe("Follow-up task title"),
+      description: z.string().optional().describe("Brief description of the follow-up work"),
+      plan: z.string().optional().describe("Implementation plan if known"),
+      story_point_value: z.number().optional().describe("Story point estimate (1=Common, 2=Magic, 3=Rare, 5=Unique)")
+    },
+    async ({ title, description, plan, story_point_value }) => {
+      try {
+        const result = await connection.createFollowUpTask({
+          title,
+          description,
+          plan,
+          storyPointValue: story_point_value
+        });
+        return textResult(
+          `Follow-up task created: "${title}" (slug: ${result.slug}). It depends on the current task and will be unblocked when this task is merged.`
+        );
+      } catch (error) {
+        return textResult(
+          `Failed to create follow-up task: ${error instanceof Error ? error.message : "Unknown error"}`
+        );
+      }
+    }
+  );
+}
 function buildCommonTools(connection, config) {
-  return [
+  const tools = [
     buildReadTaskChatTool(connection),
     buildPostToChatTool(connection),
     buildGetTaskPlanTool(connection, config),
@@ -2922,12 +3308,20 @@ function buildCommonTools(connection, config) {
     buildGetTaskFileTool(connection),
     buildSearchIncidentsTool(connection),
     buildGetTaskIncidentsTool(connection),
-    buildCreatePullRequestTool(connection)
+    buildQueryGcpLogsTool(connection),
+    buildCreatePullRequestTool(connection, config),
+    buildAddDependencyTool(connection),
+    buildRemoveDependencyTool(connection),
+    buildGetDependenciesTool(connection),
+    buildCreateFollowUpTaskTool(connection)
   ];
+  if (process.env.CLAUDESPACE_NAME) {
+    tools.push(buildScaleUpResourcesTool(connection));
+  }
+  return tools;
 }
 
 // src/tools/pm-tools.ts
-import { tool as tool2 } from "@anthropic-ai/claude-agent-sdk";
 import { z as z2 } from "zod";
 function buildStoryPointDescription(storyPoints) {
   if (storyPoints && storyPoints.length > 0) {
@@ -2938,7 +3332,7 @@ function buildStoryPointDescription(storyPoints) {
 }
 function buildSubtaskTools(connection, spDescription) {
   return [
-    tool2(
+    defineTool(
       "create_subtask",
       "Create a subtask under the current parent task. Use for breaking complex tasks into smaller pieces.",
       {
@@ -2959,7 +3353,7 @@ function buildSubtaskTools(connection, spDescription) {
         }
       }
     ),
-    tool2(
+    defineTool(
       "update_subtask",
       "Update an existing subtask's fields",
       {
@@ -2979,7 +3373,7 @@ function buildSubtaskTools(connection, spDescription) {
         }
       }
     ),
-    tool2(
+    defineTool(
       "delete_subtask",
       "Delete a subtask",
       { subtaskId: z2.string().describe("The subtask ID to delete") },
@@ -2992,7 +3386,7 @@ function buildSubtaskTools(connection, spDescription) {
         }
       }
     ),
-    tool2(
+    defineTool(
       "list_subtasks",
       "List all subtasks under the current parent task. Returns status, PR info (githubPRNumber, githubPRUrl), agent assignment (agentId), and plan for each child.",
       {},
@@ -3009,7 +3403,7 @@ function buildSubtaskTools(connection, spDescription) {
   ];
 }
 function buildUpdateTaskTool(connection) {
-  return tool2(
+  return defineTool(
     "update_task",
     "Save the finalized task plan and/or description",
     {
@@ -3034,7 +3428,7 @@ function buildPmTools(connection, storyPoints, options) {
 }
 function buildPackTools(connection) {
   return [
-    tool2(
+    defineTool(
       "start_child_cloud_build",
       "Start a cloud build for a child task. The child must be in Open status with story points and an agent assigned.",
       {
@@ -3051,7 +3445,7 @@ function buildPackTools(connection) {
         }
       }
     ),
-    tool2(
+    defineTool(
       "stop_child_build",
       "Stop a running cloud build for a child task. Sends a stop signal to the child agent.",
       {
@@ -3068,7 +3462,7 @@ function buildPackTools(connection) {
         }
       }
     ),
-    tool2(
+    defineTool(
       "approve_and_merge_pr",
       "Approve and merge a child task's pull request. Only succeeds if all CI/CD checks are passing. Returns an error if checks are pending (retry after waiting) or failed (investigate). The child task must be in ReviewPR status.",
       {
@@ -3096,11 +3490,10 @@ function buildPackTools(connection) {
 }
 
 // src/tools/discovery-tools.ts
-import { tool as tool3 } from "@anthropic-ai/claude-agent-sdk";
 import { z as z3 } from "zod";
 function buildIconTools(connection) {
   return [
-    tool3(
+    defineTool(
       "list_icons",
       "List available icons (default library + user-created). Returns icon IDs, names, and whether they're defaults. Call this FIRST before update_task_properties to check for existing matches.",
       {},
@@ -3116,7 +3509,7 @@ function buildIconTools(connection) {
       },
       { annotations: { readOnlyHint: true } }
     ),
-    tool3(
+    defineTool(
       "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.",
       {
@@ -3141,7 +3534,7 @@ function buildIconTools(connection) {
 function buildDiscoveryTools(connection, context) {
   const spDescription = buildStoryPointDescription(context?.storyPoints);
   return [
-    tool3(
+    defineTool(
       "update_task_properties",
       "Set one or more task properties in a single call. All fields are optional \u2014 only include the fields you want to update.",
       {
@@ -3177,11 +3570,9 @@ function buildDiscoveryTools(connection, context) {
 }
 
 // src/tools/debug-tools.ts
-import { tool as tool6 } from "@anthropic-ai/claude-agent-sdk";
 import { z as z6 } from "zod";
 
 // src/tools/telemetry-tools.ts
-import { tool as tool4 } from "@anthropic-ai/claude-agent-sdk";
 import { z as z4 } from "zod";
 
 // src/debug/telemetry-injector.ts
@@ -3573,7 +3964,7 @@ function formatError(error) {
   return error instanceof Error ? error.message : "Unknown error";
 }
 function buildGetTelemetryTool(manager) {
-  return tool4(
+  return defineTool(
     "debug_get_telemetry",
     "Query structured telemetry events (HTTP requests, database queries, Socket.IO events, errors) captured from the running dev server. Returns filtered, structured data instead of raw logs.",
     {
@@ -3609,7 +4000,7 @@ function buildGetTelemetryTool(manager) {
   );
 }
 function buildClearTelemetryTool(manager) {
-  return tool4(
+  return defineTool(
     "debug_clear_telemetry",
     "Clear all captured telemetry events from the buffer. Useful to reset before reproducing a specific issue.",
     {},
@@ -3626,7 +4017,7 @@ function buildClearTelemetryTool(manager) {
   );
 }
 function buildTelemetryStatusTool(manager) {
-  return tool4(
+  return defineTool(
     "debug_telemetry_status",
     "Check if telemetry is active, how many events have been captured, and which framework patches (Express, Prisma, Socket.IO) were successfully applied.",
     {},
@@ -3652,7 +4043,6 @@ function buildTelemetryTools(manager) {
 }
 
 // src/tools/client-debug-tools.ts
-import { tool as tool5 } from "@anthropic-ai/claude-agent-sdk";
 import { z as z5 } from "zod";
 function requirePlaywrightClient(manager) {
   if (!manager.isClientDebugMode()) {
@@ -3669,7 +4059,7 @@ function formatError2(error) {
 }
 function buildClientBreakpointTools(manager) {
   return [
-    tool5(
+    defineTool(
       "debug_set_client_breakpoint",
       "Set a breakpoint in client-side code running in the headless Chromium browser. V8 resolves source maps automatically, so original .tsx/.ts file paths work. Use this for React components, client utilities, and browser-side code.",
       {
@@ -3695,7 +4085,7 @@ Breakpoint ID: ${breakpointId}${sourceMapNote}`
         }
       }
     ),
-    tool5(
+    defineTool(
       "debug_remove_client_breakpoint",
       "Remove a previously set client-side breakpoint by its ID.",
       {
@@ -3712,7 +4102,7 @@ Breakpoint ID: ${breakpointId}${sourceMapNote}`
         }
       }
     ),
-    tool5(
+    defineTool(
       "debug_list_client_breakpoints",
       "List all active client-side breakpoints with their file, line, and condition.",
       {},
@@ -3732,7 +4122,7 @@ Breakpoint ID: ${breakpointId}${sourceMapNote}`
 }
 function buildClientInspectionTools(manager) {
   return [
-    tool5(
+    defineTool(
       "debug_inspect_client_paused",
       "When the client-side debugger is paused at a breakpoint, returns the call stack and local variables. Includes React component state, props, and hooks when paused inside a component.",
       {},
@@ -3775,7 +4165,7 @@ ${JSON.stringify(queuedHits, null, 2)}`
       },
       { annotations: { readOnlyHint: true } }
     ),
-    tool5(
+    defineTool(
       "debug_evaluate_client",
       "Evaluate a JavaScript expression in the client-side browser context. When paused at a client breakpoint, evaluates in the paused scope. Can access DOM, window, React internals, etc.",
       {
@@ -3803,7 +4193,7 @@ ${JSON.stringify(queuedHits, null, 2)}`
 }
 function buildClientExecutionTools(manager) {
   return [
-    tool5(
+    defineTool(
       "debug_continue_client",
       "Resume client-side execution after the browser debugger has paused at a breakpoint.",
       {},
@@ -3825,7 +4215,7 @@ function buildClientExecutionTools(manager) {
 }
 function buildClientInteractionTools(manager) {
   return [
-    tool5(
+    defineTool(
       "debug_client_screenshot",
       "Take a screenshot of the current page state in the headless browser. Returns the image as base64-encoded PNG.",
       {},
@@ -3849,7 +4239,7 @@ function buildClientInteractionTools(manager) {
       },
       { annotations: { readOnlyHint: true } }
     ),
-    tool5(
+    defineTool(
       "debug_navigate_client",
       "Navigate the headless browser to a specific URL. Use this to reproduce specific flows or visit different pages.",
       {
@@ -3866,7 +4256,7 @@ function buildClientInteractionTools(manager) {
         }
       }
     ),
-    tool5(
+    defineTool(
       "debug_click_client",
       "Click an element on the page in the headless browser. Use CSS selectors to target elements. Useful for reproducing bugs by interacting with the UI programmatically.",
       {
@@ -3888,7 +4278,7 @@ function buildClientInteractionTools(manager) {
   ];
 }
 function buildClientConsoleTool(manager) {
-  return tool5(
+  return defineTool(
     "debug_get_client_console",
     "Get console messages captured from the headless browser. Includes console.log, warn, error, etc.",
     {
@@ -3916,7 +4306,7 @@ ${formatted}`);
   );
 }
 function buildClientNetworkTool(manager) {
-  return tool5(
+  return defineTool(
     "debug_get_client_network",
     "Get network requests captured from the headless browser. Shows URLs, methods, status codes, and timing.",
     {
@@ -3945,7 +4335,7 @@ ${formatted}`);
   );
 }
 function buildClientErrorsTool(manager) {
-  return tool5(
+  return defineTool(
     "debug_get_client_errors",
     "Get uncaught errors captured from the headless browser. Includes error messages and source-mapped stack traces.",
     {
@@ -4039,7 +4429,7 @@ Set breakpoints to test your hypothesis.${sourceMapWarning}` : `Debug mode activ
 }
 function buildDebugLifecycleTools(manager) {
   return [
-    tool6(
+    defineTool(
       "debug_enter_mode",
       "Activate debug mode: restarts the dev server with Node.js --inspect flag and connects the CDP debugger. Optionally launch a headless Chromium browser for client-side debugging. Use serverSide for backend breakpoints, clientSide for frontend breakpoints, or both for full-stack.",
       {
@@ -4060,7 +4450,7 @@ function buildDebugLifecycleTools(manager) {
         }
       }
     ),
-    tool6(
+    defineTool(
       "debug_exit_mode",
       "Exit debug mode: removes all breakpoints, disconnects the debugger, and restarts the dev server normally.",
       {},
@@ -4080,7 +4470,7 @@ function buildDebugLifecycleTools(manager) {
 }
 function buildBreakpointTools(manager) {
   return [
-    tool6(
+    defineTool(
       "debug_set_breakpoint",
       "Set a breakpoint at the specified file and line number. Optionally provide a condition expression that must evaluate to true for the breakpoint to pause execution.",
       {
@@ -4104,7 +4494,7 @@ Breakpoint ID: ${breakpointId}`
         }
       }
     ),
-    tool6(
+    defineTool(
       "debug_remove_breakpoint",
       "Remove a previously set breakpoint by its ID.",
       {
@@ -4122,7 +4512,7 @@ Breakpoint ID: ${breakpointId}`
         }
       }
     ),
-    tool6(
+    defineTool(
       "debug_list_breakpoints",
       "List all currently active breakpoints with their file, line, and condition.",
       {},
@@ -4142,7 +4532,7 @@ Breakpoint ID: ${breakpointId}`
 }
 function buildInspectionTools(manager) {
   return [
-    tool6(
+    defineTool(
       "debug_inspect_paused",
       "When the debugger is paused at a breakpoint, returns the call stack and local variables. Check this after a breakpoint is hit to understand the current execution state.",
       {},
@@ -4185,7 +4575,7 @@ ${JSON.stringify(queuedHits, null, 2)}`
       },
       { annotations: { readOnlyHint: true } }
     ),
-    tool6(
+    defineTool(
       "debug_evaluate",
       "Evaluate a JavaScript expression in the current paused scope (or globally if not paused). When paused, use frameIndex to evaluate in a specific call frame.",
       {
@@ -4214,7 +4604,7 @@ ${JSON.stringify(queuedHits, null, 2)}`
 }
 function buildProbeManagementTools(manager) {
   return [
-    tool6(
+    defineTool(
       "debug_add_probe",
       "Add a debug probe at a specific code location. Captures expression values each time the line executes \u2014 without pausing or modifying source files. Like console.log but better: structured, no diff pollution, auto-cleaned on debug exit.",
       {
@@ -4244,7 +4634,7 @@ Trigger the code path, then use debug_get_probe_results to see captured values.`
         }
       }
     ),
-    tool6(
+    defineTool(
       "debug_remove_probe",
       "Remove a previously set debug probe by its ID.",
       {
@@ -4261,7 +4651,7 @@ Trigger the code path, then use debug_get_probe_results to see captured values.`
         }
       }
     ),
-    tool6(
+    defineTool(
       "debug_list_probes",
       "List all active debug probes with their file, line, expressions, and labels.",
       {},
@@ -4284,7 +4674,7 @@ Trigger the code path, then use debug_get_probe_results to see captured values.`
 }
 function buildProbeResultTools(manager) {
   return [
-    tool6(
+    defineTool(
       "debug_get_probe_results",
       "Fetch captured probe hit data. Returns expression values from each time a probed line executed.",
       {
@@ -4359,7 +4749,7 @@ function formatProbeValue(value) {
 }
 function buildExecutionControlTools(manager) {
   return [
-    tool6(
+    defineTool(
       "debug_continue",
       "Resume execution after the debugger has paused at a breakpoint.",
       {},
@@ -4377,7 +4767,7 @@ function buildExecutionControlTools(manager) {
         }
       }
     ),
-    tool6(
+    defineTool(
       "debug_step_over",
       "Step over the current line while paused at a breakpoint. Executes the current line and pauses at the next line in the same function.",
       {},
@@ -4395,7 +4785,7 @@ function buildExecutionControlTools(manager) {
         }
       }
     ),
-    tool6(
+    defineTool(
       "debug_step_into",
       "Step into the function call on the current line while paused at a breakpoint. Pauses at the first line inside the called function.",
       {},
@@ -4429,11 +4819,10 @@ function buildDebugTools(manager) {
 }
 
 // src/tools/code-review-tools.ts
-import { tool as tool7 } from "@anthropic-ai/claude-agent-sdk";
 import { z as z7 } from "zod";
 function buildCodeReviewTools(connection) {
   return [
-    tool7(
+    defineTool(
       "approve_code_review",
       "Approve the code review. Use this when the code passes all review criteria and is ready to merge.",
       {
@@ -4455,7 +4844,7 @@ ${summary}`,
         return textResult("Code review approved. Exiting.");
       }
     ),
-    tool7(
+    defineTool(
       "request_code_changes",
       "Request changes during code review. Use this when substantive issues are found that need to be fixed before merge.",
       {
@@ -4524,30 +4913,30 @@ function getModeTools(agentMode, connection, config, context) {
       return config.mode === "pm" ? buildPmTools(connection, context?.storyPoints, { includePackTools: false }) : [];
   }
 }
-function createConveyorMcpServer(connection, config, context, agentMode, debugManager) {
+function buildConveyorTools(connection, config, context, agentMode, debugManager) {
   const effectiveMode = agentMode ?? context?.agentMode ?? void 0;
   if (effectiveMode === "code-review") {
-    return createSdkMcpServer({
-      name: "conveyor",
-      tools: [
-        buildReadTaskChatTool(connection),
-        buildGetTaskPlanTool(connection, config),
-        buildGetTaskTool(connection),
-        buildGetTaskCliTool(connection),
-        buildListTaskFilesTool(connection),
-        buildGetTaskFileTool(connection),
-        ...buildCodeReviewTools(connection)
-      ]
-    });
+    return [
+      buildReadTaskChatTool(connection),
+      buildGetTaskPlanTool(connection, config),
+      buildGetTaskTool(connection),
+      buildGetTaskCliTool(connection),
+      buildListTaskFilesTool(connection),
+      buildGetTaskFileTool(connection),
+      ...buildCodeReviewTools(connection)
+    ];
   }
   const commonTools = buildCommonTools(connection, config);
   const modeTools = getModeTools(effectiveMode, connection, config, context);
   const discoveryTools = effectiveMode === "discovery" || effectiveMode === "auto" ? buildDiscoveryTools(connection, context) : [];
   const debugTools = debugManager && effectiveMode === "building" ? buildDebugTools(debugManager) : [];
   const emergencyTools = [buildForceUpdateTaskStatusTool(connection)];
-  return createSdkMcpServer({
+  return [...commonTools, ...modeTools, ...discoveryTools, ...debugTools, ...emergencyTools];
+}
+function createConveyorMcpServer(harness, connection, config, context, agentMode, debugManager) {
+  return harness.createMcpServer({
     name: "conveyor",
-    tools: [...commonTools, ...modeTools, ...discoveryTools, ...debugTools, ...emergencyTools]
+    tools: buildConveyorTools(connection, config, context, agentMode, debugManager)
   });
 }
 
@@ -4556,6 +4945,14 @@ import { randomUUID } from "crypto";
 var PM_PLAN_FILE_TOOLS = /* @__PURE__ */ new Set(["Write", "Edit", "MultiEdit"]);
 var DESTRUCTIVE_CMD_PATTERN = /git\s+push\s+--force(?!\s*-with-lease)|git\s+reset\s+--hard|rm\s+-rf\s+\//;
 var CODE_REVIEW_WRITE_CMD_PATTERN = /git\s+push|git\s+commit|git\s+add|rm\s+|mv\s+|cp\s+|mkdir\s+|touch\s+|chmod\s+|chown\s+/;
+var RESOURCE_HEAVY_PATTERNS = [
+  /\bbun\s+(install|i|add)\b/,
+  /\bnpm\s+(install|ci|i)\b/,
+  /\byarn(\s+install)?\s/,
+  /\bpnpm\s+(install|i|add)\b/,
+  /\bpip\s+install\b/,
+  /\bcargo\s+build\b/
+];
 function isPlanFile(input) {
   const filePath = String(input.file_path ?? input.path ?? "");
   return filePath.includes(".claude/plans/");
@@ -4658,14 +5055,15 @@ async function handleExitPlanMode(host, input) {
         ].join("\n")
       };
     }
-    await host.connection.triggerIdentification();
-    host.hasExitedPlanMode = true;
     if (host.agentMode === "discovery") {
+      host.hasExitedPlanMode = true;
       host.connection.postChatMessage(
-        "Task identified and moved to Open. Switch to Build mode when ready to start implementation."
+        "Plan complete. The task stays in Planning \u2014 identify it or switch to Build mode when ready."
       );
       return { behavior: "allow", updatedInput: input };
     }
+    await host.connection.triggerIdentification();
+    host.hasExitedPlanMode = true;
     const newMode = host.isParentTask ? "review" : "building";
     host.pendingModeRestart = true;
     if (host.onModeTransition) {
@@ -4704,35 +5102,47 @@ async function handleAskUserQuestion(host, input) {
   return { behavior: "allow", updatedInput: { questions: input.questions, answers } };
 }
 var DENIAL_WARNING_THRESHOLD = 3;
+function isResourceHeavyCommand(command) {
+  return RESOURCE_HEAVY_PATTERNS.some((p) => p.test(command));
+}
+var autoScaled = false;
+async function maybeAutoScale(host, toolName, input) {
+  if (autoScaled || !process.env.CLAUDESPACE_NAME || toolName !== "Bash" || typeof input.command !== "string" || !isResourceHeavyCommand(input.command)) {
+    return;
+  }
+  autoScaled = true;
+  try {
+    await host.connection.requestScaleUp("light", `auto-scale: ${input.command.slice(0, 60)}`);
+  } catch {
+  }
+}
+function resolveToolAccess(host, toolName, input) {
+  switch (host.agentMode) {
+    case "discovery":
+      return handleDiscoveryToolAccess(toolName, input);
+    case "building":
+      return handleBuildingToolAccess(toolName, input);
+    case "review":
+      return handleReviewToolAccess(toolName, input, host.isParentTask);
+    case "auto":
+      return handleAutoToolAccess(toolName, input, host.hasExitedPlanMode, host.isParentTask);
+    case "code-review":
+      return handleCodeReviewToolAccess(toolName, input);
+    default:
+      return { behavior: "allow", updatedInput: input };
+  }
+}
 function buildCanUseTool(host) {
   let consecutiveDenials = 0;
   return async (toolName, input) => {
+    await maybeAutoScale(host, toolName, input);
     if (toolName === "ExitPlanMode" && (host.agentMode === "auto" || host.agentMode === "discovery") && !host.hasExitedPlanMode) {
       return await handleExitPlanMode(host, input);
     }
     if (toolName === "AskUserQuestion") {
       return await handleAskUserQuestion(host, input);
     }
-    let result;
-    switch (host.agentMode) {
-      case "discovery":
-        result = handleDiscoveryToolAccess(toolName, input);
-        break;
-      case "building":
-        result = handleBuildingToolAccess(toolName, input);
-        break;
-      case "review":
-        result = handleReviewToolAccess(toolName, input, host.isParentTask);
-        break;
-      case "auto":
-        result = handleAutoToolAccess(toolName, input, host.hasExitedPlanMode, host.isParentTask);
-        break;
-      case "code-review":
-        result = handleCodeReviewToolAccess(toolName, input);
-        break;
-      default:
-        result = { behavior: "allow", updatedInput: input };
-    }
+    const result = resolveToolAccess(host, toolName, input);
     if (result.behavior === "deny") {
       consecutiveDenials++;
       if (consecutiveDenials === DENIAL_WARNING_THRESHOLD) {
@@ -4758,6 +5168,7 @@ function buildHooks(host) {
       {
         hooks: [
           async (input) => {
+            if (host.isStopped()) return await Promise.resolve({ continue: false });
             if (input.hook_event_name === "PostToolUse") {
               const output = typeof input.tool_response === "string" ? input.tool_response.slice(0, 500) : JSON.stringify(input.tool_response).slice(0, 500);
               host.connection.sendEvent({
@@ -4801,7 +5212,7 @@ function buildQueryOptions(host, context) {
     mode
   );
   const settingSources = settings.settingSources ?? ["user", "project"];
-  const baseOptions = {
+  return {
     model: context.model || host.config.model,
     systemPrompt: {
       type: "preset",
@@ -4814,7 +5225,9 @@ function buildQueryOptions(host, context) {
     allowDangerouslySkipPermissions: !needsCanUseTool,
     canUseTool: buildCanUseTool(host),
     tools: { type: "preset", preset: "claude_code" },
-    mcpServers: { conveyor: createConveyorMcpServer(host.connection, host.config, context, mode) },
+    mcpServers: {
+      conveyor: createConveyorMcpServer(host.harness, host.connection, host.config, context, mode)
+    },
     sandbox: context.useSandbox ? { enabled: true } : { enabled: false },
     hooks: buildHooks(host),
     maxTurns: mode === "code-review" ? Math.min(settings.maxTurns ?? 15, 15) : settings.maxTurns,
@@ -4828,7 +5241,6 @@ function buildQueryOptions(host, context) {
       logger3.warn("Claude Code stderr", { data: data.trimEnd() });
     }
   };
-  return baseOptions;
 }
 function buildMultimodalPrompt(textPrompt, context, skipImages = false) {
   if (skipImages) return textPrompt;
@@ -4901,9 +5313,10 @@ async function runSdkQuery(host, context, followUpContent) {
   const resume = context.claudeSessionId ?? void 0;
   if (followUpContent) {
     const prompt = await buildFollowUpPrompt(host, context, followUpContent);
-    const agentQuery = query({
+    const agentQuery = host.harness.executeQuery({
       prompt: typeof prompt === "string" ? prompt : host.createInputStream(prompt),
-      options: { ...options, resume }
+      options: { ...options },
+      resume
     });
     host.activeQuery = agentQuery;
     try {
@@ -4921,9 +5334,10 @@ async function runSdkQuery(host, context, followUpContent) {
       mode
     );
     const prompt = buildMultimodalPrompt(initialPrompt, context);
-    const agentQuery = query({
+    const agentQuery = host.harness.executeQuery({
       prompt: host.createInputStream(prompt),
-      options: { ...options, resume }
+      options: { ...options },
+      resume
     });
     host.activeQuery = agentQuery;
     try {
@@ -4947,9 +5361,10 @@ async function buildRetryQuery(host, context, options, lastErrorWasImage) {
     context,
     lastErrorWasImage
   );
-  return query({
+  return host.harness.executeQuery({
     prompt: host.createInputStream(retryPrompt),
-    options: { ...options, resume: void 0 }
+    options: { ...options },
+    resume: void 0
   });
 }
 async function handleAuthError(context, host, options) {
@@ -4969,9 +5384,10 @@ async function handleAuthError(context, host, options) {
     await buildInitialPrompt(host.config.mode, context, host.config.isAuto, host.agentMode),
     context
   );
-  const freshQuery = query({
+  const freshQuery = host.harness.executeQuery({
     prompt: host.createInputStream(freshPrompt),
-    options: { ...options, resume: void 0 }
+    options: { ...options },
+    resume: void 0
   });
   return runWithRetry(freshQuery, context, host, options);
 }
@@ -4982,9 +5398,10 @@ async function handleStaleSession(context, host, options) {
     await buildInitialPrompt(host.config.mode, context, host.config.isAuto, host.agentMode),
     context
   );
-  const freshQuery = query({
+  const freshQuery = host.harness.executeQuery({
     prompt: host.createInputStream(freshPrompt),
-    options: { ...options, resume: void 0 }
+    options: { ...options },
+    resume: void 0
   });
   return runWithRetry(freshQuery, context, host, options);
 }
@@ -5227,7 +5644,26 @@ function pushSetupLog(setupLog, line) {
     setupLog.splice(0, setupLog.length - MAX_SETUP_LOG_LINES);
   }
 }
+function shouldAutoScale(setupCmd, startCmd) {
+  const cmds = [setupCmd, startCmd].filter(Boolean).join(" ");
+  const heavyPatterns = [
+    /\bbun\s+(install|i)\b/,
+    /\bnpm\s+(install|ci)\b/,
+    /\byarn\s+(install)?\b/,
+    /\bpnpm\s+(install|i)\b/,
+    /\bbun\s+run\s+(dev|start|build|test)\b/,
+    /\bnpm\s+run\s+(dev|start|build|test)\b/,
+    /\bmake\b/,
+    /\bcargo\s+build\b/,
+    /\bpip\s+install\b/
+  ];
+  return heavyPatterns.some((p) => p.test(cmds));
+}
 async function executeSetupConfig(config, runnerConfig, connection, setupLog) {
+  if (process.env.CLAUDESPACE_NAME && shouldAutoScale(config.setupCommand, config.startCommand)) {
+    connection.requestScaleUp("light", "setup-phase auto-scale").catch(() => {
+    });
+  }
   if (config.setupCommand) {
     pushSetupLog(setupLog, `$ ${config.setupCommand}`);
     await runSetupCommand(config.setupCommand, runnerConfig.workspaceDir, (stream, data) => {
@@ -5479,6 +5915,7 @@ function buildQueryHost(deps) {
     config: deps.config,
     connection: deps.connection,
     callbacks: deps.callbacks,
+    harness: deps.harness,
     setupLog: deps.setupLog,
     costTracker: deps.costTracker,
     get agentMode() {
@@ -5542,11 +5979,13 @@ var AgentRunner = class {
   conveyorConfig = null;
   _queryHost = null;
   tunnelClient = null;
+  harness;
   constructor(config, callbacks) {
     this.config = config;
     this.connection = new ConveyorConnection(config);
     this.callbacks = callbacks;
     this.planSync = new PlanSync(config.workspaceDir, this.connection);
+    this.harness = createHarness();
   }
   get state() {
     return this._state;
@@ -5649,6 +6088,9 @@ var AgentRunner = class {
     const pastPlanning = this.taskContext.status !== "Planning" && this.taskContext.status !== "Unidentified";
     if (this.agentMode === "auto" && pastPlanning) {
       this.hasExitedPlanMode = true;
+      this.agentMode = "building";
+      const builderModel = this.taskContext.builderModel ?? this.taskContext.model;
+      if (builderModel) this.taskContext.model = builderModel;
     }
     this.logEffectiveSettings();
     if (process.env.CODESPACES === "true") unshallowRepo(this.config.workspaceDir);
@@ -5929,6 +6371,7 @@ var AgentRunner = class {
       config: this.config,
       connection: this.connection,
       callbacks: this.callbacks,
+      harness: this.harness,
       setupLog: this.setupLog,
       costTracker: this.costTracker,
       planSync: this.planSync,
@@ -5952,16 +6395,21 @@ var AgentRunner = class {
     this._queryHost = host;
     return host;
   }
+  lastAnnouncedMode = null;
   handleModeChange(newAgentMode) {
     if (this.config.mode !== "pm") return;
-    if (newAgentMode) this.agentMode = newAgentMode;
+    if (!newAgentMode || newAgentMode === this.agentMode) return;
+    this.agentMode = newAgentMode;
     this.updateExitedPlanModeFlag(newAgentMode);
     const effectiveMode = this.effectiveAgentMode;
     const isBuildCapable = effectiveMode === "building" || effectiveMode === "auto" && this.hasExitedPlanMode;
     this.connection.emitModeChanged(effectiveMode);
-    this.connection.postChatMessage(
-      `Mode switched to **${effectiveMode}**${effectiveMode === "building" ? " \u2014 I now have direct coding access." : ""}`
-    );
+    if (effectiveMode !== this.lastAnnouncedMode) {
+      this.lastAnnouncedMode = effectiveMode;
+      this.connection.postChatMessage(
+        `Mode switched to **${effectiveMode}**${effectiveMode === "building" ? " \u2014 I now have direct coding access." : ""}`
+      );
+    }
     if (isBuildCapable && this.taskContext?.status === "Open") {
       this.connection.updateStatus("InProgress");
       this.taskContext.status = "InProgress";
@@ -5999,8 +6447,19 @@ var AgentRunner = class {
   }
   stop() {
     this.stopped = true;
+    this.stopHeartbeat();
     this.clearIdleTimers();
+    const host = this._queryHost;
+    if (host?.activeQuery) {
+      const q = host.activeQuery;
+      if (typeof q.abort === "function") {
+        q.abort();
+      }
+      void host.activeQuery.return(void 0);
+      host.activeQuery = null;
+    }
     this.tunnelClient?.disconnect();
+    this.connection.disconnect();
     if (this.inputResolver) {
       this.inputResolver(null);
       this.inputResolver = null;
@@ -6119,18 +6578,11 @@ var CommitWatcher = class {
   }
 };
 
-// src/runner/project-chat-handler.ts
-import {
-  query as query2,
-  createSdkMcpServer as createSdkMcpServer2
-} from "@anthropic-ai/claude-agent-sdk";
-
 // src/tools/project-tools.ts
-import { tool as tool8 } from "@anthropic-ai/claude-agent-sdk";
 import { z as z8 } from "zod";
 function buildReadTools(connection) {
   return [
-    tool8(
+    defineTool(
       "list_tasks",
       "List tasks in the project. Optionally filter by status or assignee.",
       {
@@ -6150,7 +6602,7 @@ function buildReadTools(connection) {
       },
       { annotations: { readOnlyHint: true } }
     ),
-    tool8(
+    defineTool(
       "get_task",
       "Get detailed information about a task including its chat messages, child tasks, and codespace status.",
       { task_id: z8.string().describe("The task ID to look up") },
@@ -6166,7 +6618,7 @@ function buildReadTools(connection) {
       },
       { annotations: { readOnlyHint: true } }
     ),
-    tool8(
+    defineTool(
       "search_tasks",
       "Search tasks by tags, text query, or status filters.",
       {
@@ -6187,7 +6639,7 @@ function buildReadTools(connection) {
       },
       { annotations: { readOnlyHint: true } }
     ),
-    tool8(
+    defineTool(
       "list_tags",
       "List all tags available in the project.",
       {},
@@ -6203,7 +6655,7 @@ function buildReadTools(connection) {
       },
       { annotations: { readOnlyHint: true } }
     ),
-    tool8(
+    defineTool(
       "get_project_summary",
       "Get a summary of the project including task counts by status and active builds.",
       {},
@@ -6223,7 +6675,7 @@ function buildReadTools(connection) {
 }
 function buildMutationTools(connection) {
   return [
-    tool8(
+    defineTool(
       "create_task",
       "Create a new task in the project.",
       {
@@ -6244,7 +6696,7 @@ function buildMutationTools(connection) {
         }
       }
     ),
-    tool8(
+    defineTool(
       "update_task",
       "Update an existing task's title, description, plan, status, or assignee.",
       {
@@ -6347,7 +6799,8 @@ async function fetchContext(connection, chatId) {
 function buildChatQueryOptions(agentCtx, projectDir, connection) {
   const model = agentCtx?.model || FALLBACK_MODEL;
   const settings = agentCtx?.agentSettings ?? {};
-  const mcpServer = createSdkMcpServer2({
+  const harness = createHarness();
+  const mcpServer = harness.createMcpServer({
     name: "conveyor",
     tools: buildProjectTools(connection)
   });
@@ -6435,7 +6888,8 @@ async function runChatQuery(message, connection, projectDir, sessionId) {
   const options = buildChatQueryOptions(agentCtx, projectDir, connection);
   const prompt = buildPrompt(message, chatHistory);
   connection.emitAgentStatus("running");
-  const events = query2({
+  const harness = createHarness();
+  const events = harness.executeQuery({
     prompt,
     options,
     ...sessionId ? { resume: sessionId } : {}
@@ -6480,12 +6934,8 @@ async function handleProjectChatMessage(message, connection, projectDir, session
   }
 }
 
-// src/runner/project-audit-handler.ts
-import { query as query3 } from "@anthropic-ai/claude-agent-sdk";
-
 // src/tools/audit-tools.ts
 import { randomUUID as randomUUID3 } from "crypto";
-import { tool as tool9, createSdkMcpServer as createSdkMcpServer3 } from "@anthropic-ai/claude-agent-sdk";
 import { z as z9 } from "zod";
 function mapCreateTag(input) {
   return {
@@ -6566,9 +7016,9 @@ function collectRecommendation(toolName, input, collector, onRecommendation) {
   onRecommendation?.({ tagName: rec.tagName ?? rec.type, type: rec.type });
   return JSON.stringify({ success: true, recommendationId: rec.id });
 }
-function createAuditMcpServer(collector, onRecommendation) {
-  const auditTools = [
-    tool9(
+function buildAuditTools(collector, onRecommendation) {
+  return [
+    defineTool(
       "recommend_create_tag",
       "Recommend creating a new tag for an uncovered subsystem or area",
       {
@@ -6587,7 +7037,7 @@ function createAuditMcpServer(collector, onRecommendation) {
         return { content: [{ type: "text", text: result }] };
       }
     ),
-    tool9(
+    defineTool(
       "recommend_update_description",
       "Recommend updating a tag's description to better reflect its scope",
       {
@@ -6606,7 +7056,7 @@ function createAuditMcpServer(collector, onRecommendation) {
         return { content: [{ type: "text", text: result }] };
       }
     ),
-    tool9(
+    defineTool(
       "recommend_context_link",
       "Recommend linking a doc, rule, file, or folder to a tag's contextPaths",
       {
@@ -6627,7 +7077,7 @@ function createAuditMcpServer(collector, onRecommendation) {
         return { content: [{ type: "text", text: result }] };
       }
     ),
-    tool9(
+    defineTool(
       "flag_documentation_gap",
       "Flag a file that agents read heavily but has no tag documentation linked",
       {
@@ -6648,7 +7098,7 @@ function createAuditMcpServer(collector, onRecommendation) {
         return { content: [{ type: "text", text: result }] };
       }
     ),
-    tool9(
+    defineTool(
       "recommend_merge_tags",
       "Recommend merging one tag into another",
       {
@@ -6668,7 +7118,7 @@ function createAuditMcpServer(collector, onRecommendation) {
         return { content: [{ type: "text", text: result }] };
       }
     ),
-    tool9(
+    defineTool(
       "recommend_rename_tag",
       "Recommend renaming a tag",
       {
@@ -6687,7 +7137,7 @@ function createAuditMcpServer(collector, onRecommendation) {
         return { content: [{ type: "text", text: result }] };
       }
     ),
-    tool9(
+    defineTool(
       "complete_audit",
       "Signal that the audit is complete with a summary of all findings",
       { summary: z9.string().describe("Brief overview of all findings") },
@@ -6698,9 +7148,11 @@ function createAuditMcpServer(collector, onRecommendation) {
       }
     )
   ];
-  return createSdkMcpServer3({
+}
+function createAuditMcpServer(harness, collector, onRecommendation) {
+  return harness.createMcpServer({
     name: "tag-audit",
-    tools: auditTools
+    tools: buildAuditTools(collector, onRecommendation)
   });
 }
 
@@ -6810,7 +7262,8 @@ async function runAuditQuery(request, connection, projectDir) {
     "Start by exploring the codebase structure, then analyze each tag for accuracy and completeness.",
     "Call complete_audit when done."
   ].join("\n");
-  const events = query3({
+  const harness = createHarness();
+  const events = harness.executeQuery({
     prompt: userPrompt,
     options: {
       model,
@@ -6819,7 +7272,7 @@ async function runAuditQuery(request, connection, projectDir) {
       permissionMode: "bypassPermissions",
       allowDangerouslySkipPermissions: true,
       tools: { type: "preset", preset: "claude_code" },
-      mcpServers: { "tag-audit": createAuditMcpServer(collector, onRecommendation) },
+      mcpServers: { "tag-audit": createAuditMcpServer(harness, collector, onRecommendation) },
       maxTurns: settings.maxTurns ?? 75,
       maxBudgetUsd: settings.maxBudgetUsd ?? 5,
       effort: settings.effort,
@@ -7349,8 +7802,23 @@ var ProjectRunner = class {
     logger8.info("Connected, waiting for task assignments");
     await new Promise((resolve2) => {
       this.resolveLifecycle = resolve2;
-      process.on("SIGTERM", () => void this.stop());
-      process.on("SIGINT", () => void this.stop());
+      this.setupSignalHandlers();
+    });
+  }
+  setupSignalHandlers() {
+    process.on("SIGTERM", () => {
+      setTimeout(() => {
+        logger8.warn("Forcing exit after SIGTERM timeout");
+        process.exit(1);
+      }, STOP_TIMEOUT_MS + 1e4).unref();
+      void this.stop();
+    });
+    process.on("SIGINT", () => {
+      setTimeout(() => {
+        logger8.warn("Forcing exit after SIGINT timeout");
+        process.exit(1);
+      }, STOP_TIMEOUT_MS + 1e4).unref();
+      void this.stop();
     });
   }
   handleAssignment(assignment) {
@@ -7409,7 +7877,10 @@ var ProjectRunner = class {
     }
   }
   handleStopTask(taskId) {
-    const agent = this.activeAgents.get(taskId);
+    let agent = this.activeAgents.get(taskId);
+    if (!agent) {
+      agent = this.activeAgents.get(`${taskId}:code-review`);
+    }
     if (!agent) return;
     const shortId = taskId.slice(0, 8);
     logger8.info("Stopping task", { taskId: shortId });
@@ -7455,7 +7926,7 @@ var ProjectRunner = class {
     await Promise.race([
       Promise.all(stopPromises),
       new Promise((resolve2) => {
-        setTimeout(resolve2, 6e4);
+        setTimeout(resolve2, STOP_TIMEOUT_MS + 5e3);
       })
     ]);
     this.connection.disconnect();
@@ -7546,4 +8017,4 @@ export {
   ProjectRunner,
   FileCache
 };
-//# sourceMappingURL=chunk-4NL6FASS.js.map
+//# sourceMappingURL=chunk-WBBX5AIX.js.map