@rallycry/conveyor-agent 7.0.3 → 7.0.5

package/dist/{chunk-L7ZH423N.js → chunk-FCRGYU2M.js}

@@ -263,6 +263,7 @@ var AgentConnection = class {
     };
     const heartbeatStatus = statusMap[this.lastEmittedStatus ?? "idle"] ?? "active";
     void this.call("heartbeat", {
+      sessionId: this.config.sessionId,
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
       status: heartbeatStatus
     }).catch(() => {
@@ -592,6 +593,34 @@ var Lifecycle = class {
 
 // src/runner/git-utils.ts
 import { execSync } from "child_process";
+function syncWithBaseBranch(cwd, baseBranch) {
+  if (!baseBranch) return true;
+  try {
+    execSync(`git fetch origin ${baseBranch}`, { cwd, stdio: "ignore", timeout: 6e4 });
+  } catch {
+    process.stderr.write(
+      `[conveyor-agent] Warning: git fetch origin ${baseBranch} failed, continuing with current base
+`
+    );
+    return false;
+  }
+  try {
+    execSync(`git merge origin/${baseBranch} --no-edit`, { cwd, stdio: "ignore", timeout: 3e4 });
+  } catch {
+    process.stderr.write(
+      `[conveyor-agent] Warning: merge origin/${baseBranch} failed, aborting merge and continuing
+`
+    );
+    try {
+      execSync("git merge --abort", { cwd, stdio: "ignore" });
+    } catch {
+    }
+    return false;
+  }
+  process.stderr.write(`[conveyor-agent] Synced with latest origin/${baseBranch}
+`);
+  return true;
+}
 function hasUncommittedChanges(cwd) {
   const status = execSync("git status --porcelain", {
     cwd,
@@ -832,7 +861,6 @@ function buildPackRunnerSystemPrompt(context, config, setupLog) {
     `- "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.`,
     `- "ReviewDev" \u2014 PR was merged to dev. This child is complete. Move on.`,
     `- "Complete" \u2014 Fully done. Move on.`,
     ``,
@@ -849,7 +877,6 @@ function buildPackRunnerSystemPrompt(context, config, setupLog) {
     `   - "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 blocking progress, notify team.`,
     ``,
@@ -859,7 +886,7 @@ function buildPackRunnerSystemPrompt(context, config, setupLog) {
     ``,
     `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").`,
+    `6. When ALL children are in "ReviewDev" or "Complete" (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`,
     `- When dependencies are set on children, use them to determine execution order. Fire all ready tasks in parallel.`,
@@ -1157,6 +1184,15 @@ function buildDiscoveryPrompt(context) {
     `- Goal: collaborate with the user to create a clear plan`,
     `- Proactively fill task properties (SP, tags, icon) as the plan takes shape`,
     ``,
+    `### Planning Checklist (complete ALL before calling ExitPlanMode)`,
+    `Your PRIMARY goal is to create a thorough plan. Complete these steps in order:`,
+    `1. Read the task description and chat history \u2014 respond to what's been discussed`,
+    `2. Explore the codebase to understand relevant files and patterns`,
+    `3. Save a detailed plan via \`update_task\``,
+    `4. Set story points, tags, and title via \`update_task_properties\``,
+    `5. Discuss the plan with the team if they're engaged, incorporate feedback`,
+    `6. THEN call ExitPlanMode \u2014 it is the LAST step, not the first`,
+    ``,
     `### Self-Identification Tools`,
     `Use these MCP tools to set your own task properties:`,
     `- \`update_task\` \u2014 save your plan and description`,
@@ -1168,15 +1204,31 @@ function buildDiscoveryPrompt(context) {
     `- Add matching tags using \`update_task_properties\` \u2014 this links relevant documentation and rules that help you plan more effectively`,
     `- Tags accelerate discovery by surfacing domain-specific context automatically`,
     ``,
-    `### Self-Update vs Subtasks`,
-    `- If the work fits in a single task (1-3 SP), update YOUR OWN plan and properties \u2014 do not create subtasks`,
-    `- Only create subtasks when the work genuinely requires multiple independent pieces (e.g., Pack-tier work, 8+ SP)`,
+    ...context?.isParentTask ? [
+      `### Parent Task Coordination`,
+      `You are a parent task with child tasks. Focus on breaking work into child tasks with detailed plans, not planning implementation for yourself.`,
+      `- Use \`list_subtasks\` to review existing children. Create or update child tasks using \`create_subtask\` / \`update_subtask\`.`,
+      `- Each child task should be a self-contained unit of work with a clear plan.`
+    ] : [
+      `### Self-Update vs Subtasks`,
+      `- If the work fits in a single task (1-3 SP), update YOUR OWN plan and properties \u2014 do not create subtasks`,
+      `- Only create subtasks when the work genuinely requires multiple independent pieces (e.g., Pack-tier work, 8+ SP)`
+    ],
+    ``,
+    `### Subtask Plan Requirements`,
+    `When creating subtasks, each MUST include a detailed \`plan\` field:`,
+    `- Plans should be multi-step implementation guides, not vague descriptions`,
+    `- Include specific file paths, function names, and code patterns to modify`,
+    `- Reference existing implementations when relevant (e.g., "follow the pattern in src/services/foo.ts")`,
+    `- Include testing requirements and acceptance criteria`,
+    `- Set \`storyPointValue\` based on estimated complexity`,
     ``,
-    `### Finishing Planning`,
-    `Once your plan is complete and all required properties are set, call the **ExitPlanMode** tool.`,
+    `### Completing Planning`,
+    `Once ALL checklist items above are done, 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 marks planning as complete`,
-    `- It does NOT start building \u2014 the team controls when to switch to Build mode`
+    `- It does NOT start building \u2014 the team controls when to switch to Build mode`,
+    `- Do NOT call ExitPlanMode until you have thoroughly explored the codebase and saved a detailed plan`
   ];
   if (context) parts.push(...buildPropertyInstructions(context));
   return parts.join("\n");
@@ -1203,6 +1255,22 @@ function buildAutoPrompt(context) {
     `- Once ExitPlanMode succeeds, the system will automatically restart your session in Building mode with the appropriate model`,
     `- You do NOT need to do anything after calling ExitPlanMode \u2014 the transition is handled for you`,
     ``,
+    `### Subtask Plan Requirements`,
+    `When creating subtasks, each MUST include a detailed \`plan\` field:`,
+    `- Plans should be multi-step implementation guides, not vague descriptions`,
+    `- Include specific file paths, function names, and code patterns to modify`,
+    `- Reference existing implementations when relevant`,
+    `- Include testing requirements and acceptance criteria`,
+    `- Set \`storyPointValue\` based on estimated complexity`,
+    ``,
+    ...context?.isParentTask ? [
+      ``,
+      `### Parent Task Guidance`,
+      `You are a parent task. Your plan should define child tasks with detailed plans, not direct implementation steps.`,
+      `After ExitPlanMode, you'll transition to Review mode to coordinate child task execution.`,
+      `Child task status lifecycle: Open \u2192 InProgress \u2192 ReviewPR \u2192 ReviewDev \u2192 Complete.`
+    ] : [],
+    ``,
     `### Autonomous Guidelines:`,
     `- Make decisions independently \u2014 do not ask the team for approval at each step`,
     `- Only escalate when genuinely blocked (ambiguous requirements, missing access, conflicting instructions)`,
@@ -1222,34 +1290,31 @@ function buildModePrompt(agentMode, context) {
         `You are in Building mode \u2014 executing the plan.`,
         `- You have full coding access (read, write, edit, bash, git)`,
         `- 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`
+        ...context?.isParentTask ? [
+          `- You are a parent task. Use \`list_subtasks\`, \`start_child_cloud_build\`, and subtask management tools to coordinate children.`,
+          `- Do NOT implement code directly \u2014 fire child builds and review their work.`,
+          `- Goal: coordinate child task execution and ensure all children complete successfully`
+        ] : [
+          `- If this is a leaf task (no children): execute the plan directly`,
+          `- Goal: implement the plan, run tests, open a PR when done`
+        ]
       ];
       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.`
+          `Your pod starts with minimal resources. You MUST call \`scale_up_resources\``,
+          `BEFORE running any resource-intensive operations \u2014 they WILL fail or OOM at baseline resources:`,
+          `- **setup** \u2014 package installs, basic dev servers, light builds`,
+          `- **build** \u2014 full dev servers, test suites, typecheck, lint, E2E tests`,
+          `Actual CPU/memory values are configured per-project. Scaling is one-way (up only).`,
+          `CRITICAL: Always scale to at least "setup" before running any package install command.`
         );
       }
       return parts.join("\n");
     }
     case "review":
-      return [
-        `
-## Mode: Review`,
-        `You are in Review mode \u2014 reviewing and coordinating.`,
-        `- You have read-only access plus light edit capability (can suggest fixes, run tests, check linting)`,
-        `- For parent tasks: you can manage children, review child PRs, fire next child builds`,
-        `- You have Pack Runner coordination tools (list_subtasks, fire builds, approve PRs)`,
-        `- Goal: ensure quality, provide feedback, coordinate progression`
-      ].join("\n");
+      return buildReviewPrompt(context);
     case "auto":
       return buildAutoPrompt(context);
     case "code-review":
@@ -1258,6 +1323,64 @@ function buildModePrompt(agentMode, context) {
       return null;
   }
 }
+function buildReviewPrompt(context) {
+  const parts = [
+    `
+## Mode: Review`,
+    `You are in Review mode \u2014 reviewing and coordinating.`,
+    `- You have read-only access plus light edit capability (can suggest fixes, run tests, check linting)`,
+    ``
+  ];
+  if (context?.isParentTask) {
+    parts.push(
+      `### Parent Task Review`,
+      `You are reviewing and coordinating child tasks.`,
+      `- Use \`list_subtasks\` to see current child task state and progress.`,
+      `- For children in ReviewPR status: review their code quality and merge with \`approve_and_merge_pr\`.`,
+      `- For children with failing CI: check with \`get_task_cli(childTaskId)\` and escalate if stuck.`,
+      `- Fire next child builds with \`start_child_cloud_build\` when ready.`,
+      `- Create follow-up tasks for issues discovered during review.`,
+      ``,
+      `### Coordination Workflow`,
+      `1. Check child task statuses with \`list_subtasks\``,
+      `2. Review completed children \u2014 check PRs, run tests if needed`,
+      `3. Approve and merge passing PRs`,
+      `4. Fire builds for children that are ready`,
+      `5. Create follow-up tasks for anything out of scope`
+    );
+  } else {
+    parts.push(
+      `### Leaf Task Review`,
+      `You are reviewing your own work before completion.`,
+      `- Run tests and check linting to verify the PR is ready.`,
+      `- If the PR is already open, review the diff for correctness.`,
+      `- You can get hands dirty \u2014 if a fix is small, make it directly.`,
+      `- If follow-up work is needed, use \`create_follow_up_task\`.`
+    );
+  }
+  parts.push(
+    ``,
+    `### General Review Guidelines`,
+    `- For larger issues, create a follow-up task rather than fixing directly.`,
+    `- Focus on correctness, pattern consistency, and test coverage.`,
+    `- Be concise in feedback \u2014 actionable specifics over general observations.`,
+    `- Goal: ensure quality, provide feedback, coordinate progression.`
+  );
+  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");
+}
 function buildCodeReviewPrompt() {
   return [
     `
@@ -1488,6 +1611,7 @@ Your responses are sent directly to the task chat \u2014 the team sees everythin
 }
 
 // src/execution/prompt-builder.ts
+var CHAT_HISTORY_LIMIT = 40;
 function formatFileSize(bytes) {
   if (bytes === void 0) return "";
   if (bytes < 1024) return `${bytes}B`;
@@ -1633,7 +1757,7 @@ function formatTaskFile(file) {
   return [];
 }
 function formatChatHistory(chatHistory) {
-  const relevant = chatHistory.slice(-20);
+  const relevant = chatHistory.slice(-CHAT_HISTORY_LIMIT);
   const parts = [`
 ## Recent Chat Context`];
   for (const msg of relevant) {
@@ -1660,6 +1784,12 @@ async function resolveTaskTagContext(context) {
 async function buildTaskBody(context) {
   const parts = [];
   parts.push(`# Task: ${context.title}`);
+  if (context.projectName) {
+    const descLine = context.projectDescription ? `
+${context.projectDescription}` : "";
+    parts.push(`
+## Project: ${context.projectName}${descLine}`);
+  }
   if (context.description) {
     parts.push(`
 ## Description
@@ -1739,7 +1869,8 @@ CRITICAL: You are in Auto mode. Do NOT report status, ask for confirmation, or g
   if (isPm && context.isParentTask) {
     return [
       `You are the project manager for this task and its subtasks.`,
-      `Use list_subtasks to review the current state of child tasks.`,
+      `Review existing subtasks via \`list_subtasks\` and the chat history before taking action.`,
+      `Read the task description and chat history carefully \u2014 the team may have already provided context and requirements. Respond to what's been discussed rather than starting from scratch.`,
       `The task details are provided above. Wait for the team to provide instructions before taking action.`,
       `When you finish planning, save the plan with update_task and end your turn. Your reply will be visible to the team in chat.`
     ];
@@ -1747,6 +1878,7 @@ CRITICAL: You are in Auto mode. Do NOT report status, ask for confirmation, or g
   if (isPm) {
     return [
       `You are the project manager for this task.`,
+      `Read the task description and chat history carefully \u2014 the team may have already provided context and requirements. Respond to what's been discussed rather than starting from scratch.`,
       `The task details are provided above. Wait for the team to ask questions or provide additional requirements before starting to plan.`,
       `When you finish planning, save the plan with update_task and end your turn. Your reply summarizing the plan will be visible in chat. A separate task agent will execute the plan after review.`
     ];
@@ -2000,7 +2132,11 @@ function buildGetTaskCliTool(connection) {
           taskId: task_id,
           source
         });
-        const formatted = result.map((entry) => `[${entry.time}] [${entry.event.type}] ${formatCliEvent(entry.event)}`).join("\n");
+        const formatted = result.map((entry) => {
+          const type = entry.type;
+          const time = entry.timestamp;
+          return `[${time}] [${type}] ${formatCliEvent(entry)}`;
+        }).join("\n");
         return textResult(formatted || "No CLI logs found.");
       } catch (error) {
         return textResult(
@@ -2248,7 +2384,7 @@ 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", "Hold", "ReviewDev", "Complete"]).describe("The new status for the task"),
+      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.")
     },
     async ({ status, task_id }) => {
@@ -2348,7 +2484,15 @@ Co-Authored-By: Claude Sonnet 4 <noreply@anthropic.com>`;
         return textResult(`Pull request #${result.prNumber} created: ${result.prUrl}`);
       } catch (error) {
         const msg = error instanceof Error ? error.message : "Unknown error";
-        return textResult(`Failed to create pull request: ${msg}`);
+        return textResult(
+          `Failed to create pull request: ${msg}
+
+Troubleshooting:
+- Ensure all changes are committed and pushed to the remote branch
+- Check that the branch exists on the remote (run: git push -u origin HEAD)
+- Verify there isn't already an open PR for this branch
+- If git auth fails, the token may have expired \u2014 retry the operation`
+        );
       }
     }
   );
@@ -2485,9 +2629,9 @@ function buildVoteSuggestionTool(connection) {
 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.",
+    "Scale up the pod's CPU and memory resources. Use before running dev servers, tests, builds, or other resource-intensive operations. Phases: 'setup' (installs, basic dev servers), 'build' (full dev servers, test suites, typecheck, builds). Actual CPU/memory values are configured per-project. Scaling is one-way (up only).",
     {
-      tier: z.enum(["initial", "light", "standard", "heavy"]).describe("The resource tier to scale up to"),
+      tier: z.enum(["initial", "setup", "build"]).describe("The resource phase to scale up to"),
       reason: z.string().optional().describe("Brief reason for scaling (e.g., 'running test suite')")
     },
     async ({ tier, reason }) => {
@@ -2498,13 +2642,8 @@ function buildScaleUpResourcesTool(connection) {
           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}).`
+            `Scaled to ${result.currentTier} phase (${result.cpu}). Was ${result.previousTier}.`
           );
         }
         return textResult(
@@ -2581,14 +2720,15 @@ function buildCreateSubtaskTool(connection) {
       ordinal: z2.number().optional().describe("Step/order number (0-based)"),
       storyPointValue: z2.number().optional().describe(SP_DESCRIPTION)
     },
-    async ({ title, description, plan: _plan, ordinal, storyPointValue }) => {
+    async ({ title, description, plan, ordinal, storyPointValue }) => {
       try {
         const result = await connection.call("createSubtask", {
           sessionId: connection.sessionId,
           title,
-          description,
-          storyPoints: storyPointValue,
-          ordinal
+          ...description !== void 0 && { description },
+          ...plan !== void 0 && { plan },
+          ...storyPointValue !== void 0 && { storyPointValue },
+          ...ordinal !== void 0 && { ordinal }
         });
         return textResult(`Subtask created with ID: ${result.id}`);
       } catch (error) {
@@ -2611,20 +2751,15 @@ function buildUpdateSubtaskTool(connection) {
       ordinal: z2.number().optional(),
       storyPointValue: z2.number().optional().describe(SP_DESCRIPTION)
     },
-    async ({
-      subtaskId,
-      title,
-      description,
-      plan: _plan,
-      ordinal: _ordinal,
-      storyPointValue: _sp
-    }) => {
+    async ({ subtaskId, title, description, plan, storyPointValue }) => {
       try {
         await connection.call("updateSubtask", {
           sessionId: connection.sessionId,
           subtaskId,
-          title,
-          description
+          ...title !== void 0 && { title },
+          ...description !== void 0 && { description },
+          ...plan !== void 0 && { plan },
+          ...storyPointValue !== void 0 && { storyPointValue }
         });
         return textResult("Subtask updated.");
       } catch (error) {
@@ -4207,6 +4342,7 @@ function createConveyorMcpServer(harness, connection, config, context, agentMode
 }
 
 // src/execution/event-handlers.ts
+var logger = createServiceLogger("event-handlers");
 function safeVoid(promise, context) {
   if (promise && typeof promise.catch === "function") {
     promise.catch((err) => {
@@ -4384,6 +4520,7 @@ async function emitResultEvent(event, host, context, startTime, lastAssistantUsa
 }
 function handleRateLimitEvent(event, host) {
   const { rate_limit_info } = event;
+  logger.info("Rate limit event received", { rate_limit_info });
   const status = rate_limit_info.status;
   const utilization = rate_limit_info.utilization ?? (status === "rejected" ? 1 : void 0);
   if (utilization !== void 0 && rate_limit_info.rateLimitType) {
@@ -4601,6 +4738,16 @@ async function processEvents(events, context, host) {
   };
 }
 
+// src/execution/task-property-utils.ts
+function collectMissingProps(taskProps) {
+  const missing = [];
+  if (!taskProps.plan?.trim()) missing.push("plan (save via update_task)");
+  if (!taskProps.storyPointId) missing.push("story points (use update_task_properties)");
+  if (!taskProps.title || taskProps.title === "Untitled")
+    missing.push("title (use update_task_properties)");
+  return missing;
+}
+
 // src/execution/tool-access.ts
 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+\//;
@@ -4690,24 +4837,43 @@ async function handleExitPlanMode(host, input) {
   if (host.hasExitedPlanMode) {
     return { behavior: "allow", updatedInput: input };
   }
+  host.exitPlanAttempts++;
   try {
     host.syncPlanFile();
     const taskProps = await host.connection.getTaskProperties();
-    const missingProps = [];
-    if (!taskProps.plan?.trim()) missingProps.push("plan (save via update_task)");
-    if (!taskProps.storyPointId) missingProps.push("story points (use update_task_properties)");
-    if (!taskProps.title || taskProps.title === "Untitled")
-      missingProps.push("title (use update_task_properties)");
+    const missingProps = collectMissingProps(taskProps);
+    if (host.isParentTask) {
+      try {
+        const subtasks = await host.connection.call("listSubtasks", {
+          sessionId: host.connection.sessionId
+        });
+        const subtasksWithoutPlans = subtasks.filter(
+          (s) => !s.plan?.trim()
+        );
+        if (subtasksWithoutPlans.length > 0) {
+          const names = subtasksWithoutPlans.map((s) => s.title).join(", ");
+          missingProps.push(
+            `subtask plans \u2014 these subtasks are missing plans: ${names} (use update_subtask with plan field)`
+          );
+        }
+      } catch {
+      }
+    }
     if (missingProps.length > 0) {
-      return {
-        behavior: "deny",
-        message: [
-          "Cannot exit plan mode yet. Required task properties are missing:",
-          ...missingProps.map((p) => `- ${p}`),
-          "",
-          "Fill these in using MCP tools, then try ExitPlanMode again."
-        ].join("\n")
-      };
+      if (host.exitPlanAttempts <= 1) {
+        return {
+          behavior: "deny",
+          message: [
+            "Cannot exit plan mode yet. Required task properties are missing:",
+            ...missingProps.map((p) => `- ${p}`),
+            "",
+            "Fill these in using MCP tools, then try ExitPlanMode again."
+          ].join("\n")
+        };
+      }
+      host.connection.postChatMessage(
+        `\u26A0\uFE0F ExitPlanMode allowed with missing properties: ${missingProps.join(", ")}. Consider backfilling these later.`
+      );
     }
     if (host.agentMode === "discovery") {
       host.hasExitedPlanMode = true;
@@ -4812,7 +4978,7 @@ function buildCanUseTool(host) {
 }
 
 // src/execution/query-executor.ts
-var logger = createServiceLogger("QueryExecutor");
+var logger2 = createServiceLogger("QueryExecutor");
 var API_ERROR_PATTERN3 = /API Error: [45]\d\d/;
 var IMAGE_ERROR_PATTERN2 = /Could not process image/i;
 var RETRY_DELAYS_MS = [6e4, 12e4, 18e4, 3e5];
@@ -4832,6 +4998,18 @@ function buildHooks(host) {
                 isError: false
               });
               host.pendingToolOutputs.push(output);
+              if (input.tool_name === "mcp__conveyor__create_pull_request") {
+                try {
+                  const props = await host.connection.getTaskProperties();
+                  const missing = collectMissingProps(props);
+                  if (missing.length > 0) {
+                    host.connection.postChatMessage(
+                      `PR created! Please backfill missing task properties: ${missing.join(", ")}`
+                    );
+                  }
+                } catch {
+                }
+              }
             }
             return await Promise.resolve({ continue: true });
           }
@@ -4893,7 +5071,7 @@ function buildQueryOptions(host, context) {
     disallowedTools: buildDisallowedTools(settings, mode, host.hasExitedPlanMode),
     enableFileCheckpointing: settings.enableFileCheckpointing,
     stderr: (data) => {
-      logger.warn("Claude Code stderr", { data: data.trimEnd() });
+      logger2.warn("Claude Code stderr", { data: data.trimEnd() });
     }
   };
 }
@@ -5203,7 +5381,7 @@ var CostTracker = class {
 };
 
 // src/runner/query-bridge.ts
-var logger2 = createServiceLogger("QueryBridge");
+var logger3 = createServiceLogger("QueryBridge");
 var QueryBridge = class {
   constructor(connection, mode, runnerConfig, callbacks, workspaceDir) {
     this.connection = connection;
@@ -5254,8 +5432,13 @@ var QueryBridge = class {
       await runSdkQuery(host, context, followUpContent);
     } catch (err) {
       const msg = err instanceof Error ? err.message : String(err);
-      logger2.error("Query execution failed", { error: msg });
-      this.connection.sendEvent({ type: "error", message: msg });
+      const isAbort = this._stopped || /abort/i.test(msg);
+      if (isAbort) {
+        logger3.info("Query stopped by user", { error: msg });
+      } else {
+        logger3.error("Query execution failed", { error: msg });
+        this.connection.sendEvent({ type: "error", message: msg });
+      }
     } finally {
       this.mode.pendingModeRestart = false;
     }
@@ -5285,6 +5468,7 @@ var QueryBridge = class {
       set hasExitedPlanMode(val) {
         bridge.mode.hasExitedPlanMode = val;
       },
+      exitPlanAttempts: 0,
       get pendingModeRestart() {
         return bridge.mode.pendingModeRestart;
       },
@@ -5345,9 +5529,11 @@ var SessionRunner = class _SessionRunner {
     this.lifecycle = new Lifecycle(lifecycleConfig, {
       onHeartbeat: () => this.connection.sendHeartbeat(),
       onIdleTimeout: () => {
+        process.stderr.write("[conveyor-agent] Idle timeout reached, entering sleep\n");
         this.connection.emitStatus("sleeping");
       },
       onSleep: () => {
+        process.stderr.write("[conveyor-agent] Sleep mode active\n");
         this.connection.postChatMessage("Agent sleeping \u2014 send a message or click Resume to wake.");
       },
       onSleepGraceExpired: () => {
@@ -5359,6 +5545,7 @@ var SessionRunner = class _SessionRunner {
         }
       },
       onWake: () => {
+        process.stderr.write("[conveyor-agent] Woken from sleep\n");
         this.lifecycle.cancelSleepShutdown();
       }
     });
@@ -5373,7 +5560,7 @@ var SessionRunner = class _SessionRunner {
     return this.stopped;
   }
   // ── Main lifecycle ─────────────────────────────────────────────────
-  // oxlint-disable-next-line max-lines-per-function -- lifecycle orchestration is inherently sequential
+  // oxlint-disable-next-line max-lines-per-function, complexity -- lifecycle orchestration is inherently sequential
   async start() {
     await this.setState("connecting");
     await this.connection.connect();
@@ -5411,6 +5598,9 @@ var SessionRunner = class _SessionRunner {
       await this.shutdown("error");
       return;
     }
+    if (this.fullContext?.baseBranch) {
+      syncWithBaseBranch(this.config.workspaceDir, this.fullContext.baseBranch);
+    }
     this.mode.resolveInitialMode(this.taskContext);
     this.queryBridge = this.createQueryBridge();
     this.logInitialization();
@@ -5460,8 +5650,11 @@ var SessionRunner = class _SessionRunner {
           content: msg.content,
           userId: msg.userId
         });
-        if (this.fullContext && this.queryBridge) {
-          await this.queryBridge.execute(this.fullContext, msg.content);
+        await this.executeQuery(msg.content);
+        if (this.stopped) break;
+        if (this.interrupted) {
+          this.interrupted = false;
+          continue;
         }
         if (!this.stopped && this.pendingMessages.length === 0) {
           await this.maybeSendPRNudge();
@@ -5482,7 +5675,7 @@ var SessionRunner = class _SessionRunner {
     if (effectiveMode === "code-review") {
       await this.setState("running");
       await this.callbacks.onEvent({ type: "execute_mode", mode: effectiveMode });
-      await this.queryBridge?.execute(this.fullContext);
+      await this.executeQuery();
       this.stopped = true;
       return;
     }
@@ -5490,7 +5683,7 @@ var SessionRunner = class _SessionRunner {
     if (shouldRun) {
       await this.setState("running");
       await this.callbacks.onEvent({ type: "execute_mode", mode: effectiveMode });
-      await this.queryBridge?.execute(this.fullContext);
+      await this.executeQuery();
       if (!this.stopped) await this.setState("idle");
     } else {
       await this.setState("idle");
@@ -5519,6 +5712,20 @@ var SessionRunner = class _SessionRunner {
       }
     }
   }
+  // ── Query execution with abort handling ────────────────────────────
+  /** Run queryBridge.execute, swallowing abort errors from stop/softStop. */
+  async executeQuery(followUpContent) {
+    if (!this.fullContext || !this.queryBridge) return;
+    try {
+      await this.queryBridge.execute(this.fullContext, followUpContent);
+    } catch (err) {
+      if (this.interrupted || this.stopped) {
+        process.stderr.write("[conveyor-agent] Query aborted by stop/softStop signal\n");
+        return;
+      }
+      throw err;
+    }
+  }
   // ── Stop / soft-stop ───────────────────────────────────────────────
   stop() {
     this.stopped = true;
@@ -5588,9 +5795,8 @@ var SessionRunner = class _SessionRunner {
       this.connection.postChatMessage(chatMsg);
       await this.setState("running");
       await this.callbacks.onEvent({ type: "pr_nudge", prompt });
-      if (this.fullContext && this.queryBridge) {
-        await this.queryBridge.execute(this.fullContext, prompt);
-      }
+      await this.executeQuery(prompt);
+      if (this.interrupted || this.stopped) return;
       await this.refreshTaskContext();
     }
   }
@@ -5627,6 +5833,8 @@ var SessionRunner = class _SessionRunner {
       model: ctx.model,
       githubBranch: ctx.githubBranch ?? "",
       baseBranch: ctx.baseBranch ?? "",
+      projectName: ctx.projectName ?? null,
+      projectDescription: ctx.projectDescription ?? null,
       githubPRUrl: ctx.githubPRUrl,
       claudeSessionId: ctx.claudeSessionId ?? null,
       isParentTask: !!ctx.parentTaskId,
@@ -5660,6 +5868,10 @@ var SessionRunner = class _SessionRunner {
     );
     bridge.isParentTask = this.fullContext?.isParentTask ?? false;
     bridge.onModeTransition = (newMode) => {
+      const oldMode = this.mode.effectiveMode;
+      process.stderr.write(`[conveyor-agent] Mode transition: ${oldMode} \u2192 ${newMode}
+`);
+      this.connection.sendEvent({ type: "mode_transition", from: oldMode, to: newMode });
       this.mode.pendingModeRestart = true;
       this.connection.emitModeChanged(newMode);
       this.softStop();
@@ -5695,6 +5907,9 @@ var SessionRunner = class _SessionRunner {
     await this.callbacks.onStatusChange(status);
   }
   async shutdown(finalState) {
+    process.stderr.write(`[conveyor-agent] Shutdown: reason=${finalState}
+`);
+    this.connection.sendEvent({ type: "shutdown", reason: finalState });
     this.lifecycle.destroy();
     await this.setState(finalState);
     this.connection.disconnect();
@@ -5702,21 +5917,29 @@ var SessionRunner = class _SessionRunner {
   logInitialization() {
     const context = {
       mode: this.mode.effectiveMode,
-      model: this.taskContext?.model,
       runnerMode: this.config.runnerMode ?? "task",
       sessionId: this.sessionId,
+      // Task context
       isParentTask: this.fullContext?.isParentTask ?? false,
-      status: this.taskContext?.status
+      status: this.taskContext?.status,
+      taskTitle: this.fullContext?.title,
+      hasExistingPR: !!this.fullContext?.githubPRUrl,
+      hasExistingSession: !!this.fullContext?.claudeSessionId,
+      chatHistoryLength: this.fullContext?.chatHistory?.length ?? 0,
+      tagIds: this.fullContext?.taskTagIds ?? [],
+      // Agent config
+      model: this.taskContext?.model,
+      isAuto: this.config.isAuto ?? false
     };
     process.stderr.write(`[conveyor-agent] Initialized: ${JSON.stringify(context)}
 `);
-    this.connection.sendEvent({ type: "initialization", ...context });
+    this.connection.sendEvent({ type: "session_manifest", ...context });
   }
 };
 
 // src/connection/project-connection.ts
 import { io as io2 } from "socket.io-client";
-var logger3 = createServiceLogger("ProjectConnection");
+var logger4 = createServiceLogger("ProjectConnection");
 var EVENT_BATCH_MS2 = 500;
 var ProjectConnection = class {
   socket = null;
@@ -5759,7 +5982,7 @@ var ProjectConnection = class {
       let settled = false;
       let attempts = 0;
       const maxInitialAttempts = 30;
-      logger3.info("Connecting", { apiUrl: this.config.apiUrl, projectId: this.config.projectId });
+      logger4.info("Connecting", { apiUrl: this.config.apiUrl, projectId: this.config.projectId });
       this.socket = io2(this.config.apiUrl, {
         auth: {
           projectToken: this.config.projectToken,
@@ -5779,7 +6002,7 @@ var ProjectConnection = class {
           settled = true;
           resolve2();
         }
-        logger3.info("Connected to API");
+        logger4.info("Connected to API");
       });
       this.socket.on("connect_error", (error) => {
         attempts++;
@@ -5791,10 +6014,10 @@ var ProjectConnection = class {
         }
       });
       this.socket.on("disconnect", (reason) => {
-        logger3.warn("Disconnected from API", { reason });
+        logger4.warn("Disconnected from API", { reason });
       });
       this.socket.io.on("reconnect", () => {
-        logger3.info("Reconnected to API");
+        logger4.info("Reconnected to API");
         for (const cb of this.reconnectCallbacks) cb();
       });
     });
@@ -5941,7 +6164,7 @@ function runStartCommand(cmd, cwd, onOutput) {
 
 // src/runner/commit-watcher.ts
 import { execSync as execSync3 } from "child_process";
-var logger4 = createServiceLogger("CommitWatcher");
+var logger5 = createServiceLogger("CommitWatcher");
 var CommitWatcher = class {
   constructor(config, callbacks) {
     this.config = config;
@@ -5957,7 +6180,7 @@ var CommitWatcher = class {
     this.branch = branch;
     this.lastKnownRemoteSha = this.getLocalHeadSha();
     this.interval = setInterval(() => void this.poll(), this.config.pollIntervalMs);
-    logger4.info("Commit watcher started", {
+    logger5.info("Commit watcher started", {
       branch,
       baseSha: this.lastKnownRemoteSha?.slice(0, 8)
     });
@@ -6022,7 +6245,7 @@ var CommitWatcher = class {
     }
     this.lastKnownRemoteSha = remoteSha;
     this.isSyncing = true;
-    logger4.info("New commits detected", {
+    logger5.info("New commits detected", {
       branch: this.branch,
       commitCount,
       sha: remoteSha.slice(0, 8)
@@ -6038,7 +6261,7 @@ var CommitWatcher = class {
       });
     } catch (err) {
       const msg = err instanceof Error ? err.message : String(err);
-      logger4.error("Error handling new commits", { error: msg });
+      logger5.error("Error handling new commits", { error: msg });
     } finally {
       this.isSyncing = false;
     }
@@ -6275,7 +6498,7 @@ function buildProjectTools(connection) {
 }
 
 // src/runner/project-chat-handler.ts
-var logger5 = createServiceLogger("ProjectChat");
+var logger6 = createServiceLogger("ProjectChat");
 var FALLBACK_MODEL = "claude-sonnet-4-20250514";
 function buildSystemPrompt2(projectDir, agentCtx) {
   const parts = [];
@@ -6322,7 +6545,7 @@ async function fetchContext(connection, chatId) {
       projectId: connection.projectId
     });
   } catch {
-    logger5.warn("Could not fetch agent context, using defaults");
+    logger6.warn("Could not fetch agent context, using defaults");
   }
   let chatHistory = [];
   try {
@@ -6332,7 +6555,7 @@ async function fetchContext(connection, chatId) {
       chatId
     });
   } catch {
-    logger5.warn("Could not fetch chat history, proceeding without it");
+    logger6.warn("Could not fetch chat history, proceeding without it");
   }
   return { agentCtx, chatHistory };
 }
@@ -6450,7 +6673,7 @@ async function handleProjectChatMessage(message, connection, projectDir, session
     return await runChatQuery(message, connection, projectDir, sessionId);
   } catch (error) {
     const msg = error instanceof Error ? error.message : String(error);
-    logger5.error("Failed to handle message", { error: msg });
+    logger6.error("Failed to handle message", { error: msg });
     try {
       await connection.call("postProjectAgentMessage", {
         projectId: connection.projectId,
@@ -6466,7 +6689,7 @@ async function handleProjectChatMessage(message, connection, projectDir, session
 }
 
 // src/runner/project-runner.ts
-var logger6 = createServiceLogger("ProjectRunner");
+var logger7 = createServiceLogger("ProjectRunner");
 var __filename = fileURLToPath(import.meta.url);
 var __dirname = path.dirname(__filename);
 var HEARTBEAT_INTERVAL_MS = 3e4;
@@ -6485,7 +6708,7 @@ function setupWorkDir(projectDir, assignment) {
   }
   if (branch && branch !== devBranch) {
     if (hasUncommittedChanges(workDir)) {
-      logger6.warn("Uncommitted changes, skipping checkout", { taskId: shortId, branch });
+      logger7.warn("Uncommitted changes, skipping checkout", { taskId: shortId, branch });
     } else {
       try {
         execSync5(`git checkout ${branch}`, { cwd: workDir, stdio: "ignore" });
@@ -6493,7 +6716,7 @@ function setupWorkDir(projectDir, assignment) {
         try {
           execSync5(`git checkout -b ${branch}`, { cwd: workDir, stdio: "ignore" });
         } catch {
-          logger6.warn("Could not checkout branch", { taskId: shortId, branch });
+          logger7.warn("Could not checkout branch", { taskId: shortId, branch });
         }
       }
     }
@@ -6509,7 +6732,7 @@ function spawnChildAgent(assignment, workDir) {
   const effectiveAgentMode = agentMode ?? (isAuto ? "auto" : "");
   const effectiveApiUrl = apiUrl || process.env.CONVEYOR_API_URL || "";
   if (!effectiveApiUrl) {
-    logger6.error("No API URL available for child agent", { taskId: taskId.slice(0, 8) });
+    logger7.error("No API URL available for child agent", { taskId: taskId.slice(0, 8) });
   }
   const child = fork(cliPath, [], {
     env: {
@@ -6537,12 +6760,12 @@ function spawnChildAgent(assignment, workDir) {
   const shortId = taskId.slice(0, 8);
   child.stdout?.on("data", (data) => {
     for (const line of data.toString().trimEnd().split("\n")) {
-      logger6.info(line, { taskId: shortId });
+      logger7.info(line, { taskId: shortId });
     }
   });
   child.stderr?.on("data", (data) => {
     for (const line of data.toString().trimEnd().split("\n")) {
-      logger6.info(line, { taskId: shortId });
+      logger7.info(line, { taskId: shortId });
     }
   });
   return child;
@@ -6590,7 +6813,7 @@ var ProjectRunner = class {
       capabilities: ["task", "pm", "code-review", "audit"]
     });
     this.branchSwitchCommand = registration.branchSwitchCommand ?? process.env.CONVEYOR_BRANCH_SWITCH_COMMAND;
-    logger6.info("Registered as project agent", { agentName: registration.agentName });
+    logger7.info("Registered as project agent", { agentName: registration.agentName });
     try {
       await this.executeSetupCommand();
       this.executeStartCommand();
@@ -6601,7 +6824,7 @@ var ProjectRunner = class {
       });
     } catch (error) {
       const msg = error instanceof Error ? error.message : String(error);
-      logger6.error("Environment setup failed", { error: msg });
+      logger7.error("Environment setup failed", { error: msg });
       this.setupComplete = false;
     }
     this.wireEventHandlers();
@@ -6613,7 +6836,7 @@ var ProjectRunner = class {
     if (currentBranch) {
       this.commitWatcher.start(currentBranch);
     }
-    logger6.info("Connected, waiting for task assignments");
+    logger7.info("Connected, waiting for task assignments");
     await new Promise((resolve2) => {
       this.resolveLifecycle = resolve2;
     });
@@ -6621,7 +6844,7 @@ var ProjectRunner = class {
   async stop() {
     if (this.stopping) return;
     this.stopping = true;
-    logger6.info("Shutting down");
+    logger7.info("Shutting down");
     this.commitWatcher.stop();
     await this.killStartCommand();
     if (this.heartbeatTimer) {
@@ -6652,7 +6875,7 @@ var ProjectRunner = class {
     } catch {
     }
     this.connection.disconnect();
-    logger6.info("Shutdown complete");
+    logger7.info("Shutdown complete");
     if (this.resolveLifecycle) {
       this.resolveLifecycle();
       this.resolveLifecycle = null;
@@ -6688,10 +6911,10 @@ var ProjectRunner = class {
         capabilities: ["task", "pm", "code-review", "audit"]
       });
       this.connection.emitStatus(this.activeAgents.size > 0 ? "busy" : "idle");
-      logger6.info("Re-registered after reconnect");
+      logger7.info("Re-registered after reconnect");
     } catch (error) {
       const msg = error instanceof Error ? error.message : String(error);
-      logger6.error("Failed to re-register after reconnect", { error: msg });
+      logger7.error("Failed to re-register after reconnect", { error: msg });
     }
   }
   // ── Tag audit ──────────────────────────────────────────────────────────
@@ -6702,7 +6925,7 @@ var ProjectRunner = class {
       await handleTagAudit(request, this.connection, this.projectDir);
     } catch (error) {
       const msg = error instanceof Error ? error.message : String(error);
-      logger6.error("Tag audit failed", { error: msg, requestId: request.requestId });
+      logger7.error("Tag audit failed", { error: msg, requestId: request.requestId });
       try {
         await this.connection.call("reportTagAuditResult", {
           projectId: this.connection.projectId,
@@ -6721,15 +6944,15 @@ var ProjectRunner = class {
   async killAgent(agent, taskId) {
     const shortId = taskId.slice(0, 8);
     if (agent.process.exitCode !== null) {
-      logger6.info("Agent process already exited", { taskId: shortId });
+      logger7.info("Agent process already exited", { taskId: shortId });
       return;
     }
-    logger6.info("Killing agent process", { taskId: shortId });
+    logger7.info("Killing agent process", { taskId: shortId });
     agent.process.kill("SIGTERM");
     await new Promise((resolve2) => {
       const timer = setTimeout(() => {
         if (agent.process.exitCode === null) {
-          logger6.warn("Agent did not exit after SIGTERM, sending SIGKILL", { taskId: shortId });
+          logger7.warn("Agent did not exit after SIGTERM, sending SIGKILL", { taskId: shortId });
           agent.process.kill("SIGKILL");
         }
         resolve2();
@@ -6748,15 +6971,15 @@ var ProjectRunner = class {
     const existing = this.activeAgents.get(agentKey);
     if (existing) {
       if (existing.process.exitCode === null) {
-        logger6.info("Re-assignment received, killing existing agent", { taskId: shortId });
+        logger7.info("Re-assignment received, killing existing agent", { taskId: shortId });
         await this.killAgent(existing, taskId);
       } else {
-        logger6.info("Stale agent entry (process already exited), cleaning up", { taskId: shortId });
+        logger7.info("Stale agent entry (process already exited), cleaning up", { taskId: shortId });
       }
       this.activeAgents.delete(agentKey);
     }
     if (this.activeAgents.size >= MAX_CONCURRENT) {
-      logger6.warn("Max concurrent agents reached", { maxConcurrent: MAX_CONCURRENT });
+      logger7.warn("Max concurrent agents reached", { maxConcurrent: MAX_CONCURRENT });
       this.connection.emitTaskStopped(taskId, "max_concurrent_reached");
       return;
     }
@@ -6764,9 +6987,12 @@ var ProjectRunner = class {
       try {
         execSync5("git fetch origin", { cwd: this.projectDir, stdio: "ignore" });
       } catch {
-        logger6.warn("Git fetch failed", { taskId: shortId });
+        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,
@@ -6775,12 +7001,12 @@ var ProjectRunner = class {
         usesWorktree
       });
       this.connection.emitTaskStarted(taskId);
-      logger6.info("Started task", { taskId: shortId, mode, workDir });
+      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);
-        logger6.info("Task exited", { taskId: shortId, reason });
+        logger7.info("Task exited", { taskId: shortId, reason });
         if (code === 0 && usesWorktree) {
           try {
             removeWorktree(this.projectDir, taskId);
@@ -6790,7 +7016,7 @@ var ProjectRunner = class {
       });
     } catch (error) {
       const msg = error instanceof Error ? error.message : "Unknown";
-      logger6.error("Failed to start task", { taskId: shortId, error: msg });
+      logger7.error("Failed to start task", { taskId: shortId, error: msg });
       this.connection.emitTaskStopped(taskId, `start_failed: ${msg}`);
     }
   }
@@ -6798,7 +7024,7 @@ var ProjectRunner = class {
     const agentKey = this.activeAgents.has(taskId) ? taskId : `${taskId}:code-review`;
     const agent = this.activeAgents.get(agentKey);
     if (!agent) return;
-    logger6.info("Stopping task", { taskId: taskId.slice(0, 8) });
+    logger7.info("Stopping task", { taskId: taskId.slice(0, 8) });
     void this.killAgent(agent, taskId).then(() => {
       if (agent.usesWorktree) {
         try {
@@ -6815,30 +7041,30 @@ var ProjectRunner = class {
     const currentBranch = this.getCurrentBranch();
     if (currentBranch === workspaceBranch) return;
     if (hasUncommittedChanges(this.projectDir)) {
-      logger6.warn("Uncommitted changes, skipping workspace branch checkout");
+      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" });
-      logger6.info("Checked out workspace branch", { workspaceBranch });
+      logger7.info("Checked out workspace branch", { workspaceBranch });
     } catch {
-      logger6.warn("Failed to checkout workspace branch", { workspaceBranch });
+      logger7.warn("Failed to checkout workspace branch", { workspaceBranch });
     }
   }
   async executeSetupCommand() {
     const cmd = process.env.CONVEYOR_SETUP_COMMAND;
     if (!cmd) return;
-    logger6.info("Running setup command", { command: cmd });
+    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);
       });
-      logger6.info("Setup command completed");
+      logger7.info("Setup command completed");
     } catch (error) {
       const msg = error instanceof Error ? error.message : "Setup command failed";
-      logger6.error("Setup command failed", { error: msg });
+      logger7.error("Setup command failed", { error: msg });
       this.connection.sendEvent({ type: "setup_error", message: msg });
       throw error;
     }
@@ -6846,7 +7072,7 @@ var ProjectRunner = class {
   executeStartCommand() {
     const cmd = process.env.CONVEYOR_START_COMMAND;
     if (!cmd) return;
-    logger6.info("Running start command", { command: cmd });
+    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);
@@ -6856,13 +7082,13 @@ var ProjectRunner = class {
     child.on("exit", (code, signal) => {
       this.startCommandRunning = false;
       this.startCommandChild = null;
-      logger6.info("Start command exited", { code, signal });
+      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;
-      logger6.error("Start command error", { error: err.message });
+      logger7.error("Start command error", { error: err.message });
     });
   }
   async killStartCommand() {
@@ -6905,7 +7131,7 @@ var ProjectRunner = class {
       try {
         execSync5("git fetch origin", { cwd: this.projectDir, stdio: "pipe" });
       } catch {
-        logger6.warn("Git fetch failed during branch switch");
+        logger7.warn("Git fetch failed during branch switch");
       }
       detachWorktreeBranch(this.projectDir, data.branch);
       try {
@@ -6918,7 +7144,7 @@ var ProjectRunner = class {
       try {
         execSync5(`git pull origin ${data.branch}`, { cwd: this.projectDir, stdio: "pipe" });
       } catch {
-        logger6.warn("Git pull failed during branch switch");
+        logger7.warn("Git pull failed during branch switch");
       }
       if (data.syncAfter !== false) {
         await this.handleSyncEnvironment();
@@ -6927,7 +7153,7 @@ var ProjectRunner = class {
       callback({ ok: true });
     } catch (err) {
       const msg = err instanceof Error ? err.message : "Branch switch failed";
-      logger6.error("Branch switch failed", { error: msg });
+      logger7.error("Branch switch failed", { error: msg });
       callback({ ok: false, error: msg });
     }
   }
@@ -6942,14 +7168,14 @@ var ProjectRunner = class {
           });
         } catch (err) {
           const msg = err instanceof Error ? err.message : "Sync command failed";
-          logger6.error("Branch switch sync command failed", { error: msg });
+          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";
-      logger6.error("Environment sync failed", { error: msg });
+      logger7.error("Environment sync failed", { error: msg });
       callback?.({ ok: false, error: msg });
     }
   }
@@ -6974,7 +7200,7 @@ var ProjectRunner = class {
       setupComplete: this.setupComplete,
       startCommandRunning: this.startCommandRunning
     });
-    logger6.info("Commit sync complete", { steps: stepsRun.join(", ") });
+    logger7.info("Commit sync complete", { steps: stepsRun.join(", ") });
   }
   async smartSync(previousSha, newSha, branch) {
     if (hasUncommittedChanges(this.projectDir)) {
@@ -6993,7 +7219,7 @@ var ProjectRunner = class {
       });
     } catch (err) {
       const msg = err instanceof Error ? err.message : "Pull failed";
-      logger6.error("Git pull failed during commit sync", { error: msg });
+      logger7.error("Git pull failed during commit sync", { error: msg });
       this.executeStartCommand();
       return ["error:pull"];
     }
@@ -7020,7 +7246,7 @@ var ProjectRunner = class {
         stepsRun.push("branchSwitchCommand");
       } catch (err) {
         const msg = err instanceof Error ? err.message : "Sync command failed";
-        logger6.error("Branch switch command failed", { error: msg });
+        logger7.error("Branch switch command failed", { error: msg });
       }
     } else if (!cmd) {
       this.runIndividualSyncSteps(needsInstall, needsPrisma, stepsRun);
@@ -7033,7 +7259,7 @@ var ProjectRunner = class {
         stepsRun.push("install");
       } catch (err) {
         const msg = err instanceof Error ? err.message : "Install failed";
-        logger6.error("bun install failed", { error: msg });
+        logger7.error("bun install failed", { error: msg });
       }
     }
     if (needsPrisma) {
@@ -7047,7 +7273,7 @@ var ProjectRunner = class {
         stepsRun.push("prisma");
       } catch (err) {
         const msg = err instanceof Error ? err.message : "Prisma sync failed";
-        logger6.error("Prisma sync failed", { error: msg });
+        logger7.error("Prisma sync failed", { error: msg });
       }
     }
   }
@@ -7063,6 +7289,33 @@ var ProjectRunner = class {
   }
 };
 
+// src/setup/config.ts
+import { readFile as readFile2 } from "fs/promises";
+import { join as join3 } from "path";
+var DEVCONTAINER_PATH = ".devcontainer/conveyor/devcontainer.json";
+async function loadForwardPorts(workspaceDir) {
+  try {
+    const raw = await readFile2(join3(workspaceDir, DEVCONTAINER_PATH), "utf-8");
+    const parsed = JSON.parse(raw);
+    return parsed.forwardPorts ?? [];
+  } catch {
+    return [];
+  }
+}
+function loadConveyorConfig() {
+  const envSetup = process.env.CONVEYOR_SETUP_COMMAND;
+  const envStart = process.env.CONVEYOR_START_COMMAND;
+  const envPort = process.env.CONVEYOR_PREVIEW_PORT;
+  if (envSetup || envStart) {
+    return {
+      setupCommand: envSetup,
+      startCommand: envStart,
+      previewPort: envPort ? Number(envPort) : void 0
+    };
+  }
+  return null;
+}
+
 export {
   AgentConnection,
   ModeController,
@@ -7085,6 +7338,8 @@ export {
   ensureWorktree,
   detachWorktreeBranch,
   removeWorktree,
-  ProjectRunner
+  ProjectRunner,
+  loadForwardPorts,
+  loadConveyorConfig
 };
-//# sourceMappingURL=chunk-L7ZH423N.js.map
+//# sourceMappingURL=chunk-FCRGYU2M.js.map