poe-code 3.0.26 → 3.0.28

package/dist/index.js

@@ -352,16 +352,16 @@ function getConfigFormat(pathOrFormat) {
   }
   return formatRegistry[formatName];
 }
-function detectFormat(path16) {
-  const ext = getExtension(path16);
+function detectFormat(path17) {
+  const ext = getExtension(path17);
   return extensionMap[ext];
 }
-function getExtension(path16) {
-  const lastDot = path16.lastIndexOf(".");
+function getExtension(path17) {
+  const lastDot = path17.lastIndexOf(".");
   if (lastDot === -1) {
     return "";
   }
-  return path16.slice(lastDot).toLowerCase();
+  return path17.slice(lastDot).toLowerCase();
 }
 var formatRegistry, extensionMap;
 var init_formats = __esm({
@@ -1255,38 +1255,38 @@ import { createTwoFilesPatch } from "diff";
 import chalk from "chalk";
 function createDryRunFileSystem(base, recorder) {
   const proxy = {
-    async readFile(path16, encoding) {
+    async readFile(path17, encoding) {
       if (encoding) {
-        return base.readFile(path16, encoding);
+        return base.readFile(path17, encoding);
       }
-      return base.readFile(path16);
+      return base.readFile(path17);
     },
-    async writeFile(path16, data, options) {
-      const previousContent = await tryReadText(base, path16);
+    async writeFile(path17, data, options) {
+      const previousContent = await tryReadText(base, path17);
       const nextContent = formatData(data, options?.encoding);
       recorder.record({
         type: "writeFile",
-        path: path16,
+        path: path17,
         nextContent,
         previousContent
       });
     },
-    async mkdir(path16, options) {
-      recorder.record({ type: "mkdir", path: path16, options });
+    async mkdir(path17, options) {
+      recorder.record({ type: "mkdir", path: path17, options });
     },
-    async stat(path16) {
-      return base.stat(path16);
+    async stat(path17) {
+      return base.stat(path17);
     },
-    async unlink(path16) {
-      recorder.record({ type: "unlink", path: path16 });
+    async unlink(path17) {
+      recorder.record({ type: "unlink", path: path17 });
     },
-    async readdir(path16) {
-      return base.readdir(path16);
+    async readdir(path17) {
+      return base.readdir(path17);
     }
   };
   if (typeof base.rm === "function") {
-    proxy.rm = async (path16, options) => {
-      recorder.record({ type: "rm", path: path16, options });
+    proxy.rm = async (path17, options) => {
+      recorder.record({ type: "rm", path: path17, options });
     };
   }
   if (typeof base.copyFile === "function") {
@@ -1376,8 +1376,8 @@ function describeWriteChange(previous, next) {
   }
   return "update";
 }
-function renderWriteCommand(path16, change) {
-  const command = `cat > ${path16}`;
+function renderWriteCommand(path17, change) {
+  const command = `cat > ${path17}`;
   if (change === "create") {
     return renderOperationCommand(command, chalk.green, "# create");
   }
@@ -1539,9 +1539,9 @@ function redactTomlLine(line) {
   }
   return line;
 }
-async function tryReadText(base, path16) {
+async function tryReadText(base, path17) {
   try {
-    return await base.readFile(path16, "utf8");
+    return await base.readFile(path17, "utf8");
   } catch (error2) {
     if (isNotFound(error2)) {
       return null;
@@ -1597,7 +1597,7 @@ var init_constants = __esm({
   "src/cli/constants.ts"() {
     "use strict";
     FRONTIER_MODELS = [
-      "anthropic/claude-opus-4.5",
+      "anthropic/claude-opus-4.6",
       "anthropic/claude-sonnet-4.5",
       "openai/gpt-5.2",
       "google/gemini-3-pro"
@@ -1610,7 +1610,7 @@ var init_constants = __esm({
     CLAUDE_CODE_VARIANTS = {
       haiku: "anthropic/claude-haiku-4.5",
       sonnet: "anthropic/claude-sonnet-4.5",
-      opus: "anthropic/claude-opus-4.5"
+      opus: "anthropic/claude-opus-4.6"
     };
     DEFAULT_CLAUDE_CODE_MODEL = CLAUDE_CODE_VARIANTS.opus;
     CODEX_MODELS = [
@@ -5438,8 +5438,8 @@ var require_utils = __commonJS({
       }
       return ind;
     }
-    function removeDotSegments(path16) {
-      let input = path16;
+    function removeDotSegments(path17) {
+      let input = path17;
       const output = [];
       let nextSlash = -1;
       let len = 0;
@@ -5638,8 +5638,8 @@ var require_schemes = __commonJS({
         wsComponent.secure = void 0;
       }
       if (wsComponent.resourceName) {
-        const [path16, query] = wsComponent.resourceName.split("?");
-        wsComponent.path = path16 && path16 !== "/" ? path16 : void 0;
+        const [path17, query] = wsComponent.resourceName.split("?");
+        wsComponent.path = path17 && path17 !== "/" ? path17 : void 0;
         wsComponent.query = query;
         wsComponent.resourceName = void 0;
       }
@@ -14691,10 +14691,17 @@ var require_dist = __commonJS({
   }
 });
 
+// src/templates/ralph/PROMPT_worktree_merge.md
+var require_PROMPT_worktree_merge = __commonJS({
+  "src/templates/ralph/PROMPT_worktree_merge.md"(exports, module) {
+    module.exports = "# Worktree Merge\n\nYou are an autonomous coding agent. Your task is to merge worktree `{{WORKTREE_NAME}}` into `{{BASE_BRANCH}}`.\n\n## Worktree\n\n| Key | Value |\n|-----|-------|\n| Path | `{{WORKTREE_PATH}}` |\n| Branch | `{{WORKTREE_BRANCH}}` |\n| Base branch | `{{BASE_BRANCH}}` |\n| Main cwd | `{{MAIN_CWD}}` |\n| Plan file | `{{PLAN_PATH}}` |\n| Story ID | `{{STORY_ID}}` |\n\n## Steps\n\n1. Understand what the worktree branch changed \u2014 read the plan file (if present), inspect `git log` and `git diff` in the worktree.\n2. `cd {{WORKTREE_PATH}}` and `git rebase {{BASE_BRANCH}}`. Resolve any conflicts preserving both sides' intent.\n3. Run the quality gates from the plan file (if present), otherwise run the project's default test/lint commands.\n4. `cd {{MAIN_CWD}}` and `git merge --ff-only {{WORKTREE_BRANCH}}`.\n5. `git worktree remove {{WORKTREE_PATH}}` and `git branch -D {{WORKTREE_BRANCH}}`.\n\nIf the rebase fails or conflicts cannot be resolved, run `git rebase --abort` and exit with a non-zero status.\n";
+  }
+});
+
 // src/templates/ralph/PROMPT_PARTIAL_plan.md
 var require_PROMPT_PARTIAL_plan = __commonJS({
   "src/templates/ralph/PROMPT_PARTIAL_plan.md"(exports, module) {
-    module.exports = "# Plan Generation\n\nYou are an agent that generates a Ralph PRD file (YAML) based on a user request. Your ONLY output is a plan file \u2014 do NOT write or modify any code. Follow these phases in order. Keep each phase tight\u2014write only what's needed to move forward.\n\n---\n\n## Phase 1: Understand\n\nBefore touching code, understand the problem and the codebase.\n\n- **Read first.** Never propose changes to code you haven't read. Search for existing patterns, utilities, and conventions.\n- **Ask why.** What problem does this solve? Why now? What happens if we don't do it?\n- **Challenge assumptions.** Question the framing. Restate the problem in your own words.\n- **Visualize.** Use ASCII diagrams for architecture, data flow, state machines\u2014whenever structure aids clarity.\n- **Surface unknowns.** What could go wrong? What don't we know yet? What needs investigation?\n\nStay here until the problem shape is clear. Don't rush to solutions.\n\n---\n\n## Phase 2: Propose\n\nEstablish scope and intent. Write a short proposal:\n\n- **Why**: 1-2 sentences. The problem or opportunity.\n- **What changes**: Bullet list of concrete changes. Be specific.\n- **Impact**: What code, APIs, systems, or users are affected.\n\nKeep it to half a page. Focus on the \"why\" not the \"how.\"\n\n---\n\n## Phase 3: Specify\n\nDefine **what** the system should do in testable terms.\n\nFor each new or changed behavior, write requirements:\n\n```\n### Requirement: <name>\n<Description using precise language \u2014 SHALL, MUST for normative statements>\n\n#### Scenario: <name>\n- WHEN <condition>\n- THEN <expected outcome>\n```\n\nRules:\n\n- Every requirement needs at least one scenario.\n- Scenarios are test cases. If you can't write a scenario, the requirement isn't clear enough.\n- For modifications to existing behavior, state the full updated requirement, not just the diff.\n\n---\n\n## Phase 4: Design\n\nExplain **how** you'll build it. Only include this for non-trivial changes (cross-cutting, new dependencies, architectural decisions, ambiguity worth resolving upfront).\n\n- **Context**: Current state, constraints.\n- **Goals / Non-goals**: What's in scope and what's explicitly out.\n- **Decisions**: Key technical choices. For each: what you chose, what you rejected, and why.\n- **Risks / Trade-offs**: What could go wrong \u2192 how you'll mitigate it.\n\nFocus on architecture and approach. Don't describe every line of code.\n\n---\n\n## Phase 5: Tasks\n\nBreak the work into stories and write the plan YAML file.\n\n### YAML Structure\n\n- Create (or overwrite) the file at the output path.\n- The file must be valid YAML.\n- Use this structure (minimum):\n  - version: 1\n  - project: <short name>\n  - overview: <1-3 paragraphs \u2014 include the proposal from Phase 2 and key design decisions from Phase 4>\n  - goals: [ ... ]\n  - nonGoals: [ ... ]\n  - qualityGates:\n    - npm run test\n    - npm run lint\n  - requirements: [ ... ] (from Phase 3, each with scenarios)\n  - stories: [ ... ]\n\n### Stories\n\n- Stories should be actionable, small, and testable. Keep it to one story per atomic feature.\n- Each story must include:\n  - id: \"US-###\" (sequential, starting at US-001)\n  - title\n  - status: open\n  - dependsOn: [] (or list of story IDs)\n  - description: \"As a user, I want ...\"\n  - acceptanceCriteria: [\"...\", \"...\"] (derived from Phase 3 scenarios)\n\n---\n\n## Validation\n\nAfter writing the plan file, validate it by running:\n\n```\npoe-code ralph agent validate-plan --plan <output-path>\n```\n\nIf validation fails, fix the errors and re-validate until the plan passes.\n\n## Done Signal\n\nAfter the plan is validated, print a single line confirming the path, e.g.:\n\n```\nWrote plan to <output-path>\n\nRun `poe-code ralph build`\n\n```\n";
+    module.exports = "# Plan Generation\n\nYou are an agent that generates a plan file (YAML) based on a user request. Your ONLY output is a plan file \u2014 do NOT write or modify any code.\n\nYou MUST follow these phases in the order and make sure that you communicate to user.\n\nKeep each phase concise only what's needed to move forward.\n\n---\n\n## Phase 1: Understand\n\nBefore touching code, understand the problem and the codebase.\n\n- **Read first.** Never propose changes to code you haven't read. Search for existing patterns, utilities, and conventions.\n- **Ask why.** What problem does this solve? Why now? What happens if we don't do it?\n- **Challenge assumptions.** Question the framing. Restate the problem in your own words.\n- **Visualize.** Use ASCII diagrams for architecture, data flow, state machines\u2014whenever structure aids clarity.\n- **Surface unknowns.** What could go wrong? What don't we know yet? What needs investigation?\n\nStay here until the problem shape is clear. Don't rush to solutions.\n\n---\n\n## Phase 2: Propose\n\nEstablish scope and intent. Write a short proposal:\n\n- **Why**: 1-2 sentences. The problem or opportunity.\n- **What changes**: Bullet list of concrete changes. Be specific.\n- **Impact**: What code, APIs, systems, or users are affected.\n\nKeep it to half a page. Focus on the \"why\" not the \"how.\"\n\n---\n\n## Phase 3: Specify\n\nDefine **what** the system should do in testable terms.\n\nFor each new or changed behavior, write requirements:\n\n```\n### Requirement: <name>\n<Description using precise language \u2014 SHALL, MUST for normative statements>\n\n#### Scenario: <name>\n- WHEN <condition>\n- THEN <expected outcome>\n```\n\nRules:\n\n- Every requirement needs at least one scenario.\n- Scenarios are test cases. If you can't write a scenario, the requirement isn't clear enough.\n- For modifications to existing behavior, state the full updated requirement, not just the diff.\n\n---\n\n## Phase 4: Design\n\nExplain **how** you'll build it. Only include this for non-trivial changes (cross-cutting, new dependencies, architectural decisions, ambiguity worth resolving upfront).\n\n- **Context**: Current state, constraints.\n- **Goals / Non-goals**: What's in scope and what's explicitly out.\n- **Decisions**: Key technical choices. For each: what you chose, what you rejected, and why.\n- **Risks / Trade-offs**: What could go wrong \u2192 how you'll mitigate it.\n\nFocus on architecture and approach. Don't describe every line of code.\n\n---\n\n## Phase 5: Tasks\n\nBreak the work into stories and write the plan YAML file.\n\n### YAML Structure\n\n- Create (or overwrite) the file at the output path.\n- The file must be valid YAML.\n- Use this structure (minimum):\n  - version: 1\n  - project: <short name>\n  - overview: <1-3 paragraphs \u2014 include the proposal from Phase 2 and key design decisions from Phase 4>\n  - goals: [ ... ]\n  - nonGoals: [ ... ]\n  - qualityGates:\n    - npm run test\n    - npm run lint\n  - requirements: [ ... ] (from Phase 3, each with scenarios)\n  - stories: [ ... ]\n\n### Stories\n\n- Stories should be actionable, small, and testable. Keep it to one story per atomic feature.\n- Each story must include:\n  - id: \"US-###\" (sequential, starting at US-001)\n  - title\n  - status: open\n  - dependsOn: [] (or list of story IDs)\n  - description: \"As a user, I want ...\"\n  - acceptanceCriteria: [\"...\", \"...\"] (derived from Phase 3 scenarios)\n\n---\n\n## Validation\n\nAfter writing the plan file, validate it by running:\n\n```\npoe-code ralph agent validate-plan --plan <output-path>\n```\n\nIf validation fails, fix the errors and re-validate until the plan passes.\n\n## Done Signal\n\nAfter the plan is validated, print a single line confirming the path, e.g.:\n\n```\nWrote plan to <output-path>\n\nRun `poe-code ralph build`\n\n```\n";
   }
 });
 
@@ -16508,21 +16515,21 @@ async function* adaptClaude(lines) {
         if (blockType !== "tool_result") continue;
         const kind = toolKindsById.get(item.tool_use_id);
         toolKindsById.delete(item.tool_use_id);
-        let path16 = "";
+        let path17 = "";
         if (typeof item.content === "string") {
-          path16 = item.content;
+          path17 = item.content;
         } else {
           try {
-            path16 = JSON.stringify(item.content);
+            path17 = JSON.stringify(item.content);
           } catch {
-            path16 = String(item.content);
+            path17 = String(item.content);
           }
         }
         yield {
           event: "tool_complete",
           id: item.tool_use_id,
           kind,
-          path: path16
+          path: path17
         };
       }
     }
@@ -16617,10 +16624,10 @@ async function* adaptCodex(lines) {
         const kindFromStart = toolKindById.get(item.id);
         const kind = kindFromStart ?? (itemType === "command_execution" ? "exec" : itemType === "file_edit" ? "edit" : "other");
         const titleFromEvent = isNonEmptyString(item.path) ? item.path : itemType === "mcp_tool_call" ? `${isNonEmptyString(item.server) ? item.server : "unknown"}.${isNonEmptyString(item.tool) ? item.tool : "unknown"}` : void 0;
-        const path16 = titleFromEvent ?? toolTitleById.get(item.id) ?? "";
+        const path17 = titleFromEvent ?? toolTitleById.get(item.id) ?? "";
         toolTitleById.delete(item.id);
         toolKindById.delete(item.id);
-        yield { event: "tool_complete", id: item.id, kind, path: path16 };
+        yield { event: "tool_complete", id: item.id, kind, path: path17 };
       }
     }
   }
@@ -18336,21 +18343,21 @@ function createSdkContainer(options) {
   });
   loggerFactory.setErrorLogger(errorLogger);
   const asyncFs = {
-    readFile: ((path16, encoding) => {
+    readFile: ((path17, encoding) => {
       if (encoding) {
-        return fs2.readFile(path16, encoding);
+        return fs2.readFile(path17, encoding);
       }
-      return fs2.readFile(path16);
+      return fs2.readFile(path17);
     }),
-    writeFile: (path16, data, opts) => fs2.writeFile(path16, data, opts),
-    mkdir: (path16, opts) => fs2.mkdir(path16, opts).then(() => {
+    writeFile: (path17, data, opts) => fs2.writeFile(path17, data, opts),
+    mkdir: (path17, opts) => fs2.mkdir(path17, opts).then(() => {
     }),
-    stat: (path16) => fs2.stat(path16),
-    rm: (path16, opts) => fs2.rm(path16, opts),
-    unlink: (path16) => fs2.unlink(path16),
-    readdir: (path16) => fs2.readdir(path16),
+    stat: (path17) => fs2.stat(path17),
+    rm: (path17, opts) => fs2.rm(path17, opts),
+    unlink: (path17) => fs2.unlink(path17),
+    readdir: (path17) => fs2.readdir(path17),
     copyFile: (src, dest) => fs2.copyFile(src, dest),
-    chmod: (path16, mode) => fs2.chmod(path16, mode)
+    chmod: (path17, mode) => fs2.chmod(path17, mode)
   };
   const contextFactory = createCommandContextFactory({ fs: asyncFs });
   const noopPrompts = async () => {
@@ -20766,8 +20773,8 @@ function getErrorMap() {
 
 // node_modules/zod/v3/helpers/parseUtil.js
 var makeIssue = (params) => {
-  const { data, path: path16, errorMaps, issueData } = params;
-  const fullPath = [...path16, ...issueData.path || []];
+  const { data, path: path17, errorMaps, issueData } = params;
+  const fullPath = [...path17, ...issueData.path || []];
   const fullIssue = {
     ...issueData,
     path: fullPath
@@ -20882,11 +20889,11 @@ var errorUtil;
 
 // node_modules/zod/v3/types.js
 var ParseInputLazyPath = class {
-  constructor(parent, value, path16, key) {
+  constructor(parent, value, path17, key) {
     this._cachedPath = [];
     this.parent = parent;
     this.data = value;
-    this._path = path16;
+    this._path = path17;
     this._key = key;
   }
   get path() {
@@ -24530,10 +24537,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path16) {
-  if (!path16)
+function getElementAtPath(obj, path17) {
+  if (!path17)
     return obj;
-  return path16.reduce((acc, key) => acc?.[key], obj);
+  return path17.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -24916,11 +24923,11 @@ function aborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path16, issues) {
+function prefixIssues(path17, issues) {
   return issues.map((iss) => {
     var _a2;
     (_a2 = iss).path ?? (_a2.path = []);
-    iss.path.unshift(path16);
+    iss.path.unshift(path17);
     return iss;
   });
 }
@@ -33891,7 +33898,7 @@ async function displayVersion(container, currentVersion) {
 }
 
 // src/cli/commands/ralph.ts
-import path15 from "node:path";
+import path16 from "node:path";
 
 // packages/ralph/src/build/loop.ts
 import { basename as basename2, dirname as dirname6, resolve as resolvePath2 } from "node:path";
@@ -34046,6 +34053,28 @@ async function createWorktree(opts) {
   return entry;
 }
 
+// packages/worktree/src/list.ts
+async function listWorktrees(cwd, registryFile, deps) {
+  const registry2 = await readRegistry(registryFile, deps.fs);
+  const gitOutput = await deps.exec("git worktree list --porcelain", {
+    cwd
+  });
+  const gitPaths = parseGitWorktreeList(gitOutput.stdout);
+  return registry2.worktrees.map((entry) => ({
+    ...entry,
+    gitExists: gitPaths.has(entry.path)
+  }));
+}
+function parseGitWorktreeList(output) {
+  const paths = /* @__PURE__ */ new Set();
+  for (const line of output.split("\n")) {
+    if (line.startsWith("worktree ")) {
+      paths.add(line.slice("worktree ".length));
+    }
+  }
+  return paths;
+}
+
 // packages/ralph/src/completion/detector.ts
 function detectCompletion(output) {
   return output.includes("<promise>COMPLETE</promise>");
@@ -34120,13 +34149,13 @@ function getDirtyFiles(cwd) {
   for (const line of lines) {
     if (!line) continue;
     if (line.length < 4) continue;
-    let path16 = line.slice(3).trim();
+    let path17 = line.slice(3).trim();
     const renameArrow = " -> ";
-    const arrowIndex = path16.lastIndexOf(renameArrow);
+    const arrowIndex = path17.lastIndexOf(renameArrow);
     if (arrowIndex >= 0) {
-      path16 = path16.slice(arrowIndex + renameArrow.length).trim();
+      path17 = path17.slice(arrowIndex + renameArrow.length).trim();
     }
-    if (path16) files.push(path16);
+    if (path17) files.push(path17);
   }
   return files;
 }
@@ -34269,17 +34298,17 @@ function serializePlan(prd) {
   return yaml.endsWith("\n") ? yaml : `${yaml}
 `;
 }
-function lockPlanFile(path16) {
-  return lockFile(path16, { retries: 20, minTimeout: 25, maxTimeout: 250 });
+function lockPlanFile(path17) {
+  return lockFile(path17, { retries: 20, minTimeout: 25, maxTimeout: 250 });
 }
-async function writePlan(path16, prd, options = {}) {
+async function writePlan(path17, prd, options = {}) {
   const fs3 = options.fs ?? fsPromises2;
   const lock = options.lock ?? lockPlanFile;
-  await fs3.mkdir(dirname3(path16), { recursive: true });
-  const release = await lock(path16);
+  await fs3.mkdir(dirname3(path17), { recursive: true });
+  const release = await lock(path17);
   try {
     const yaml = serializePlan(prd);
-    await fs3.writeFile(path16, yaml, { encoding: "utf8" });
+    await fs3.writeFile(path17, yaml, { encoding: "utf8" });
   } finally {
     await release();
   }
@@ -34351,8 +34380,8 @@ function selectStory(prd, options = {}) {
 // packages/ralph/src/story/updater.ts
 import { dirname as dirname4 } from "node:path";
 import * as fsPromises3 from "node:fs/promises";
-function lockPlanFile2(path16) {
-  return lockFile(path16, { retries: 20, minTimeout: 25, maxTimeout: 250 });
+function lockPlanFile2(path17) {
+  return lockFile(path17, { retries: 20, minTimeout: 25, maxTimeout: 250 });
 }
 function assertStoryStatus(value) {
   if (value === "open") return;
@@ -34425,9 +34454,9 @@ function appendSection(lines, title, items, options) {
   }
   lines.push("");
 }
-async function writeRunMeta(path16, metadata, options = {}) {
+async function writeRunMeta(path17, metadata, options = {}) {
   const fs3 = options.fs ?? fsPromises4;
-  await fs3.mkdir(dirname5(path16), { recursive: true });
+  await fs3.mkdir(dirname5(path17), { recursive: true });
   const lines = [];
   lines.push("# Ralph Run Summary", "");
   lines.push(`- Run ID: ${metadata.runId}`);
@@ -34456,7 +34485,7 @@ async function writeRunMeta(path16, metadata, options = {}) {
   const git = metadata.git ?? null;
   if (!git) {
     lines.push("");
-    await fs3.writeFile(path16, lines.join("\n"), { encoding: "utf8" });
+    await fs3.writeFile(path17, lines.join("\n"), { encoding: "utf8" });
     return;
   }
   lines.push("", "## Git");
@@ -34471,7 +34500,7 @@ async function writeRunMeta(path16, metadata, options = {}) {
     lines.push("");
   } else {
     lines.push("");
-    await fs3.writeFile(path16, lines.join("\n"), { encoding: "utf8" });
+    await fs3.writeFile(path17, lines.join("\n"), { encoding: "utf8" });
     return;
   }
   if (git.commits !== void 0 && git.commits !== null) {
@@ -34491,7 +34520,7 @@ async function writeRunMeta(path16, metadata, options = {}) {
   appendSection(lines, "### Uncommitted Changes", git.dirtyFiles, {
     emptyLabel: "(none)"
   });
-  await fs3.writeFile(path16, lines.join("\n"), { encoding: "utf8" });
+  await fs3.writeFile(path17, lines.join("\n"), { encoding: "utf8" });
 }
 
 // packages/ralph/src/build/overbaking.ts
@@ -34564,9 +34593,9 @@ async function defaultStreamingSpawn(agentId, options) {
     exitCode: result.exitCode
   };
 }
-function absPath(cwd, path16) {
-  if (!path16) return resolvePath2(cwd);
-  return path16.startsWith("/") ? path16 : resolvePath2(cwd, path16);
+function absPath(cwd, path17) {
+  if (!path17) return resolvePath2(cwd);
+  return path17.startsWith("/") ? path17 : resolvePath2(cwd, path17);
 }
 function pad2(value) {
   return value < 10 ? `0${value}` : String(value);
@@ -34616,8 +34645,8 @@ async function appendToErrorsLog(fs3, errorsLogPath, message) {
   await fs3.mkdir(dirname6(errorsLogPath), { recursive: true });
   await fs3.writeFile(errorsLogPath, `${previous}${next}`, { encoding: "utf8" });
 }
-function lockPlanFile3(path16) {
-  return lockFile(path16, { retries: 20, minTimeout: 25, maxTimeout: 250 });
+function lockPlanFile3(path17) {
+  return lockFile(path17, { retries: 20, minTimeout: 25, maxTimeout: 250 });
 }
 function getCurrentBranch(cwd) {
   try {
@@ -34773,7 +34802,7 @@ async function buildLoop(options) {
       });
       worktreeBranch = entry.branch;
       const worktreePath = entry.path;
-      const symlinkFn = fs3.symlink ?? ((target, path16) => fsPromises5.symlink(target, path16));
+      const symlinkFn = fs3.symlink ?? ((target, path17) => fsPromises5.symlink(target, path17));
       const exec = worktreeDeps.exec;
       const dirsToLink = [".poe-code-ralph", ".agents/poe-code-ralph"];
       for (const dir of dirsToLink) {
@@ -35194,27 +35223,27 @@ function formatTimestamp2(date4) {
   const seconds = pad22(date4.getSeconds());
   return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
 }
-function validateLogPath(path16) {
-  if (typeof path16 !== "string" || path16.trim().length === 0) {
+function validateLogPath(path17) {
+  if (typeof path17 !== "string" || path17.trim().length === 0) {
     throw new Error(
-      `Invalid activity log path: expected a non-empty string, got ${String(path16)}`
+      `Invalid activity log path: expected a non-empty string, got ${String(path17)}`
     );
   }
-  if (path16.includes("\0")) {
+  if (path17.includes("\0")) {
     throw new Error("Invalid activity log path: contains null byte");
   }
 }
-async function logActivity(path16, message, options = {}) {
-  validateLogPath(path16);
+async function logActivity(path17, message, options = {}) {
+  validateLogPath(path17);
   const fs3 = options.fs ?? fsPromises8;
-  const parent = dirname7(path16);
+  const parent = dirname7(path17);
   if (parent && parent !== ".") {
     await fs3.mkdir(parent, { recursive: true });
   }
   const entry = `[${formatTimestamp2(/* @__PURE__ */ new Date())}] ${message}
 `;
   try {
-    await fs3.appendFile(path16, entry, { encoding: "utf8" });
+    await fs3.appendFile(path17, entry, { encoding: "utf8" });
   } catch (error2) {
     const detail = error2 instanceof Error ? error2.message : `Unknown error: ${String(error2)}`;
     throw new Error(`Failed to append activity log entry: ${detail}`);
@@ -35332,6 +35361,76 @@ async function ralphBuild(options) {
 // src/cli/commands/ralph.ts
 init_src();
 init_shared();
+
+// src/cli/commands/ralph-worktree.ts
+import path15 from "node:path";
+import { execSync as execSync3 } from "node:child_process";
+init_src();
+function registerRalphWorktreeCommand(ralph, container) {
+  ralph.command("worktree").description("Merge a completed worktree back into the main branch.").argument("<name>", "Name of the worktree to merge").option("--agent <name>", "Agent to use for the merge").action(async function(name) {
+    const cwd = container.env.cwd;
+    const registryFile = path15.join(cwd, ".poe-code-ralph", "worktrees.yaml");
+    const worktrees = await listWorktrees(cwd, registryFile, {
+      fs: {
+        readFile: (p, enc) => container.fs.readFile(p, enc),
+        writeFile: (p, data, opts) => container.fs.writeFile(p, data, opts),
+        mkdir: (p, opts) => container.fs.mkdir(p, opts)
+      },
+      exec: (command, opts) => Promise.resolve({
+        stdout: execSync3(command, {
+          cwd: opts?.cwd,
+          encoding: "utf8",
+          stdio: ["ignore", "pipe", "pipe"]
+        }),
+        stderr: ""
+      })
+    });
+    const entry = worktrees.find((w) => w.name === name);
+    if (!entry) {
+      throw new ValidationError(`Worktree "${name}" not found in registry.`);
+    }
+    if (entry.status !== "done" && entry.status !== "failed") {
+      throw new ValidationError(
+        `Worktree "${name}" has status "${entry.status}" and is not mergeable. Only "done" or "failed" worktrees can be merged.`
+      );
+    }
+    if (!entry.gitExists) {
+      throw new ValidationError(
+        `Worktree directory does not exist for "${name}". It may have been manually removed.`
+      );
+    }
+    const options = this.opts();
+    const { default: mergeTemplate } = await Promise.resolve().then(() => __toESM(require_PROMPT_worktree_merge(), 1));
+    const renderedPrompt = renderTemplate(mergeTemplate, {
+      WORKTREE_NAME: entry.name,
+      WORKTREE_PATH: entry.path,
+      WORKTREE_BRANCH: entry.branch,
+      BASE_BRANCH: entry.baseBranch,
+      MAIN_CWD: cwd,
+      PLAN_PATH: entry.planPath ?? "",
+      STORY_ID: entry.storyId ?? ""
+    });
+    const agent = options.agent?.trim() || entry.agent;
+    const result = await spawnInteractive(agent, {
+      prompt: renderedPrompt,
+      cwd
+    });
+    const fsAdapter2 = {
+      readFile: (p, enc) => container.fs.readFile(p, enc),
+      writeFile: (p, data, opts) => container.fs.writeFile(p, data, opts),
+      mkdir: (p, opts) => container.fs.mkdir(p, opts)
+    };
+    if (result.exitCode === 0) {
+      await updateWorktreeStatus(registryFile, entry.name, "done", { fs: fsAdapter2 });
+      log2.success(`Worktree "${entry.name}" merged successfully.`);
+    } else {
+      await updateWorktreeStatus(registryFile, entry.name, "failed", { fs: fsAdapter2 });
+      log2.error(`Agent exited with code ${result.exitCode}. Worktree "${entry.name}" marked as failed.`);
+    }
+  });
+}
+
+// src/cli/commands/ralph.ts
 var templateImports2 = {
   promptPartialPlan: () => Promise.resolve().then(() => __toESM(require_PROMPT_PARTIAL_plan(), 1)),
   skillPlan: () => Promise.resolve().then(() => __toESM(require_SKILL_plan(), 1)),
@@ -35415,7 +35514,7 @@ async function writeFileOrSkip(args) {
     args.logger.info(`Skip: ${args.displayPath} (already exists)`);
     return "skipped";
   }
-  await args.fs.mkdir(path15.dirname(args.filePath), { recursive: true });
+  await args.fs.mkdir(path16.dirname(args.filePath), { recursive: true });
   await args.fs.writeFile(args.filePath, args.contents, { encoding: "utf8" });
   args.logger.info(`${exists ? "Overwrite" : "Create"}: ${args.displayPath}`);
   return "written";
@@ -35451,12 +35550,12 @@ async function installRalphTemplates(args) {
     const promptPlanContents = templates.promptPlan.replace("{{{PROMPT_PARTIAL_PLAN}}}", templates.promptPartialPlan);
     const templateWrites = [
       {
-        targetPath: path15.join(cwd, ".agents", "poe-code-ralph", "PROMPT_plan.md"),
+        targetPath: path16.join(cwd, ".agents", "poe-code-ralph", "PROMPT_plan.md"),
         displayPath: ".agents/poe-code-ralph/PROMPT_plan.md",
         contents: promptPlanContents
       },
       {
-        targetPath: path15.join(cwd, ".agents", "poe-code-ralph", "PROMPT_build.md"),
+        targetPath: path16.join(cwd, ".agents", "poe-code-ralph", "PROMPT_build.md"),
         displayPath: ".agents/poe-code-ralph/PROMPT_build.md",
         contents: templates.promptBuild
       }
@@ -35474,22 +35573,22 @@ async function installRalphTemplates(args) {
     const stateFiles = [
       {
         contents: templates.stateProgress,
-        targetPath: path15.join(cwd, ".poe-code-ralph", "progress.md"),
+        targetPath: path16.join(cwd, ".poe-code-ralph", "progress.md"),
         displayPath: ".poe-code-ralph/progress.md"
       },
       {
         contents: templates.stateGuardrails,
-        targetPath: path15.join(cwd, ".poe-code-ralph", "guardrails.md"),
+        targetPath: path16.join(cwd, ".poe-code-ralph", "guardrails.md"),
         displayPath: ".poe-code-ralph/guardrails.md"
       },
       {
         contents: templates.stateErrors,
-        targetPath: path15.join(cwd, ".poe-code-ralph", "errors.log"),
+        targetPath: path16.join(cwd, ".poe-code-ralph", "errors.log"),
         displayPath: ".poe-code-ralph/errors.log"
       },
       {
         contents: templates.stateActivity,
-        targetPath: path15.join(cwd, ".poe-code-ralph", "activity.log"),
+        targetPath: path16.join(cwd, ".poe-code-ralph", "activity.log"),
         displayPath: ".poe-code-ralph/activity.log"
       }
     ];
@@ -35533,7 +35632,7 @@ function registerRalphCommand(program, container) {
       throw new ValidationError(message2);
     }
     const rawPath = options.activityLog?.trim() || configActivityLogPath || ".poe-code-ralph/activity.log";
-    const resolvedPath = path15.isAbsolute(rawPath) ? rawPath : path15.resolve(container.env.cwd, rawPath);
+    const resolvedPath = path16.isAbsolute(rawPath) ? rawPath : path16.resolve(container.env.cwd, rawPath);
     await logActivity(resolvedPath, trimmedMessage, {
       fs: container.fs
     });
@@ -35545,7 +35644,7 @@ function registerRalphCommand(program, container) {
     if (!planPath) {
       throw new ValidationError("--plan <path> is required.");
     }
-    const resolvedPath = path15.isAbsolute(planPath) ? planPath : path15.resolve(cwd, planPath);
+    const resolvedPath = path16.isAbsolute(planPath) ? planPath : path16.resolve(cwd, planPath);
     let content;
     try {
       content = await container.fs.readFile(resolvedPath, "utf8");
@@ -35669,7 +35768,7 @@ function registerRalphCommand(program, container) {
       if (worktree) resources.logger.info(`Worktree:   ${worktree.name ?? "(auto)"}`);
       try {
         const planContent = await container.fs.readFile(
-          path15.resolve(cwd, planPath),
+          path16.resolve(cwd, planPath),
           "utf8"
         );
         const plan = parsePlan(planContent);
@@ -35700,6 +35799,7 @@ function registerRalphCommand(program, container) {
       resources.context.finalize();
     }
   });
+  registerRalphWorktreeCommand(ralph, container);
   ralph.command("plan").description("Generate a plan file via an agent.").option("--out <path>", "Output path for generated plan YAML").argument("[request]", "Inline plan request").action(async function() {
     throw new ValidationError(
       "Interactive planning is not yet available. Create your plan YAML manually or use the poe-code-ralph-plan skill inside your agent."