@rallycry/conveyor-agent 7.2.15 → 7.2.17

package/dist/{chunk-TN24QXF5.js → chunk-WYIXEIRS.js}

@@ -1,8 +1,9 @@
 import {
+  formatCliEvent,
   imageBlock,
   isImageMimeType,
   textResult
-} from "./chunk-C5YAMQJ2.js";
+} from "./chunk-FDWECEDJ.js";
 import {
   createHarness,
   createServiceLogger,
@@ -2230,23 +2231,8 @@ async function buildInitialPrompt(mode, context, isAuto, agentMode) {
   return [...body, ...instructions].join("\n");
 }
 
-// src/tools/common-tools.ts
+// src/tools/task-context-tools.ts
 import { z } from "zod";
-var cliEventFormatters = {
-  thinking: (e) => e.message ?? "",
-  tool_use: (e) => `${e.tool}: ${e.input?.slice(0, 1e3) ?? ""}`,
-  tool_result: (e) => `${e.tool} \u2192 ${e.output?.slice(0, 500) ?? ""}${e.isError ? " [ERROR]" : ""}`,
-  message: (e) => e.content ?? "",
-  error: (e) => `ERROR: ${e.message ?? ""}`,
-  completed: (e) => `Completed: ${e.summary ?? ""} (cost: $${e.costUsd ?? "?"}, duration: ${e.durationMs ?? "?"}ms)`,
-  setup_output: (e) => `[${e.stream ?? "stdout"}] ${e.data ?? ""}`,
-  start_command_output: (e) => `[${e.stream ?? "stdout"}] ${e.data ?? ""}`,
-  turn_end: (e) => `Turn complete (${e.toolCalls?.length ?? 0} tool calls)`
-};
-function formatCliEvent(e) {
-  const formatter = cliEventFormatters[e.type];
-  return formatter ? formatter(e) : JSON.stringify(e);
-}
 function buildReadTaskChatTool(connection) {
   return defineTool(
     "read_task_chat",
@@ -2408,13 +2394,26 @@ function buildGetTaskFileTool(connection) {
     { annotations: { readOnlyHint: true } }
   );
 }
+function buildTaskContextTools(connection) {
+  return [
+    buildReadTaskChatTool(connection),
+    buildGetTaskPlanTool(connection),
+    buildGetTaskTool(connection),
+    buildGetTaskCliTool(connection),
+    buildListTaskFilesTool(connection),
+    buildGetTaskFileTool(connection)
+  ];
+}
+
+// src/tools/incident-tools.ts
+import { z as z2 } from "zod";
 function buildSearchIncidentsTool(connection) {
   return defineTool(
     "search_incidents",
     "Search incidents in the current project. Optionally filter by status (Open, Acknowledged, Investigating, Resolved, Closed) or source.",
     {
-      status: z.string().optional().describe("Filter by incident status"),
-      source: z.string().optional().describe("Filter by source (e.g., 'conveyor', 'agent', 'build')")
+      status: z2.string().optional().describe("Filter by incident status"),
+      source: z2.string().optional().describe("Filter by source (e.g., 'conveyor', 'agent', 'build')")
     },
     async ({ status, source }) => {
       try {
@@ -2438,7 +2437,7 @@ function buildGetTaskIncidentsTool(connection) {
     "get_task_incidents",
     "Get incidents linked to the current task. Returns a summary of each incident with available sections. Use get_incident_detail to drill into specific sections (messages, logs, task details).",
     {
-      task_id: z.string().optional().describe("Task ID (defaults to current task)")
+      task_id: z2.string().optional().describe("Task ID (defaults to current task)")
     },
     async ({ task_id }) => {
       try {
@@ -2461,11 +2460,11 @@ function buildGetIncidentDetailTool(connection) {
     "get_incident_detail",
     "Get detailed incident data by section. Use after get_task_incidents to drill into specific sections of an incident. Supports pagination and text search within sections.",
     {
-      incident_id: z.string().describe("The incident ID to get details for"),
-      section: z.enum(["all", "user_report", "task_details", "subtasks", "messages", "logs"]).optional().default("all").describe("Which section to retrieve (default: all)"),
-      search: z.string().optional().describe("Search for specific text within the section (case-insensitive)"),
-      offset: z.number().optional().describe("Line offset for pagination (default 0)"),
-      limit: z.number().optional().describe("Max lines to return (default 100, max 500)")
+      incident_id: z2.string().describe("The incident ID to get details for"),
+      section: z2.enum(["all", "user_report", "task_details", "subtasks", "messages", "logs"]).optional().default("all").describe("Which section to retrieve (default: all)"),
+      search: z2.string().optional().describe("Search for specific text within the section (case-insensitive)"),
+      offset: z2.number().optional().describe("Line offset for pagination (default 0)"),
+      limit: z2.number().optional().describe("Max lines to return (default 100, max 500)")
     },
     async ({ incident_id, section, search, offset, limit }) => {
       try {
@@ -2506,12 +2505,12 @@ function buildQueryGcpLogsTool(connection) {
     "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(
+      filter: z2.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([
+      start_time: z2.string().optional().describe("Start time in ISO 8601 format (e.g., '2024-01-01T00:00:00Z')"),
+      end_time: z2.string().optional().describe("End time in ISO 8601 format (e.g., '2024-01-02T00:00:00Z')"),
+      severity: z2.enum([
         "DEFAULT",
         "DEBUG",
         "INFO",
@@ -2522,7 +2521,7 @@ function buildQueryGcpLogsTool(connection) {
         "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)")
+      page_size: z2.number().optional().describe("Number of log entries to return (default 100, max 500)")
     },
     async ({ filter, start_time, end_time, severity, page_size }) => {
       try {
@@ -2551,6 +2550,17 @@ ${formatted}`);
     { annotations: { readOnlyHint: true } }
   );
 }
+function buildIncidentTools(connection) {
+  return [
+    buildSearchIncidentsTool(connection),
+    buildGetTaskIncidentsTool(connection),
+    buildGetIncidentDetailTool(connection),
+    buildQueryGcpLogsTool(connection)
+  ];
+}
+
+// src/tools/dependency-suggestion-tools.ts
+import { z as z3 } from "zod";
 function buildGetDependenciesTool(connection) {
   return defineTool(
     "get_dependencies",
@@ -2576,8 +2586,8 @@ function buildGetSuggestionsTool(connection) {
     "get_suggestions",
     "List project suggestions sorted by vote score. Use this to see what the team thinks is important.",
     {
-      status: z.string().optional().describe("Filter by status: Open, Accepted, Rejected, Implemented"),
-      limit: z.number().optional().describe("Max results (default 20)")
+      status: z3.string().optional().describe("Filter by status: Open, Accepted, Rejected, Implemented"),
+      limit: z3.number().optional().describe("Max results (default 20)")
     },
     async ({ status: _status, limit: _limit }) => {
       try {
@@ -2597,13 +2607,16 @@ function buildGetSuggestionsTool(connection) {
     { annotations: { readOnlyHint: true } }
   );
 }
+
+// src/tools/mutation-tools.ts
+import { z as z4 } from "zod";
 function buildPostToChatTool(connection) {
   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.",
     {
-      message: z.string().describe("The message to post to the team"),
-      task_id: z.string().optional().describe("Child task ID to post to. Omit to post to the current task's chat.")
+      message: z4.string().describe("The message to post to the team"),
+      task_id: z4.string().optional().describe("Child task ID to post to. Omit to post to the current task's chat.")
     },
     async ({ message, task_id }) => {
       try {
@@ -2630,8 +2643,8 @@ function buildForceUpdateTaskStatusTool(connection) {
     "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.",
     {
-      status: z.enum(["InProgress", "ReviewPR", "ReviewDev", "Complete"]).describe("The new status for the task"),
-      task_id: z.string().optional().describe("Child task ID to update. Omit to update the current task.")
+      status: z4.enum(["InProgress", "ReviewPR", "ReviewDev", "Complete"]).describe("The new status for the task"),
+      task_id: z4.string().optional().describe("Child task ID to update. Omit to update the current task.")
     },
     async ({ status, task_id }) => {
       try {
@@ -2662,15 +2675,15 @@ function buildCreatePullRequestTool(connection, config) {
     "create_pull_request",
     "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(
+      title: z4.string().describe("The PR title"),
+      body: z4.string().describe("The PR description/body in markdown"),
+      branch: z4.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(
+      baseBranch: z4.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(
+      commitMessage: z4.string().optional().describe(
         "Commit message for staging uncommitted changes. If not provided, a default message based on the PR title will be used."
       )
     },
@@ -2748,7 +2761,7 @@ function buildAddDependencyTool(connection) {
     "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")
+      depends_on_slug_or_id: z4.string().describe("Slug or ID of the task this task depends on")
     },
     async ({ depends_on_slug_or_id }) => {
       try {
@@ -2770,7 +2783,7 @@ function buildRemoveDependencyTool(connection) {
     "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")
+      depends_on_slug_or_id: z4.string().describe("Slug or ID of the task to remove as dependency")
     },
     async ({ depends_on_slug_or_id }) => {
       try {
@@ -2792,10 +2805,10 @@ function buildCreateFollowUpTaskTool(connection) {
     "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)")
+      title: z4.string().describe("Follow-up task title"),
+      description: z4.string().optional().describe("Brief description of the follow-up work"),
+      plan: z4.string().optional().describe("Implementation plan if known"),
+      story_point_value: z4.number().optional().describe("Story point estimate (1=Common, 2=Magic, 3=Rare, 5=Unique)")
     },
     async ({ title, description, plan, story_point_value }) => {
       try {
@@ -2822,11 +2835,11 @@ function buildCreateSuggestionTool(connection) {
     "create_suggestion",
     "Suggest a feature, improvement, or idea for the project. If you want to recommend something \u2014 a document, a rule, a feature, a task, an optimization \u2014 use this tool. If a similar suggestion already exists, your vote will be added to it instead of creating a duplicate.",
     {
-      title: z.string().describe("Short title for the suggestion"),
-      description: z.string().optional().describe(
+      title: z4.string().describe("Short title for the suggestion"),
+      description: z4.string().optional().describe(
         "1-2 sentence description of what should change and why. Keep concise and project-focused."
       ),
-      tag_names: z.array(z.string()).optional().describe("Tag names to categorize the suggestion")
+      tag_names: z4.array(z4.string()).optional().describe("Tag names to categorize the suggestion")
     },
     async ({ title, description, tag_names }) => {
       try {
@@ -2855,8 +2868,8 @@ function buildVoteSuggestionTool(connection) {
     "vote_suggestion",
     "Vote on a project suggestion. Use +1 to upvote or -1 to downvote.",
     {
-      suggestion_id: z.string().describe("The suggestion ID to vote on"),
-      value: z.number().refine((v) => v === 1 || v === -1, { message: "Value must be 1 or -1" }).describe("+1 to upvote, -1 to downvote")
+      suggestion_id: z4.string().describe("The suggestion ID to vote on"),
+      value: z4.number().refine((v) => v === 1 || v === -1, { message: "Value must be 1 or -1" }).describe("+1 to upvote, -1 to downvote")
     },
     async ({ suggestion_id, value }) => {
       try {
@@ -2874,41 +2887,39 @@ function buildVoteSuggestionTool(connection) {
     }
   );
 }
-function buildCommonTools(connection, config) {
-  const tools = [
-    buildReadTaskChatTool(connection),
+function buildMutationTools(connection, config) {
+  return [
     buildPostToChatTool(connection),
-    buildGetTaskPlanTool(connection),
-    buildGetTaskTool(connection),
-    buildGetTaskCliTool(connection),
-    buildListTaskFilesTool(connection),
-    buildGetTaskFileTool(connection),
-    buildSearchIncidentsTool(connection),
-    buildGetTaskIncidentsTool(connection),
-    buildGetIncidentDetailTool(connection),
-    buildQueryGcpLogsTool(connection),
     buildCreatePullRequestTool(connection, config),
     buildAddDependencyTool(connection),
     buildRemoveDependencyTool(connection),
-    buildGetDependenciesTool(connection),
     buildCreateFollowUpTaskTool(connection),
     buildCreateSuggestionTool(connection),
-    buildVoteSuggestionTool(connection),
-    buildGetSuggestionsTool(connection)
+    buildVoteSuggestionTool(connection)
+  ];
+}
+
+// src/tools/common-tools.ts
+function buildCommonTools(connection, config) {
+  return [
+    ...buildTaskContextTools(connection),
+    ...buildIncidentTools(connection),
+    buildGetDependenciesTool(connection),
+    buildGetSuggestionsTool(connection),
+    ...buildMutationTools(connection, config)
   ];
-  return tools;
 }
 
 // src/tools/pm-tools.ts
-import { z as z2 } from "zod";
+import { z as z5 } from "zod";
 var SP_DESCRIPTION = "Story point value (1=Common, 2=Magic, 3=Rare, 5=Unique)";
 function buildUpdateTaskTool(connection) {
   return defineTool(
     "update_task",
     "Save the finalized task plan and/or description",
     {
-      plan: z2.string().optional().describe("The task plan in markdown"),
-      description: z2.string().optional().describe("Updated task description")
+      plan: z5.string().optional().describe("The task plan in markdown"),
+      description: z5.string().optional().describe("Updated task description")
     },
     async ({ plan, description }) => {
       try {
@@ -2929,11 +2940,11 @@ function buildCreateSubtaskTool(connection) {
     "create_subtask",
     "Create a subtask under the current parent task. Use for breaking complex tasks into smaller pieces.",
     {
-      title: z2.string().describe("Subtask title"),
-      description: z2.string().optional().describe("Brief description"),
-      plan: z2.string().optional().describe("Implementation plan in markdown"),
-      ordinal: z2.number().optional().describe("Step/order number (0-based)"),
-      storyPointValue: z2.number().optional().describe(SP_DESCRIPTION)
+      title: z5.string().describe("Subtask title"),
+      description: z5.string().optional().describe("Brief description"),
+      plan: z5.string().optional().describe("Implementation plan in markdown"),
+      ordinal: z5.number().optional().describe("Step/order number (0-based)"),
+      storyPointValue: z5.number().optional().describe(SP_DESCRIPTION)
     },
     async ({ title, description, plan, ordinal, storyPointValue }) => {
       try {
@@ -2959,12 +2970,12 @@ function buildUpdateSubtaskTool(connection) {
     "update_subtask",
     "Update an existing subtask's fields",
     {
-      subtaskId: z2.string().describe("The subtask ID to update"),
-      title: z2.string().optional(),
-      description: z2.string().optional(),
-      plan: z2.string().optional(),
-      ordinal: z2.number().optional(),
-      storyPointValue: z2.number().optional().describe(SP_DESCRIPTION)
+      subtaskId: z5.string().describe("The subtask ID to update"),
+      title: z5.string().optional(),
+      description: z5.string().optional(),
+      plan: z5.string().optional(),
+      ordinal: z5.number().optional(),
+      storyPointValue: z5.number().optional().describe(SP_DESCRIPTION)
     },
     async ({ subtaskId, title, description, plan, storyPointValue }) => {
       try {
@@ -2987,7 +2998,7 @@ function buildDeleteSubtaskTool(connection) {
   return defineTool(
     "delete_subtask",
     "Delete a subtask",
-    { subtaskId: z2.string().describe("The subtask ID to delete") },
+    { subtaskId: z5.string().describe("The subtask ID to delete") },
     async ({ subtaskId }) => {
       try {
         await connection.call("deleteSubtask", {
@@ -3025,7 +3036,7 @@ function buildPackTools(connection) {
       "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.",
       {
-        childTaskId: z2.string().describe("The child task ID to start a cloud build for")
+        childTaskId: z5.string().describe("The child task ID to start a cloud build for")
       },
       async ({ childTaskId }) => {
         try {
@@ -3045,7 +3056,7 @@ function buildPackTools(connection) {
       "stop_child_build",
       "Stop a running cloud build for a child task. Sends a stop signal to the child agent.",
       {
-        childTaskId: z2.string().describe("The child task ID whose build should be stopped")
+        childTaskId: z5.string().describe("The child task ID whose build should be stopped")
       },
       async ({ childTaskId }) => {
         try {
@@ -3065,7 +3076,7 @@ function buildPackTools(connection) {
       "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.",
       {
-        childTaskId: z2.string().describe("The child task ID whose PR should be approved and merged")
+        childTaskId: z5.string().describe("The child task ID whose PR should be approved and merged")
       },
       async ({ childTaskId }) => {
         try {
@@ -3103,7 +3114,7 @@ function buildPmTools(connection, options) {
 }
 
 // src/tools/discovery-tools.ts
-import { z as z3 } from "zod";
+import { z as z6 } from "zod";
 var SP_DESCRIPTION2 = "Story point value (1=Common, 2=Magic, 3=Rare, 5=Unique)";
 function buildDiscoveryTools(connection) {
   return [
@@ -3111,11 +3122,11 @@ function buildDiscoveryTools(connection) {
       "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.",
       {
-        title: z3.string().optional().describe("The new task title"),
-        storyPointValue: z3.number().optional().describe(SP_DESCRIPTION2),
-        tagNames: z3.array(z3.string()).optional().describe("Array of tag names to assign"),
-        githubPRUrl: z3.string().url().optional().describe("GitHub pull request URL to link to this task"),
-        githubBranch: z3.string().optional().describe("Set the GitHub branch name for this task (e.g. 'conveyor/my-feature-abc123')")
+        title: z6.string().optional().describe("The new task title"),
+        storyPointValue: z6.number().optional().describe(SP_DESCRIPTION2),
+        tagNames: z6.array(z6.string()).optional().describe("Array of tag names to assign"),
+        githubPRUrl: z6.string().url().optional().describe("GitHub pull request URL to link to this task"),
+        githubBranch: z6.string().optional().describe("Set the GitHub branch name for this task (e.g. 'conveyor/my-feature-abc123')")
       },
       async ({ title, storyPointValue, tagNames, githubPRUrl, githubBranch }) => {
         try {
@@ -3146,14 +3157,14 @@ function buildDiscoveryTools(connection) {
 }
 
 // src/tools/code-review-tools.ts
-import { z as z4 } from "zod";
+import { z as z7 } from "zod";
 function buildCodeReviewTools(connection) {
   return [
     defineTool(
       "approve_code_review",
       "Approve the code review. Use this when the code passes all review criteria and is ready to merge.",
       {
-        summary: z4.string().describe("Brief summary of what was reviewed and why it looks good")
+        summary: z7.string().describe("Brief summary of what was reviewed and why it looks good")
       },
       async ({ summary }) => {
         const content = `**Code Review: Approved** :white_check_mark:
@@ -3176,15 +3187,15 @@ ${summary}`;
       "request_code_changes",
       "Request changes during code review. Use this when substantive issues are found that need to be fixed before merge.",
       {
-        issues: z4.array(
-          z4.object({
-            file: z4.string().describe("File path where the issue was found"),
-            line: z4.number().optional().describe("Line number (if applicable)"),
-            severity: z4.enum(["critical", "major", "minor"]).describe("Issue severity"),
-            description: z4.string().describe("What is wrong and how to fix it")
+        issues: z7.array(
+          z7.object({
+            file: z7.string().describe("File path where the issue was found"),
+            line: z7.number().optional().describe("Line number (if applicable)"),
+            severity: z7.enum(["critical", "major", "minor"]).describe("Issue severity"),
+            description: z7.string().describe("What is wrong and how to fix it")
           })
         ).describe("List of issues found during review"),
-        summary: z4.string().describe("Brief overall summary of the review findings")
+        summary: z7.string().describe("Brief overall summary of the review findings")
       },
       async ({ issues, summary }) => {
         const issueLines = issues.map((issue) => {
@@ -3214,10 +3225,10 @@ ${issueLines}`;
 }
 
 // src/tools/debug-tools.ts
-import { z as z7 } from "zod";
+import { z as z10 } from "zod";
 
 // src/tools/telemetry-tools.ts
-import { z as z5 } from "zod";
+import { z as z8 } from "zod";
 
 // src/debug/telemetry-injector.ts
 var BUFFER_SIZE = 200;
@@ -3612,12 +3623,12 @@ function buildGetTelemetryTool(manager) {
     "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.",
     {
-      type: z5.enum(["http", "db", "socket", "error"]).optional().describe("Filter by event type"),
-      urlPattern: z5.string().optional().describe("Regex pattern to filter HTTP events by URL"),
-      minDuration: z5.number().optional().describe("Minimum duration in ms \u2014 only return events slower than this"),
-      errorOnly: z5.boolean().optional().describe("Only return error events and HTTP 4xx/5xx responses"),
-      since: z5.number().optional().describe("Only return events after this timestamp (ms since epoch)"),
-      limit: z5.number().optional().describe("Max events to return (default: 20, from most recent)")
+      type: z8.enum(["http", "db", "socket", "error"]).optional().describe("Filter by event type"),
+      urlPattern: z8.string().optional().describe("Regex pattern to filter HTTP events by URL"),
+      minDuration: z8.number().optional().describe("Minimum duration in ms \u2014 only return events slower than this"),
+      errorOnly: z8.boolean().optional().describe("Only return error events and HTTP 4xx/5xx responses"),
+      since: z8.number().optional().describe("Only return events after this timestamp (ms since epoch)"),
+      limit: z8.number().optional().describe("Max events to return (default: 20, from most recent)")
     },
     async ({ type, urlPattern, minDuration, errorOnly, since, limit }) => {
       const clientOrErr = requireDebugClient(manager);
@@ -3687,7 +3698,7 @@ function buildTelemetryTools(manager) {
 }
 
 // src/tools/client-debug-tools.ts
-import { z as z6 } from "zod";
+import { z as z9 } from "zod";
 function requirePlaywrightClient(manager) {
   if (!manager.isClientDebugMode()) {
     return "Client debug mode is not active. Use debug_enter_mode with clientSide: true first.";
@@ -3707,11 +3718,11 @@ function buildClientBreakpointTools(manager) {
       "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.",
       {
-        file: z6.string().describe(
+        file: z9.string().describe(
           "Original source file path (e.g., src/components/App.tsx) \u2014 source maps resolve automatically"
         ),
-        line: z6.number().describe("Line number (1-based) in the original source file"),
-        condition: z6.string().optional().describe("JavaScript condition expression \u2014 breakpoint only triggers when truthy")
+        line: z9.number().describe("Line number (1-based) in the original source file"),
+        condition: z9.string().optional().describe("JavaScript condition expression \u2014 breakpoint only triggers when truthy")
       },
       async ({ file, line, condition }) => {
         const clientOrErr = requirePlaywrightClient(manager);
@@ -3733,7 +3744,7 @@ Breakpoint ID: ${breakpointId}${sourceMapNote}`
       "debug_remove_client_breakpoint",
       "Remove a previously set client-side breakpoint by its ID.",
       {
-        breakpointId: z6.string().describe("The breakpoint ID returned by debug_set_client_breakpoint")
+        breakpointId: z9.string().describe("The breakpoint ID returned by debug_set_client_breakpoint")
       },
       async ({ breakpointId }) => {
         const clientOrErr = requirePlaywrightClient(manager);
@@ -3813,8 +3824,8 @@ ${JSON.stringify(queuedHits, null, 2)}`
       "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.",
       {
-        expression: z6.string().describe("JavaScript expression to evaluate in the browser context"),
-        frameIndex: z6.number().optional().describe("Call stack frame index (0 = top frame). Defaults to the top frame.")
+        expression: z9.string().describe("JavaScript expression to evaluate in the browser context"),
+        frameIndex: z9.number().optional().describe("Call stack frame index (0 = top frame). Defaults to the top frame.")
       },
       async ({ expression, frameIndex }) => {
         const clientOrErr = requirePlaywrightClient(manager);
@@ -3887,7 +3898,7 @@ function buildClientInteractionTools(manager) {
       "debug_navigate_client",
       "Navigate the headless browser to a specific URL. Use this to reproduce specific flows or visit different pages.",
       {
-        url: z6.string().describe("URL to navigate to (e.g., http://localhost:3000/dashboard)")
+        url: z9.string().describe("URL to navigate to (e.g., http://localhost:3000/dashboard)")
       },
       async ({ url }) => {
         const clientOrErr = requirePlaywrightClient(manager);
@@ -3904,7 +3915,7 @@ function buildClientInteractionTools(manager) {
       "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.",
       {
-        selector: z6.string().describe(
+        selector: z9.string().describe(
           "CSS selector of the element to click (e.g., 'button.submit', '#login-form input[type=submit]')"
         )
       },
@@ -3926,8 +3937,8 @@ function buildClientConsoleTool(manager) {
     "debug_get_client_console",
     "Get console messages captured from the headless browser. Includes console.log, warn, error, etc.",
     {
-      level: z6.string().optional().describe("Filter by console level: log, warn, error, info, debug"),
-      limit: z6.number().optional().describe("Maximum number of recent messages to return (default: all)")
+      level: z9.string().optional().describe("Filter by console level: log, warn, error, info, debug"),
+      limit: z9.number().optional().describe("Maximum number of recent messages to return (default: all)")
     },
     // oxlint-disable-next-line require-await
     async ({ level, limit }) => {
@@ -3954,8 +3965,8 @@ function buildClientNetworkTool(manager) {
     "debug_get_client_network",
     "Get network requests captured from the headless browser. Shows URLs, methods, status codes, and timing.",
     {
-      filter: z6.string().optional().describe("Regex pattern to filter requests by URL"),
-      limit: z6.number().optional().describe("Maximum number of recent requests to return (default: all)")
+      filter: z9.string().optional().describe("Regex pattern to filter requests by URL"),
+      limit: z9.number().optional().describe("Maximum number of recent requests to return (default: all)")
     },
     // oxlint-disable-next-line require-await
     async ({ filter, limit }) => {
@@ -3983,7 +3994,7 @@ function buildClientErrorsTool(manager) {
     "debug_get_client_errors",
     "Get uncaught errors captured from the headless browser. Includes error messages and source-mapped stack traces.",
     {
-      limit: z6.number().optional().describe("Maximum number of recent errors to return (default: all)")
+      limit: z9.number().optional().describe("Maximum number of recent errors to return (default: all)")
     },
     // oxlint-disable-next-line require-await
     async ({ limit }) => {
@@ -4077,12 +4088,12 @@ function buildDebugLifecycleTools(manager) {
       "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.",
       {
-        hypothesis: z7.string().optional().describe("Your hypothesis about the bug \u2014 helps track debugging intent"),
-        serverSide: z7.boolean().optional().describe(
+        hypothesis: z10.string().optional().describe("Your hypothesis about the bug \u2014 helps track debugging intent"),
+        serverSide: z10.boolean().optional().describe(
           "Enable server-side Node.js debugging (default: true if clientSide is not set)"
         ),
-        clientSide: z7.boolean().optional().describe("Enable client-side browser debugging via headless Chromium + Playwright"),
-        previewUrl: z7.string().optional().describe(
+        clientSide: z10.boolean().optional().describe("Enable client-side browser debugging via headless Chromium + Playwright"),
+        previewUrl: z10.string().optional().describe(
           "Preview URL for client-side debugging (e.g., http://localhost:3000). Required when clientSide is true."
         )
       },
@@ -4118,9 +4129,9 @@ function buildBreakpointTools(manager) {
       "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.",
       {
-        file: z7.string().describe("Absolute or relative file path to set the breakpoint in"),
-        line: z7.number().describe("Line number (1-based) to set the breakpoint on"),
-        condition: z7.string().optional().describe("JavaScript condition expression \u2014 breakpoint only triggers when truthy")
+        file: z10.string().describe("Absolute or relative file path to set the breakpoint in"),
+        line: z10.number().describe("Line number (1-based) to set the breakpoint on"),
+        condition: z10.string().optional().describe("JavaScript condition expression \u2014 breakpoint only triggers when truthy")
       },
       async ({ file, line, condition }) => {
         const clientOrErr = requireDebugClient2(manager);
@@ -4142,7 +4153,7 @@ Breakpoint ID: ${breakpointId}`
       "debug_remove_breakpoint",
       "Remove a previously set breakpoint by its ID.",
       {
-        breakpointId: z7.string().describe("The breakpoint ID returned by debug_set_breakpoint")
+        breakpointId: z10.string().describe("The breakpoint ID returned by debug_set_breakpoint")
       },
       async ({ breakpointId }) => {
         const clientOrErr = requireDebugClient2(manager);
@@ -4223,8 +4234,8 @@ ${JSON.stringify(queuedHits, null, 2)}`
       "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.",
       {
-        expression: z7.string().describe("The JavaScript expression to evaluate"),
-        frameIndex: z7.number().optional().describe("Call stack frame index (0 = top frame). Defaults to the top frame.")
+        expression: z10.string().describe("The JavaScript expression to evaluate"),
+        frameIndex: z10.number().optional().describe("Call stack frame index (0 = top frame). Defaults to the top frame.")
       },
       async ({ expression, frameIndex }) => {
         const clientOrErr = requireDebugClient2(manager);
@@ -4252,12 +4263,12 @@ function buildProbeManagementTools(manager) {
       "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.",
       {
-        file: z7.string().describe("File path to probe"),
-        line: z7.number().describe("Line number (1-based) to probe"),
-        expressions: z7.array(z7.string()).describe(
+        file: z10.string().describe("File path to probe"),
+        line: z10.number().describe("Line number (1-based) to probe"),
+        expressions: z10.array(z10.string()).describe(
           'JavaScript expressions to capture when the line executes (e.g., ["req.params.id", "user.role"])'
         ),
-        label: z7.string().optional().describe("Optional label for this probe (defaults to file:line)")
+        label: z10.string().optional().describe("Optional label for this probe (defaults to file:line)")
       },
       async ({ file, line, expressions, label }) => {
         const clientOrErr = requireDebugClient2(manager);
@@ -4282,7 +4293,7 @@ Trigger the code path, then use debug_get_probe_results to see captured values.`
       "debug_remove_probe",
       "Remove a previously set debug probe by its ID.",
       {
-        probeId: z7.string().describe("The probe ID returned by debug_add_probe")
+        probeId: z10.string().describe("The probe ID returned by debug_add_probe")
       },
       async ({ probeId }) => {
         const clientOrErr = requireDebugClient2(manager);
@@ -4322,9 +4333,9 @@ function buildProbeResultTools(manager) {
       "debug_get_probe_results",
       "Fetch captured probe hit data. Returns expression values from each time a probed line executed.",
       {
-        probeId: z7.string().optional().describe("Filter results by probe ID (resolves to its label)"),
-        label: z7.string().optional().describe("Filter results by probe label"),
-        limit: z7.number().optional().describe("Maximum number of recent hits to return (default: all)")
+        probeId: z10.string().optional().describe("Filter results by probe ID (resolves to its label)"),
+        label: z10.string().optional().describe("Filter results by probe label"),
+        limit: z10.number().optional().describe("Maximum number of recent hits to return (default: all)")
       },
       async ({ probeId, label, limit }) => {
         const clientOrErr = requireDebugClient2(manager);
@@ -4795,10 +4806,20 @@ function stopTypingIfNeeded(host, isTyping) {
   if (isTyping) host.connection.sendTypingStop();
 }
 function flushPendingToolCalls(host, turnToolCalls) {
-  if (turnToolCalls.length === 0) return;
-  for (let i = 0; i < turnToolCalls.length; i++) {
-    if (i < host.pendingToolOutputs.length) {
-      turnToolCalls[i].output = host.pendingToolOutputs[i];
+  if (turnToolCalls.length === 0) {
+    host.pendingToolOutputs.length = 0;
+    return;
+  }
+  const outputsByTool = /* @__PURE__ */ new Map();
+  for (const entry of host.pendingToolOutputs) {
+    const list = outputsByTool.get(entry.tool) ?? [];
+    list.push(entry.output);
+    outputsByTool.set(entry.tool, list);
+  }
+  for (const call of turnToolCalls) {
+    const list = outputsByTool.get(call.tool);
+    if (list && list.length > 0) {
+      call.output = list.shift();
     }
   }
   host.connection.sendEvent({ type: "turn_end", toolCalls: [...turnToolCalls] });
@@ -5120,7 +5141,7 @@ function buildHooks(host) {
                 output,
                 isError: false
               });
-              host.pendingToolOutputs.push(output);
+              host.pendingToolOutputs.push({ tool: input.tool_name, output });
               if (input.tool_name === "mcp__conveyor__create_pull_request") {
                 try {
                   const props = await host.connection.getTaskProperties();
@@ -6441,67 +6462,8 @@ var ProjectConnection = class {
   }
 };
 
-// src/setup/commands.ts
-import { spawn, execSync as execSync2 } from "child_process";
-function runSetupCommand(cmd, cwd, onOutput) {
-  return new Promise((resolve2, reject) => {
-    const child = spawn("sh", ["-c", cmd], {
-      cwd,
-      stdio: ["ignore", "pipe", "pipe"],
-      env: { ...process.env }
-    });
-    child.stdout.on("data", (chunk) => {
-      onOutput("stdout", chunk.toString());
-    });
-    child.stderr.on("data", (chunk) => {
-      onOutput("stderr", chunk.toString());
-    });
-    child.on("close", (code) => {
-      if (code === 0) {
-        resolve2();
-      } else {
-        reject(new Error(`Setup command exited with code ${code}`));
-      }
-    });
-    child.on("error", (err) => {
-      reject(err);
-    });
-  });
-}
-var AUTH_TOKEN_TIMEOUT_MS = 3e4;
-function runAuthTokenCommand(cmd, userEmail, cwd) {
-  try {
-    const output = execSync2(`${cmd} ${JSON.stringify(userEmail)}`, {
-      cwd,
-      timeout: AUTH_TOKEN_TIMEOUT_MS,
-      stdio: ["ignore", "pipe", "ignore"],
-      env: { ...process.env }
-    });
-    const token = output.toString().trim();
-    return token || null;
-  } catch {
-    return null;
-  }
-}
-function runStartCommand(cmd, cwd, onOutput) {
-  const child = spawn("sh", ["-c", cmd], {
-    cwd,
-    stdio: ["ignore", "pipe", "pipe"],
-    detached: true,
-    env: { ...process.env }
-  });
-  child.stdout.on("data", (chunk) => {
-    onOutput("stdout", chunk.toString());
-  });
-  child.stderr.on("data", (chunk) => {
-    onOutput("stderr", chunk.toString());
-  });
-  child.unref();
-  return child;
-}
-
 // src/runner/commit-watcher.ts
-import { execSync as execSync3 } from "child_process";
+import { execSync as execSync2 } from "child_process";
 var logger5 = createServiceLogger("CommitWatcher");
 var CommitWatcher = class {
   constructor(config, callbacks) {
@@ -6535,7 +6497,7 @@ var CommitWatcher = class {
     this.isSyncing = false;
   }
   getLocalHeadSha() {
-    return execSync3("git rev-parse HEAD", {
+    return execSync2("git rev-parse HEAD", {
       cwd: this.config.projectDir,
       stdio: ["ignore", "pipe", "ignore"]
     }).toString().trim();
@@ -6543,12 +6505,12 @@ var CommitWatcher = class {
   poll() {
     if (!this.branch || this.isSyncing) return;
     try {
-      execSync3(`git fetch origin ${this.branch} --quiet`, {
+      execSync2(`git fetch origin ${this.branch} --quiet`, {
         cwd: this.config.projectDir,
         stdio: "ignore",
         timeout: 3e4
       });
-      const remoteSha = execSync3(`git rev-parse origin/${this.branch}`, {
+      const remoteSha = execSync2(`git rev-parse origin/${this.branch}`, {
         cwd: this.config.projectDir,
         stdio: ["ignore", "pipe", "ignore"]
       }).toString().trim();
@@ -6569,12 +6531,12 @@ var CommitWatcher = class {
     let latestMessage = "";
     let latestAuthor = "";
     try {
-      const countOutput = execSync3(`git rev-list --count ${previousSha}..origin/${this.branch}`, {
+      const countOutput = execSync2(`git rev-list --count ${previousSha}..origin/${this.branch}`, {
         cwd: this.config.projectDir,
         stdio: ["ignore", "pipe", "ignore"]
       }).toString().trim();
       commitCount = parseInt(countOutput, 10) || 1;
-      const logOutput = execSync3(`git log -1 --format="%s|||%an" origin/${this.branch}`, {
+      const logOutput = execSync2(`git log -1 --format="%s|||%an" origin/${this.branch}`, {
         cwd: this.config.projectDir,
         stdio: ["ignore", "pipe", "ignore"]
       }).toString().trim();
@@ -6609,7 +6571,7 @@ var CommitWatcher = class {
 };
 
 // src/runner/worktree.ts
-import { execSync as execSync4 } from "child_process";
+import { execSync as execSync3 } from "child_process";
 import { existsSync as existsSync2 } from "fs";
 import { join as join4 } from "path";
 var WORKTREE_DIR = ".worktrees";
@@ -6624,7 +6586,7 @@ function ensureWorktree(projectDir, taskId, branch) {
         return worktreePath;
       }
       try {
-        execSync4(`git checkout --detach origin/${branch}`, {
+        execSync3(`git checkout --detach origin/${branch}`, {
           cwd: worktreePath,
           stdio: "ignore"
         });
@@ -6634,7 +6596,7 @@ function ensureWorktree(projectDir, taskId, branch) {
     return worktreePath;
   }
   const ref = branch ? `origin/${branch}` : "HEAD";
-  execSync4(`git worktree add --detach "${worktreePath}" ${ref}`, {
+  execSync3(`git worktree add --detach "${worktreePath}" ${ref}`, {
     cwd: projectDir,
     stdio: "ignore"
   });
@@ -6642,7 +6604,7 @@ function ensureWorktree(projectDir, taskId, branch) {
 }
 function detachWorktreeBranch(projectDir, branch) {
   try {
-    const output = execSync4("git worktree list --porcelain", {
+    const output = execSync3("git worktree list --porcelain", {
       cwd: projectDir,
       encoding: "utf-8"
     });
@@ -6655,7 +6617,7 @@ function detachWorktreeBranch(projectDir, branch) {
       const worktreePath = worktreeLine.replace("worktree ", "");
       if (!worktreePath.includes(`/${WORKTREE_DIR}/`)) continue;
       try {
-        execSync4("git checkout --detach", { cwd: worktreePath, stdio: "ignore" });
+        execSync3("git checkout --detach", { cwd: worktreePath, stdio: "ignore" });
       } catch {
       }
     }
@@ -6666,7 +6628,7 @@ function removeWorktree(projectDir, taskId) {
   const worktreePath = join4(projectDir, WORKTREE_DIR, taskId);
   if (!existsSync2(worktreePath)) return;
   try {
-    execSync4(`git worktree remove "${worktreePath}" --force`, {
+    execSync3(`git worktree remove "${worktreePath}" --force`, {
       cwd: projectDir,
       stdio: "ignore"
     });
@@ -6674,14 +6636,67 @@ function removeWorktree(projectDir, taskId) {
   }
 }
 
-// src/runner/project-runner.ts
-import { fork } from "child_process";
-import { execSync as execSync5 } from "child_process";
-import * as path from "path";
-import { fileURLToPath as fileURLToPath2 } from "url";
+// src/setup/commands.ts
+import { spawn, execSync as execSync4 } from "child_process";
+function runSetupCommand(cmd, cwd, onOutput) {
+  return new Promise((resolve2, reject) => {
+    const child = spawn("sh", ["-c", cmd], {
+      cwd,
+      stdio: ["ignore", "pipe", "pipe"],
+      env: { ...process.env }
+    });
+    child.stdout.on("data", (chunk) => {
+      onOutput("stdout", chunk.toString());
+    });
+    child.stderr.on("data", (chunk) => {
+      onOutput("stderr", chunk.toString());
+    });
+    child.on("close", (code) => {
+      if (code === 0) {
+        resolve2();
+      } else {
+        reject(new Error(`Setup command exited with code ${code}`));
+      }
+    });
+    child.on("error", (err) => {
+      reject(err);
+    });
+  });
+}
+var AUTH_TOKEN_TIMEOUT_MS = 3e4;
+function runAuthTokenCommand(cmd, userEmail, cwd) {
+  try {
+    const output = execSync4(`${cmd} ${JSON.stringify(userEmail)}`, {
+      cwd,
+      timeout: AUTH_TOKEN_TIMEOUT_MS,
+      stdio: ["ignore", "pipe", "ignore"],
+      env: { ...process.env }
+    });
+    const token = output.toString().trim();
+    return token || null;
+  } catch {
+    return null;
+  }
+}
+function runStartCommand(cmd, cwd, onOutput) {
+  const child = spawn("sh", ["-c", cmd], {
+    cwd,
+    stdio: ["ignore", "pipe", "pipe"],
+    detached: true,
+    env: { ...process.env }
+  });
+  child.stdout.on("data", (chunk) => {
+    onOutput("stdout", chunk.toString());
+  });
+  child.stderr.on("data", (chunk) => {
+    onOutput("stderr", chunk.toString());
+  });
+  child.unref();
+  return child;
+}
 
 // src/tools/project-tools.ts
-import { z as z8 } from "zod";
+import { z as z11 } from "zod";
 function buildTaskListTools(connection) {
   const projectId = connection.projectId;
   return [
@@ -6689,9 +6704,9 @@ function buildTaskListTools(connection) {
       "list_tasks",
       "List tasks in the project. Optionally filter by status or assignee.",
       {
-        status: z8.string().optional().describe("Filter by task status"),
-        assigneeId: z8.string().optional().describe("Filter by assigned user ID"),
-        limit: z8.number().optional().describe("Max number of tasks to return (default 50)")
+        status: z11.string().optional().describe("Filter by task status"),
+        assigneeId: z11.string().optional().describe("Filter by assigned user ID"),
+        limit: z11.number().optional().describe("Max number of tasks to return (default 50)")
       },
       async (params) => {
         try {
@@ -6708,7 +6723,7 @@ function buildTaskListTools(connection) {
     defineTool(
       "get_task",
       "Get detailed information about a task including chat messages, child tasks, and session.",
-      { task_id: z8.string().describe("The task ID to look up") },
+      { task_id: z11.string().describe("The task ID to look up") },
       async ({ task_id }) => {
         try {
           const task = await connection.call("getProjectTask", { projectId, taskId: task_id });
@@ -6725,10 +6740,10 @@ function buildTaskListTools(connection) {
       "search_tasks",
       "Search tasks by tags, text query, or status filters.",
       {
-        tagNames: z8.array(z8.string()).optional().describe("Filter by tag names"),
-        searchQuery: z8.string().optional().describe("Text search in title/description"),
-        statusFilters: z8.array(z8.string()).optional().describe("Filter by statuses"),
-        limit: z8.number().optional().describe("Max results (default 20)")
+        tagNames: z11.array(z11.string()).optional().describe("Filter by tag names"),
+        searchQuery: z11.string().optional().describe("Text search in title/description"),
+        statusFilters: z11.array(z11.string()).optional().describe("Filter by statuses"),
+        limit: z11.number().optional().describe("Max results (default 20)")
       },
       async (params) => {
         try {
@@ -6781,18 +6796,17 @@ function buildProjectInfoTools(connection) {
     )
   ];
 }
-function buildMutationTools(connection) {
+function buildMutationTools2(connection) {
   const projectId = connection.projectId;
   return [
     defineTool(
       "create_task",
       "Create a new task in the project.",
       {
-        title: z8.string().describe("Task title"),
-        description: z8.string().optional().describe("Task description"),
-        plan: z8.string().optional().describe("Implementation plan in markdown"),
-        status: z8.string().optional().describe("Initial status (default: Planning)"),
-        isBug: z8.boolean().optional().describe("Whether this is a bug report")
+        title: z11.string().describe("Task title"),
+        description: z11.string().optional().describe("Task description"),
+        plan: z11.string().optional().describe("Implementation plan in markdown"),
+        status: z11.string().optional().describe("Initial status (default: Planning)")
       },
       async (params) => {
         try {
@@ -6809,12 +6823,12 @@ function buildMutationTools(connection) {
       "update_task",
       "Update an existing task's title, description, plan, status, or assignee.",
       {
-        task_id: z8.string().describe("The task ID to update"),
-        title: z8.string().optional().describe("New title"),
-        description: z8.string().optional().describe("New description"),
-        plan: z8.string().optional().describe("New plan in markdown"),
-        status: z8.string().optional().describe("New status"),
-        assignedUserId: z8.string().nullable().optional().describe("Assign to user ID, or null to unassign")
+        task_id: z11.string().describe("The task ID to update"),
+        title: z11.string().optional().describe("New title"),
+        description: z11.string().optional().describe("New description"),
+        plan: z11.string().optional().describe("New plan in markdown"),
+        status: z11.string().optional().describe("New status"),
+        assignedUserId: z11.string().nullable().optional().describe("Assign to user ID, or null to unassign")
       },
       async ({ task_id, ...fields }) => {
         try {
@@ -6833,7 +6847,7 @@ function buildProjectTools(connection) {
   return [
     ...buildTaskListTools(connection),
     ...buildProjectInfoTools(connection),
-    ...buildMutationTools(connection)
+    ...buildMutationTools2(connection)
   ];
 }
 
@@ -7028,14 +7042,204 @@ async function handleProjectChatMessage(message, connection, projectDir, session
   }
 }
 
-// src/runner/project-runner.ts
+// src/runner/project-runner-helpers.ts
+function parseErrorMessage(error) {
+  return error instanceof Error ? error.message : String(error);
+}
+
+// src/runner/project-runner-children.ts
+import { fork } from "child_process";
+import { execSync as execSync7 } from "child_process";
+import * as path from "path";
+import { fileURLToPath as fileURLToPath2 } from "url";
+
+// src/runner/project-runner-git.ts
+import { execSync as execSync6 } from "child_process";
+
+// src/runner/project-runner-sync.ts
+import { execSync as execSync5 } from "child_process";
 var logger7 = createServiceLogger("ProjectRunner");
-var __filename = fileURLToPath2(import.meta.url);
-var __dirname = path.dirname(__filename);
-var HEARTBEAT_INTERVAL_MS = 3e4;
-var MAX_CONCURRENT = Math.max(1, parseInt(process.env.CONVEYOR_MAX_CONCURRENT ?? "10", 10) || 10);
-var STOP_TIMEOUT_MS = 3e4;
 var START_CMD_KILL_TIMEOUT_MS = 5e3;
+async function executeSetupCommand(projectDir, connection) {
+  const cmd = process.env.CONVEYOR_SETUP_COMMAND;
+  if (!cmd) return;
+  logger7.info("Running setup command", { command: cmd });
+  try {
+    await runSetupCommand(cmd, projectDir, (stream, data) => {
+      connection.sendEvent({ type: "setup_output", stream, data });
+      (stream === "stderr" ? process.stderr : process.stdout).write(data);
+    });
+    logger7.info("Setup command completed");
+  } catch (error) {
+    const msg = parseErrorMessage(error);
+    logger7.error("Setup command failed", { error: msg });
+    connection.sendEvent({ type: "setup_error", message: msg });
+    throw error;
+  }
+}
+function executeStartCommand(projectDir, state, connection) {
+  const cmd = process.env.CONVEYOR_START_COMMAND;
+  if (!cmd) return;
+  logger7.info("Running start command", { command: cmd });
+  const child = runStartCommand(cmd, projectDir, (stream, data) => {
+    connection.sendEvent({ type: "start_command_output", stream, data });
+    (stream === "stderr" ? process.stderr : process.stdout).write(data);
+  });
+  state.child = child;
+  state.running = true;
+  child.on("exit", (code, signal) => {
+    state.running = false;
+    state.child = null;
+    logger7.info("Start command exited", { code, signal });
+    connection.sendEvent({ type: "start_command_exited", code, signal });
+  });
+  child.on("error", (err) => {
+    state.running = false;
+    state.child = null;
+    logger7.error("Start command error", { error: err.message });
+  });
+}
+async function killStartCommand(state) {
+  const child = state.child;
+  if (!child || !state.running) return;
+  try {
+    if (child.pid) process.kill(-child.pid, "SIGTERM");
+  } catch {
+    child.kill("SIGTERM");
+  }
+  await new Promise((resolve2) => {
+    const timer = setTimeout(() => {
+      if (state.running && child.pid) {
+        try {
+          process.kill(-child.pid, "SIGKILL");
+        } catch {
+          child.kill("SIGKILL");
+        }
+      }
+      resolve2();
+    }, START_CMD_KILL_TIMEOUT_MS);
+    child.on("exit", () => {
+      clearTimeout(timer);
+      resolve2();
+    });
+  });
+  state.child = null;
+  state.running = false;
+}
+async function restartStartCommand(projectDir, state, connection) {
+  await killStartCommand(state);
+  executeStartCommand(projectDir, state, connection);
+}
+async function handleSyncEnvironment(projectDir, branchSwitchCommand, state, connection, callback) {
+  try {
+    await killStartCommand(state);
+    const cmd = branchSwitchCommand ?? process.env.CONVEYOR_BRANCH_SWITCH_COMMAND;
+    if (cmd) {
+      try {
+        await runSetupCommand(cmd, projectDir, (stream, data) => {
+          connection.sendEvent({ type: "sync_output", stream, data });
+        });
+      } catch (err) {
+        const msg = parseErrorMessage(err);
+        logger7.error("Branch switch sync command failed", { error: msg });
+      }
+    }
+    executeStartCommand(projectDir, state, connection);
+    callback?.({ ok: true });
+  } catch (err) {
+    const msg = parseErrorMessage(err);
+    logger7.error("Environment sync failed", { error: msg });
+    callback?.({ ok: false, error: msg });
+  }
+}
+function getChangedFiles(projectDir, previousSha, newSha) {
+  try {
+    return execSync5(`git diff --name-only ${previousSha}..${newSha}`, {
+      cwd: projectDir,
+      stdio: ["ignore", "pipe", "ignore"]
+    }).toString().trim().split("\n").filter(Boolean);
+  } catch {
+    return [];
+  }
+}
+function runIndividualSyncSteps(projectDir, needsInstall, needsPrisma, stepsRun) {
+  if (needsInstall) {
+    try {
+      execSync5("bun install", { cwd: projectDir, timeout: 12e4, stdio: "pipe" });
+      stepsRun.push("install");
+    } catch (err) {
+      const msg = parseErrorMessage(err);
+      logger7.error("bun install failed", { error: msg });
+    }
+  }
+  if (needsPrisma) {
+    try {
+      execSync5("bunx prisma generate", { cwd: projectDir, timeout: 6e4, stdio: "pipe" });
+      execSync5("bunx prisma db push --accept-data-loss", {
+        cwd: projectDir,
+        timeout: 6e4,
+        stdio: "pipe"
+      });
+      stepsRun.push("prisma");
+    } catch (err) {
+      const msg = parseErrorMessage(err);
+      logger7.error("Prisma sync failed", { error: msg });
+    }
+  }
+}
+async function syncDependencies(projectDir, branchSwitchCommand, connection, changedFiles, stepsRun) {
+  const needsInstall = changedFiles.some(
+    (f) => f === "package.json" || f === "bun.lockb" || f.endsWith("/package.json") || f.endsWith("/bun.lockb")
+  );
+  const needsPrisma = changedFiles.some(
+    (f) => f.includes("prisma/schema.prisma") || f.includes("prisma/migrations/")
+  );
+  const cmd = branchSwitchCommand ?? process.env.CONVEYOR_BRANCH_SWITCH_COMMAND;
+  if (cmd && (needsInstall || needsPrisma)) {
+    try {
+      await runSetupCommand(cmd, projectDir, (stream, data) => {
+        connection.sendEvent({ type: "sync_output", stream, data });
+      });
+      stepsRun.push("branchSwitchCommand");
+    } catch (err) {
+      const msg = parseErrorMessage(err);
+      logger7.error("Branch switch command failed", { error: msg });
+    }
+  } else if (!cmd) {
+    runIndividualSyncSteps(projectDir, needsInstall, needsPrisma, stepsRun);
+  }
+}
+async function smartSync(projectDir, branchSwitchCommand, state, connection, previousSha, newSha, branch) {
+  if (hasUncommittedChanges(projectDir)) {
+    connection.sendEvent({
+      type: "commit_watch_warning",
+      message: "Working tree has uncommitted changes. Auto-pull skipped."
+    });
+    return ["skipped:dirty_tree"];
+  }
+  await killStartCommand(state);
+  try {
+    execSync5(`git pull origin ${branch}`, {
+      cwd: projectDir,
+      stdio: "pipe",
+      timeout: 6e4
+    });
+  } catch (err) {
+    const msg = parseErrorMessage(err);
+    logger7.error("Git pull failed during commit sync", { error: msg });
+    executeStartCommand(projectDir, state, connection);
+    return ["error:pull"];
+  }
+  const stepsRun = ["pull"];
+  const changedFiles = getChangedFiles(projectDir, previousSha, newSha);
+  await syncDependencies(projectDir, branchSwitchCommand, connection, changedFiles, stepsRun);
+  executeStartCommand(projectDir, state, connection);
+  stepsRun.push("startCommand");
+  return stepsRun;
+}
+
+// src/runner/project-runner-git.ts
+var logger8 = createServiceLogger("ProjectRunner");
 function setupWorkDir(projectDir, assignment) {
   const { taskId, branch, devBranch, useWorktree } = assignment;
   const shortId = taskId.slice(0, 8);
@@ -7048,21 +7252,105 @@ function setupWorkDir(projectDir, assignment) {
   }
   if (branch && branch !== devBranch) {
     if (hasUncommittedChanges(workDir)) {
-      logger7.warn("Uncommitted changes, skipping checkout", { taskId: shortId, branch });
+      logger8.warn("Uncommitted changes, skipping checkout", { taskId: shortId, branch });
     } else {
       try {
-        execSync5(`git checkout ${branch}`, { cwd: workDir, stdio: "ignore" });
+        execSync6(`git checkout ${branch}`, { cwd: workDir, stdio: "ignore" });
       } catch {
         try {
-          execSync5(`git checkout -b ${branch}`, { cwd: workDir, stdio: "ignore" });
+          execSync6(`git checkout -b ${branch}`, { cwd: workDir, stdio: "ignore" });
         } catch {
-          logger7.warn("Could not checkout branch", { taskId: shortId, branch });
+          logger8.warn("Could not checkout branch", { taskId: shortId, branch });
         }
       }
     }
   }
   return { workDir, usesWorktree: shouldWorktree };
 }
+function checkoutWorkspaceBranch(projectDir) {
+  const workspaceBranch = process.env.CONVEYOR_WORKSPACE_BRANCH;
+  if (!workspaceBranch) return;
+  const currentBranch = getCurrentBranch(projectDir);
+  if (currentBranch === workspaceBranch) return;
+  if (hasUncommittedChanges(projectDir)) {
+    logger8.warn("Uncommitted changes, skipping workspace branch checkout");
+    return;
+  }
+  try {
+    execSync6(`git fetch origin ${workspaceBranch}`, { cwd: projectDir, stdio: "pipe" });
+    execSync6(`git checkout ${workspaceBranch}`, { cwd: projectDir, stdio: "pipe" });
+    logger8.info("Checked out workspace branch", { workspaceBranch });
+  } catch {
+    logger8.warn("Failed to checkout workspace branch", { workspaceBranch });
+  }
+}
+async function handleSwitchBranch(projectDir, branchSwitchCommand, startCmd, connection, commitWatcher, data, callback) {
+  try {
+    try {
+      execSync6("git fetch origin", { cwd: projectDir, stdio: "pipe" });
+    } catch {
+      logger8.warn("Git fetch failed during branch switch");
+    }
+    detachWorktreeBranch(projectDir, data.branch);
+    try {
+      execSync6(`git checkout ${data.branch}`, { cwd: projectDir, stdio: "pipe" });
+    } catch (err) {
+      const msg = parseErrorMessage(err);
+      callback({ ok: false, error: `Failed to checkout branch: ${msg}` });
+      return;
+    }
+    try {
+      execSync6(`git pull origin ${data.branch}`, { cwd: projectDir, stdio: "pipe" });
+    } catch {
+      logger8.warn("Git pull failed during branch switch");
+    }
+    if (data.syncAfter !== false) {
+      await handleSyncEnvironment(projectDir, branchSwitchCommand, startCmd, connection);
+    }
+    commitWatcher.start(data.branch);
+    callback({ ok: true });
+  } catch (err) {
+    const msg = parseErrorMessage(err);
+    logger8.error("Branch switch failed", { error: msg });
+    callback({ ok: false, error: msg });
+  }
+}
+async function handleNewCommits(projectDir, branchSwitchCommand, startCmd, connection, setupComplete, data) {
+  await connection.call("reportNewCommitsDetected", {
+    projectId: connection.projectId,
+    branch: data.branch,
+    commits: [
+      {
+        sha: data.newCommitSha,
+        message: data.latestMessage,
+        author: data.latestAuthor
+      }
+    ]
+  });
+  const stepsRun = await smartSync(
+    projectDir,
+    branchSwitchCommand,
+    startCmd,
+    connection,
+    data.previousSha,
+    data.newCommitSha,
+    data.branch
+  );
+  await connection.call("reportEnvironmentReady", {
+    projectId: connection.projectId,
+    branch: data.branch,
+    setupComplete,
+    startCommandRunning: startCmd.running
+  });
+  logger8.info("Commit sync complete", { steps: stepsRun.join(", ") });
+}
+
+// src/runner/project-runner-children.ts
+var logger9 = createServiceLogger("ProjectRunner");
+var __filename = fileURLToPath2(import.meta.url);
+var __dirname = path.dirname(__filename);
+var STOP_TIMEOUT_MS = 3e4;
+var MAX_CONCURRENT = Math.max(1, parseInt(process.env.CONVEYOR_MAX_CONCURRENT ?? "10", 10) || 10);
 function spawnChildAgent(assignment, workDir) {
   const { taskToken, apiUrl, taskId, sessionId, mode, isAuto, useSandbox, agentMode } = assignment;
   const cliPath = path.resolve(__dirname, "cli.js");
@@ -7074,7 +7362,7 @@ function spawnChildAgent(assignment, workDir) {
   const effectiveAgentMode = agentMode ?? (isAuto ? "auto" : "");
   const effectiveApiUrl = apiUrl || process.env.CONVEYOR_API_URL || "";
   if (!effectiveApiUrl) {
-    logger7.error("No API URL available for child agent", { taskId: taskId.slice(0, 8) });
+    logger9.error("No API URL available for child agent", { taskId: taskId.slice(0, 8) });
   }
   const child = fork(cliPath, [], {
     env: {
@@ -7102,16 +7390,112 @@ function spawnChildAgent(assignment, workDir) {
   const shortId = taskId.slice(0, 8);
   child.stdout?.on("data", (data) => {
     for (const line of data.toString().trimEnd().split("\n")) {
-      logger7.info(line, { taskId: shortId });
+      logger9.info(line, { taskId: shortId });
     }
   });
   child.stderr?.on("data", (data) => {
     for (const line of data.toString().trimEnd().split("\n")) {
-      logger7.info(line, { taskId: shortId });
+      logger9.info(line, { taskId: shortId });
     }
   });
   return child;
 }
+async function killAgent(agent, taskId) {
+  const shortId = taskId.slice(0, 8);
+  if (agent.process.exitCode !== null) {
+    logger9.info("Agent process already exited", { taskId: shortId });
+    return;
+  }
+  logger9.info("Killing agent process", { taskId: shortId });
+  agent.process.kill("SIGTERM");
+  await new Promise((resolve2) => {
+    const timer = setTimeout(() => {
+      if (agent.process.exitCode === null) {
+        logger9.warn("Agent did not exit after SIGTERM, sending SIGKILL", { taskId: shortId });
+        agent.process.kill("SIGKILL");
+      }
+      resolve2();
+    }, STOP_TIMEOUT_MS);
+    agent.process.on("exit", () => {
+      clearTimeout(timer);
+      resolve2();
+    });
+  });
+}
+async function handleAssignment(assignment, activeAgents, projectDir, connection) {
+  const { taskId, mode } = assignment;
+  const shortId = taskId.slice(0, 8);
+  const agentKey = assignment.agentMode === "code-review" ? `${taskId}:code-review` : taskId;
+  const existing = activeAgents.get(agentKey);
+  if (existing) {
+    if (existing.process.exitCode === null) {
+      logger9.info("Re-assignment received, killing existing agent", { taskId: shortId });
+      await killAgent(existing, taskId);
+    } else {
+      logger9.info("Stale agent entry (process already exited), cleaning up", { taskId: shortId });
+    }
+    activeAgents.delete(agentKey);
+  }
+  if (activeAgents.size >= MAX_CONCURRENT) {
+    logger9.warn("Max concurrent agents reached", { maxConcurrent: MAX_CONCURRENT });
+    connection.emitTaskStopped(taskId, "max_concurrent_reached");
+    return;
+  }
+  try {
+    try {
+      execSync7("git fetch origin", { cwd: projectDir, stdio: "ignore" });
+    } catch {
+      logger9.warn("Git fetch failed", { taskId: shortId });
+    }
+    const { workDir, usesWorktree } = setupWorkDir(projectDir, assignment);
+    if (assignment.devBranch) {
+      syncWithBaseBranch(workDir, assignment.devBranch);
+    }
+    const child = spawnChildAgent(assignment, workDir);
+    activeAgents.set(agentKey, {
+      process: child,
+      worktreePath: workDir,
+      mode,
+      usesWorktree
+    });
+    connection.emitTaskStarted(taskId);
+    logger9.info("Started task", { taskId: shortId, mode, workDir });
+    child.on("exit", (code) => {
+      activeAgents.delete(agentKey);
+      const reason = code === 0 ? "completed" : `exited with code ${code}`;
+      connection.emitTaskStopped(taskId, reason);
+      logger9.info("Task exited", { taskId: shortId, reason });
+      if (code === 0 && usesWorktree) {
+        try {
+          removeWorktree(projectDir, taskId);
+        } catch {
+        }
+      }
+    });
+  } catch (error) {
+    const msg = parseErrorMessage(error);
+    logger9.error("Failed to start task", { taskId: shortId, error: msg });
+    connection.emitTaskStopped(taskId, `start_failed: ${msg}`);
+  }
+}
+function handleStopTask(taskId, activeAgents, projectDir) {
+  const agentKey = activeAgents.has(taskId) ? taskId : `${taskId}:code-review`;
+  const agent = activeAgents.get(agentKey);
+  if (!agent) return;
+  logger9.info("Stopping task", { taskId: taskId.slice(0, 8) });
+  void killAgent(agent, taskId).then(() => {
+    if (agent.usesWorktree) {
+      try {
+        removeWorktree(projectDir, taskId);
+      } catch {
+      }
+    }
+  });
+}
+
+// src/runner/project-runner.ts
+var logger10 = createServiceLogger("ProjectRunner");
+var HEARTBEAT_INTERVAL_MS = 3e4;
 var ProjectRunner = class {
   connection;
   projectDir;
@@ -7120,8 +7504,7 @@ var ProjectRunner = class {
   stopping = false;
   resolveLifecycle = null;
   chatSessionIds = /* @__PURE__ */ new Map();
-  startCommandChild = null;
-  startCommandRunning = false;
+  startCmd = { child: null, running: false };
   setupComplete = false;
   branchSwitchCommand;
   commitWatcher;
@@ -7140,33 +7523,39 @@ var ProjectRunner = class {
       },
       {
         onNewCommits: async (data) => {
-          await this.handleNewCommits(data);
+          await handleNewCommits(
+            this.projectDir,
+            this.branchSwitchCommand,
+            this.startCmd,
+            this.connection,
+            this.setupComplete,
+            data
+          );
         }
       }
     );
   }
   // ── Public lifecycle ───────────────────────────────────────────────────
-  // oxlint-disable-next-line max-lines-per-function -- sequential lifecycle orchestration
   async start() {
-    this.checkoutWorkspaceBranch();
+    checkoutWorkspaceBranch(this.projectDir);
     await this.connection.connect();
     const registration = await this.connection.call("registerProjectAgent", {
       projectId: this.connection.projectId,
       capabilities: ["task", "pm", "code-review", "audit"]
     });
     this.branchSwitchCommand = registration.branchSwitchCommand ?? process.env.CONVEYOR_BRANCH_SWITCH_COMMAND;
-    logger7.info("Registered as project agent", { agentName: registration.agentName });
+    logger10.info("Registered as project agent", { agentName: registration.agentName });
     try {
-      await this.executeSetupCommand();
-      this.executeStartCommand();
+      await executeSetupCommand(this.projectDir, this.connection);
+      executeStartCommand(this.projectDir, this.startCmd, this.connection);
       this.setupComplete = true;
       this.connection.sendEvent({
         type: "setup_complete",
-        startCommandRunning: this.startCommandRunning
+        startCommandRunning: this.startCmd.running
       });
     } catch (error) {
-      const msg = error instanceof Error ? error.message : String(error);
-      logger7.error("Environment setup failed", { error: msg });
+      const msg = parseErrorMessage(error);
+      logger10.error("Environment setup failed", { error: msg });
       this.setupComplete = false;
     }
     this.wireEventHandlers();
@@ -7178,7 +7567,7 @@ var ProjectRunner = class {
     if (currentBranch) {
       this.commitWatcher.start(currentBranch);
     }
-    logger7.info("Connected, waiting for task assignments");
+    logger10.info("Connected, waiting for task assignments");
     await new Promise((resolve2) => {
       this.resolveLifecycle = resolve2;
     });
@@ -7197,24 +7586,24 @@ var ProjectRunner = class {
           wipMessage: "WIP: auto-commit on conveyor-agent shutdown"
         });
         if (result.hadWork) {
-          logger7.info("Shutdown git flush", {
+          logger10.info("Shutdown git flush", {
             dir,
             committed: result.committed,
             pushed: result.pushed
           });
         }
       } catch (err) {
-        const msg = err instanceof Error ? err.message : String(err);
-        logger7.warn("Shutdown git flush failed", { dir, error: msg });
+        const msg = parseErrorMessage(err);
+        logger10.warn("Shutdown git flush failed", { dir, error: msg });
       }
     }
   }
   async stop() {
     if (this.stopping) return;
     this.stopping = true;
-    logger7.info("Shutting down");
+    logger10.info("Shutting down");
     this.commitWatcher.stop();
-    await this.killStartCommand();
+    await killStartCommand(this.startCmd);
     if (this.heartbeatTimer) {
       clearInterval(this.heartbeatTimer);
       this.heartbeatTimer = null;
@@ -7227,7 +7616,7 @@ var ProjectRunner = class {
           return;
         }
         agent.process.on("exit", () => resolve2());
-        this.handleStopTask(key);
+        handleStopTask(key, this.activeAgents, this.projectDir);
       })
     );
     await Promise.race([
@@ -7244,7 +7633,7 @@ var ProjectRunner = class {
     } catch {
     }
     this.connection.disconnect();
-    logger7.info("Shutdown complete");
+    logger10.info("Shutdown complete");
     if (this.resolveLifecycle) {
       this.resolveLifecycle();
       this.resolveLifecycle = null;
@@ -7252,8 +7641,12 @@ var ProjectRunner = class {
   }
   // ── Event wiring ───────────────────────────────────────────────────────
   wireEventHandlers() {
-    this.connection.onTaskAssignment((assignment) => void this.handleAssignment(assignment));
-    this.connection.onStopTask((data) => this.handleStopTask(data.taskId));
+    this.connection.onTaskAssignment(
+      (assignment) => void handleAssignment(assignment, this.activeAgents, this.projectDir, this.connection)
+    );
+    this.connection.onStopTask(
+      (data) => handleStopTask(data.taskId, this.activeAgents, this.projectDir)
+    );
     this.connection.onShutdown(() => void this.stop());
     this.connection.onChatMessage((msg) => {
       const chatId = msg.chatId ?? "default";
@@ -7266,10 +7659,28 @@ var ProjectRunner = class {
     });
     this.connection.onAuditTags((request) => void this.handleAuditTags(request));
     this.connection.onAuditTasks((request) => void this.handleAuditTasks(request));
-    this.connection.onSwitchBranch((data, cb) => void this.handleSwitchBranch(data, cb));
-    this.connection.onSyncEnvironment((cb) => void this.handleSyncEnvironment(cb));
+    this.connection.onSwitchBranch(
+      (data, cb) => void handleSwitchBranch(
+        this.projectDir,
+        this.branchSwitchCommand,
+        this.startCmd,
+        this.connection,
+        this.commitWatcher,
+        data,
+        cb
+      )
+    );
+    this.connection.onSyncEnvironment(
+      (cb) => void handleSyncEnvironment(
+        this.projectDir,
+        this.branchSwitchCommand,
+        this.startCmd,
+        this.connection,
+        cb
+      )
+    );
     this.connection.onRestartStartCommand((cb) => {
-      void this.restartStartCommand().then(() => cb({ ok: true })).catch(
+      void restartStartCommand(this.projectDir, this.startCmd, this.connection).then(() => cb({ ok: true })).catch(
         (err) => cb({ ok: false, error: err instanceof Error ? err.message : "Restart failed" })
       );
     });
@@ -7281,10 +7692,10 @@ var ProjectRunner = class {
         capabilities: ["task", "pm", "code-review", "audit"]
       });
       this.connection.emitStatus(this.activeAgents.size > 0 ? "busy" : "idle");
-      logger7.info("Re-registered after reconnect");
+      logger10.info("Re-registered after reconnect");
     } catch (error) {
-      const msg = error instanceof Error ? error.message : String(error);
-      logger7.error("Failed to re-register after reconnect", { error: msg });
+      const msg = parseErrorMessage(error);
+      logger10.error("Failed to re-register after reconnect", { error: msg });
     }
   }
   // ── Tag audit ──────────────────────────────────────────────────────────
@@ -7294,8 +7705,8 @@ var ProjectRunner = class {
       const { handleTagAudit } = await import("./tag-audit-handler-I54W7ZD7.js");
       await handleTagAudit(request, this.connection, this.projectDir);
     } catch (error) {
-      const msg = error instanceof Error ? error.message : String(error);
-      logger7.error("Tag audit failed", { error: msg, requestId: request.requestId });
+      const msg = parseErrorMessage(error);
+      logger10.error("Tag audit failed", { error: msg, requestId: request.requestId });
       try {
         await this.connection.call("reportTagAuditResult", {
           projectId: this.connection.projectId,
@@ -7314,11 +7725,11 @@ var ProjectRunner = class {
   async handleAuditTasks(request) {
     this.connection.emitStatus("busy");
     try {
-      const { handleTaskAudit } = await import("./task-audit-handler-KGTVMVAP.js");
+      const { handleTaskAudit } = await import("./task-audit-handler-TJOM5OJS.js");
       await handleTaskAudit(request, this.connection, this.projectDir);
     } catch (error) {
-      const msg = error instanceof Error ? error.message : String(error);
-      logger7.error("Task audit failed", { error: msg, requestId: request.requestId });
+      const msg = parseErrorMessage(error);
+      logger10.error("Task audit failed", { error: msg, requestId: request.requestId });
       for (const task of request.tasks) {
         try {
           await this.connection.call("reportTaskAuditResult", {
@@ -7356,353 +7767,9 @@ var ProjectRunner = class {
       this.connection.emitStatus("idle");
     }
   }
-  // ── Task management ────────────────────────────────────────────────────
-  async killAgent(agent, taskId) {
-    const shortId = taskId.slice(0, 8);
-    if (agent.process.exitCode !== null) {
-      logger7.info("Agent process already exited", { taskId: shortId });
-      return;
-    }
-    logger7.info("Killing agent process", { taskId: shortId });
-    agent.process.kill("SIGTERM");
-    await new Promise((resolve2) => {
-      const timer = setTimeout(() => {
-        if (agent.process.exitCode === null) {
-          logger7.warn("Agent did not exit after SIGTERM, sending SIGKILL", { taskId: shortId });
-          agent.process.kill("SIGKILL");
-        }
-        resolve2();
-      }, STOP_TIMEOUT_MS);
-      agent.process.on("exit", () => {
-        clearTimeout(timer);
-        resolve2();
-      });
-    });
-  }
-  // oxlint-disable-next-line max-lines-per-function -- re-assignment logic requires sequential checks
-  async handleAssignment(assignment) {
-    const { taskId, mode } = assignment;
-    const shortId = taskId.slice(0, 8);
-    const agentKey = assignment.agentMode === "code-review" ? `${taskId}:code-review` : taskId;
-    const existing = this.activeAgents.get(agentKey);
-    if (existing) {
-      if (existing.process.exitCode === null) {
-        logger7.info("Re-assignment received, killing existing agent", { taskId: shortId });
-        await this.killAgent(existing, taskId);
-      } else {
-        logger7.info("Stale agent entry (process already exited), cleaning up", { taskId: shortId });
-      }
-      this.activeAgents.delete(agentKey);
-    }
-    if (this.activeAgents.size >= MAX_CONCURRENT) {
-      logger7.warn("Max concurrent agents reached", { maxConcurrent: MAX_CONCURRENT });
-      this.connection.emitTaskStopped(taskId, "max_concurrent_reached");
-      return;
-    }
-    try {
-      try {
-        execSync5("git fetch origin", { cwd: this.projectDir, stdio: "ignore" });
-      } catch {
-        logger7.warn("Git fetch failed", { taskId: shortId });
-      }
-      const { workDir, usesWorktree } = setupWorkDir(this.projectDir, assignment);
-      if (assignment.devBranch) {
-        syncWithBaseBranch(workDir, assignment.devBranch);
-      }
-      const child = spawnChildAgent(assignment, workDir);
-      this.activeAgents.set(agentKey, {
-        process: child,
-        worktreePath: workDir,
-        mode,
-        usesWorktree
-      });
-      this.connection.emitTaskStarted(taskId);
-      logger7.info("Started task", { taskId: shortId, mode, workDir });
-      child.on("exit", (code) => {
-        this.activeAgents.delete(agentKey);
-        const reason = code === 0 ? "completed" : `exited with code ${code}`;
-        this.connection.emitTaskStopped(taskId, reason);
-        logger7.info("Task exited", { taskId: shortId, reason });
-        if (code === 0 && usesWorktree) {
-          try {
-            removeWorktree(this.projectDir, taskId);
-          } catch {
-          }
-        }
-      });
-    } catch (error) {
-      const msg = error instanceof Error ? error.message : "Unknown";
-      logger7.error("Failed to start task", { taskId: shortId, error: msg });
-      this.connection.emitTaskStopped(taskId, `start_failed: ${msg}`);
-    }
-  }
-  handleStopTask(taskId) {
-    const agentKey = this.activeAgents.has(taskId) ? taskId : `${taskId}:code-review`;
-    const agent = this.activeAgents.get(agentKey);
-    if (!agent) return;
-    logger7.info("Stopping task", { taskId: taskId.slice(0, 8) });
-    void this.killAgent(agent, taskId).then(() => {
-      if (agent.usesWorktree) {
-        try {
-          removeWorktree(this.projectDir, taskId);
-        } catch {
-        }
-      }
-    });
-  }
-  // ── Environment management ─────────────────────────────────────────────
-  checkoutWorkspaceBranch() {
-    const workspaceBranch = process.env.CONVEYOR_WORKSPACE_BRANCH;
-    if (!workspaceBranch) return;
-    const currentBranch = this.getCurrentBranch();
-    if (currentBranch === workspaceBranch) return;
-    if (hasUncommittedChanges(this.projectDir)) {
-      logger7.warn("Uncommitted changes, skipping workspace branch checkout");
-      return;
-    }
-    try {
-      execSync5(`git fetch origin ${workspaceBranch}`, { cwd: this.projectDir, stdio: "pipe" });
-      execSync5(`git checkout ${workspaceBranch}`, { cwd: this.projectDir, stdio: "pipe" });
-      logger7.info("Checked out workspace branch", { workspaceBranch });
-    } catch {
-      logger7.warn("Failed to checkout workspace branch", { workspaceBranch });
-    }
-  }
-  async executeSetupCommand() {
-    const cmd = process.env.CONVEYOR_SETUP_COMMAND;
-    if (!cmd) return;
-    logger7.info("Running setup command", { command: cmd });
-    try {
-      await runSetupCommand(cmd, this.projectDir, (stream, data) => {
-        this.connection.sendEvent({ type: "setup_output", stream, data });
-        (stream === "stderr" ? process.stderr : process.stdout).write(data);
-      });
-      logger7.info("Setup command completed");
-    } catch (error) {
-      const msg = error instanceof Error ? error.message : "Setup command failed";
-      logger7.error("Setup command failed", { error: msg });
-      this.connection.sendEvent({ type: "setup_error", message: msg });
-      throw error;
-    }
-  }
-  executeStartCommand() {
-    const cmd = process.env.CONVEYOR_START_COMMAND;
-    if (!cmd) return;
-    logger7.info("Running start command", { command: cmd });
-    const child = runStartCommand(cmd, this.projectDir, (stream, data) => {
-      this.connection.sendEvent({ type: "start_command_output", stream, data });
-      (stream === "stderr" ? process.stderr : process.stdout).write(data);
-    });
-    this.startCommandChild = child;
-    this.startCommandRunning = true;
-    child.on("exit", (code, signal) => {
-      this.startCommandRunning = false;
-      this.startCommandChild = null;
-      logger7.info("Start command exited", { code, signal });
-      this.connection.sendEvent({ type: "start_command_exited", code, signal });
-    });
-    child.on("error", (err) => {
-      this.startCommandRunning = false;
-      this.startCommandChild = null;
-      logger7.error("Start command error", { error: err.message });
-    });
-  }
-  async killStartCommand() {
-    const child = this.startCommandChild;
-    if (!child || !this.startCommandRunning) return;
-    try {
-      if (child.pid) process.kill(-child.pid, "SIGTERM");
-    } catch {
-      child.kill("SIGTERM");
-    }
-    await new Promise((resolve2) => {
-      const timer = setTimeout(() => {
-        if (this.startCommandRunning && child.pid) {
-          try {
-            process.kill(-child.pid, "SIGKILL");
-          } catch {
-            child.kill("SIGKILL");
-          }
-        }
-        resolve2();
-      }, START_CMD_KILL_TIMEOUT_MS);
-      child.on("exit", () => {
-        clearTimeout(timer);
-        resolve2();
-      });
-    });
-    this.startCommandChild = null;
-    this.startCommandRunning = false;
-  }
-  async restartStartCommand() {
-    await this.killStartCommand();
-    this.executeStartCommand();
-  }
   getCurrentBranch() {
     return getCurrentBranch(this.projectDir);
   }
-  // ── Branch switching ───────────────────────────────────────────────────
-  async handleSwitchBranch(data, callback) {
-    try {
-      try {
-        execSync5("git fetch origin", { cwd: this.projectDir, stdio: "pipe" });
-      } catch {
-        logger7.warn("Git fetch failed during branch switch");
-      }
-      detachWorktreeBranch(this.projectDir, data.branch);
-      try {
-        execSync5(`git checkout ${data.branch}`, { cwd: this.projectDir, stdio: "pipe" });
-      } catch (err) {
-        const msg = err instanceof Error ? err.message : "Checkout failed";
-        callback({ ok: false, error: `Failed to checkout branch: ${msg}` });
-        return;
-      }
-      try {
-        execSync5(`git pull origin ${data.branch}`, { cwd: this.projectDir, stdio: "pipe" });
-      } catch {
-        logger7.warn("Git pull failed during branch switch");
-      }
-      if (data.syncAfter !== false) {
-        await this.handleSyncEnvironment();
-      }
-      this.commitWatcher.start(data.branch);
-      callback({ ok: true });
-    } catch (err) {
-      const msg = err instanceof Error ? err.message : "Branch switch failed";
-      logger7.error("Branch switch failed", { error: msg });
-      callback({ ok: false, error: msg });
-    }
-  }
-  async handleSyncEnvironment(callback) {
-    try {
-      await this.killStartCommand();
-      const cmd = this.branchSwitchCommand ?? process.env.CONVEYOR_BRANCH_SWITCH_COMMAND;
-      if (cmd) {
-        try {
-          await runSetupCommand(cmd, this.projectDir, (stream, data) => {
-            this.connection.sendEvent({ type: "sync_output", stream, data });
-          });
-        } catch (err) {
-          const msg = err instanceof Error ? err.message : "Sync command failed";
-          logger7.error("Branch switch sync command failed", { error: msg });
-        }
-      }
-      this.executeStartCommand();
-      callback?.({ ok: true });
-    } catch (err) {
-      const msg = err instanceof Error ? err.message : "Sync failed";
-      logger7.error("Environment sync failed", { error: msg });
-      callback?.({ ok: false, error: msg });
-    }
-  }
-  // ── Commit watching ────────────────────────────────────────────────────
-  // oxlint-disable-next-line max-lines-per-function -- sequential sync steps
-  async handleNewCommits(data) {
-    await this.connection.call("reportNewCommitsDetected", {
-      projectId: this.connection.projectId,
-      branch: data.branch,
-      commits: [
-        {
-          sha: data.newCommitSha,
-          message: data.latestMessage,
-          author: data.latestAuthor
-        }
-      ]
-    });
-    const stepsRun = await this.smartSync(data.previousSha, data.newCommitSha, data.branch);
-    await this.connection.call("reportEnvironmentReady", {
-      projectId: this.connection.projectId,
-      branch: data.branch,
-      setupComplete: this.setupComplete,
-      startCommandRunning: this.startCommandRunning
-    });
-    logger7.info("Commit sync complete", { steps: stepsRun.join(", ") });
-  }
-  async smartSync(previousSha, newSha, branch) {
-    if (hasUncommittedChanges(this.projectDir)) {
-      this.connection.sendEvent({
-        type: "commit_watch_warning",
-        message: "Working tree has uncommitted changes. Auto-pull skipped."
-      });
-      return ["skipped:dirty_tree"];
-    }
-    await this.killStartCommand();
-    try {
-      execSync5(`git pull origin ${branch}`, {
-        cwd: this.projectDir,
-        stdio: "pipe",
-        timeout: 6e4
-      });
-    } catch (err) {
-      const msg = err instanceof Error ? err.message : "Pull failed";
-      logger7.error("Git pull failed during commit sync", { error: msg });
-      this.executeStartCommand();
-      return ["error:pull"];
-    }
-    const stepsRun = ["pull"];
-    const changedFiles = this.getChangedFiles(previousSha, newSha);
-    await this.syncDependencies(changedFiles, stepsRun);
-    this.executeStartCommand();
-    stepsRun.push("startCommand");
-    return stepsRun;
-  }
-  async syncDependencies(changedFiles, stepsRun) {
-    const needsInstall = changedFiles.some(
-      (f) => f === "package.json" || f === "bun.lockb" || f.endsWith("/package.json") || f.endsWith("/bun.lockb")
-    );
-    const needsPrisma = changedFiles.some(
-      (f) => f.includes("prisma/schema.prisma") || f.includes("prisma/migrations/")
-    );
-    const cmd = this.branchSwitchCommand ?? process.env.CONVEYOR_BRANCH_SWITCH_COMMAND;
-    if (cmd && (needsInstall || needsPrisma)) {
-      try {
-        await runSetupCommand(cmd, this.projectDir, (stream, data) => {
-          this.connection.sendEvent({ type: "sync_output", stream, data });
-        });
-        stepsRun.push("branchSwitchCommand");
-      } catch (err) {
-        const msg = err instanceof Error ? err.message : "Sync command failed";
-        logger7.error("Branch switch command failed", { error: msg });
-      }
-    } else if (!cmd) {
-      this.runIndividualSyncSteps(needsInstall, needsPrisma, stepsRun);
-    }
-  }
-  runIndividualSyncSteps(needsInstall, needsPrisma, stepsRun) {
-    if (needsInstall) {
-      try {
-        execSync5("bun install", { cwd: this.projectDir, timeout: 12e4, stdio: "pipe" });
-        stepsRun.push("install");
-      } catch (err) {
-        const msg = err instanceof Error ? err.message : "Install failed";
-        logger7.error("bun install failed", { error: msg });
-      }
-    }
-    if (needsPrisma) {
-      try {
-        execSync5("bunx prisma generate", { cwd: this.projectDir, timeout: 6e4, stdio: "pipe" });
-        execSync5("bunx prisma db push --accept-data-loss", {
-          cwd: this.projectDir,
-          timeout: 6e4,
-          stdio: "pipe"
-        });
-        stepsRun.push("prisma");
-      } catch (err) {
-        const msg = err instanceof Error ? err.message : "Prisma sync failed";
-        logger7.error("Prisma sync failed", { error: msg });
-      }
-    }
-  }
-  getChangedFiles(previousSha, newSha) {
-    try {
-      return execSync5(`git diff --name-only ${previousSha}..${newSha}`, {
-        cwd: this.projectDir,
-        stdio: ["ignore", "pipe", "ignore"]
-      }).toString().trim().split("\n").filter(Boolean);
-    } catch {
-      return [];
-    }
-  }
 };
 
 // src/setup/config.ts
@@ -7748,15 +7815,15 @@ export {
   PlanSync,
   SessionRunner,
   ProjectConnection,
-  runSetupCommand,
-  runAuthTokenCommand,
-  runStartCommand,
   CommitWatcher,
   ensureWorktree,
   detachWorktreeBranch,
   removeWorktree,
+  runSetupCommand,
+  runAuthTokenCommand,
+  runStartCommand,
   ProjectRunner,
   loadForwardPorts,
   loadConveyorConfig
 };
-//# sourceMappingURL=chunk-TN24QXF5.js.map
+//# sourceMappingURL=chunk-WYIXEIRS.js.map