nightralph 0.0.2 → 0.0.4

package/README.md

@@ -6,13 +6,15 @@
 [![license](https://img.shields.io/badge/license-Big_Time-blue?style=flat-square)](LICENSE)
 
 This is a minimal Node-based AI orchestrator. It reads local markdown tickets
-or remote Github issues produced by
+produced by
 [`to-tickets` skill](https://github.com/mattpocock/skills/blob/main/skills/engineering/to-tickets/SKILL.md),
-resolves their dependency graph, and runs agents in parallel as much as possible,
-honoring the ticket dependencies.
+resolves their dependency graph, and runs agents in parallel,
+honoring ticket dependencies. During setup you can choose a GitHub issue
+tracker, which installs skill instructions that use `gh` CLI conventions,
+but the ticket source is always local markdown files.
 
 This is inspired by [nightshift](https://github.com/Shaurya-Sethi/nightshift/).
-I made it because I noticed that the API in `nightshift` had already drifted
+I made it because I noticed the API in `nightshift` had already drifted
 from the skill definitions. This module bundles its skill dependencies,
 so they can't drift as long as you install the skills with this package.
 (See [the section on the `setup` command](#install-dependency-skills).)
@@ -24,6 +26,12 @@ so they can't drift as long as you install the skills with this package.
 - [Workflow](#workflow)
   * [Create Issues](#create-issues)
   * [Execute Tasks with `nightralph`](#execute-tasks-with-nightralph)
+- [How It Works](#how-it-works)
+  * [Select a ticket](#select-a-ticket)
+  * [Worktrees](#worktrees)
+  * [Progress](#progress)
+- [Keep Your Machine Awake](#keep-your-machine-awake)
+  * [Mac OS](#mac-os)
 
 <!-- tocstop -->
 
@@ -35,7 +43,11 @@ npm i -S nightralph
 
 ### Install Dependency Skills
 
-Use a subcommand in this package to add the required
+```sh
+npx nightralph setup
+```
+
+Use the `setup` subcommand in this package to add the required
 [Pocock skills](https://github.com/mattpocock/skills) to your repo.
 This command will copy some files in this package to a specific directory
 in your repo. The upstream
@@ -43,11 +55,6 @@ in your repo. The upstream
 skill is exposed as `/grill`, along with its sub-skills `grilling`
 and `domain-modeling`.
 
-
-```sh
-npx nightralph setup
-```
-
 The Pocock skills are bundled with this git repo, at `./skills`.
 They are cloned with some metadata, visible in
 [skill/upstream.json](skills/upstream.json).
@@ -56,24 +63,30 @@ That's how we prevent skill vs API drift.
 
 ## Workflow
 
-First create issues.
-
-This package bundles the skill files with the CLI, to
-**prevent version drift**. After installing this package,
-use [the `npx` command](#install-dependency-skills) to add the required
-skills to your local `./claude/skills/` folder or `./agents.skills/` folder.
-
-### Create Issues
-
-Use the `to-tickets` skill to create issues in local markdown files.
-
 **The expected flow is**
 
 ```
 grill -> to-spec -> to-tickets -> tdd
 ```
 
-The `nightralph` CLI does the `tdd` part.
+>
+> [!NOTE]  
+> The `grill` step can be changed to something else. Output from step 1
+> needs to be a prose description.
+>
+
+First create issues.
+
+After installing this package, use
+[the `npx nightralph setup` command](#install-dependency-skills)
+to add the required skills to your local `.agents/skills/` folder.
+
+### Create Issues
+
+Use the `to-tickets` skill to create issues in local markdown files from
+a prose text description.
+
+The `nightralph` CLI does the `tdd` part of the workflow.
 
 >
 > [!NOTE]  
@@ -93,7 +106,7 @@ The `nightralph` CLI does the `tdd` part.
 
 ### Execute Tasks with `nightralph`
 
-After you have the tickets, you can use the `nightralph` loop to execute.
+After you have the tickets, use the `nightralph` loop to execute.
 The `to-tickets` skill produces markdown files at
 `.scratch/<feature>/issues/<NN>-<slug>.md`, with task dependency info.
 
@@ -102,28 +115,32 @@ The `to-tickets` skill produces markdown files at
 npx nightralph claude -m claude-opus-4-6
 
 # Dry run to inspect the dependency graph and prompt
-npx nightralph claude --dry-run
+npx nightralph codex --dry-run
 
-# Explicit paths (skips auto-discovery)
-npx nightralph claude -m claude-opus-4-6 \
-  --dir .scratch/my-feature/issues \
-  --spec .scratch/my-feature/spec.md
+# Specify a feature by name
+npx nightralph claude -m claude-opus-4-6 --spec my-feature
 ```
 
+#### `--spec <name>` option
+
+A feature name that resolves to `.scratch/<name>/`.
+The spec file is `.scratch/<name>/spec.md` and the issues directory
+is `.scratch/<name>/issues/`.
+
 Flags:
 
 | Flag | Required | Default | Description |
 |------|----------|---------|-------------|
 | `<provider>` | yes | -- | Agent CLI to spawn (e.g. `claude`, `codex`) |
 | `-m`, `--model` | no | -- | Model flag passed to the agent |
-| `--dir` | no | auto | Path to the issues directory |
-| `--spec` | no | auto | Path to the spec file |
+| `--spec` | no | auto | Feature name (resolves `.scratch/<name>/`) |
 | `--dry-run` | no | -- | Show wave order and prompt without running |
-| `--timeout-secs` | no | `300` | Kill agent after N seconds |
+| `-X` | no | -- | Stop on merge conflict instead of re-spawning |
+| `--timeout` | no | `300` | Kill agent after N seconds |
 
 Notes:
 
-* When `--dir` and `--spec` are omitted, the CLI looks for
+* When `--spec` is omitted, the CLI looks for
   `.scratch/<feature>/issues/` directories. If multiple features exist,
   **it prompts you to pick one** with an interactive selector.
 * Tickets are selected by `**Status:** ready-for-agent` in the file body.
@@ -131,7 +148,69 @@ Notes:
   skips tickets whose blockers haven't completed.
 * Unblocked tickets run in parallel. After a wave finishes, newly unblocked
   tickets start in the next wave.
-* On success (agent exit 0), the ticket's status is updated to `done`
-  in-place. Failed tickets keep their status and block dependents.
+* An agent run only counts as a success when the agent exits 0,
+  its worktree branch has new commits relative to the base branch,
+  and the worktree is clean (no uncommitted changes). On success,
+  the ticket's status is updated to `done` in-place. If the agent
+  exits 0 but made no commits or left uncommitted changes, the
+  ticket is left `ready-for-agent` for a retry. Failed tickets
+  (non-zero exit) keep their status and block dependents.
 * Agent logs are written to `<dir>/../logs/<ticket>.log`.
+* Provider commands are launched non-interactively with default flags
+  that grant the agent write access to the worktree, so tickets can
+  actually be implemented without a permission prompt:
+  * `claude`: `--print --dangerously-skip-permissions`
+  * `codex`: `exec --full-auto`
+
+
+## How It Works
+
+All currently eligible tickets are grouped into a
+"wave" and run in parallel. Each ticket gets a worktree named after the
+ticket slug.
+
+When the wave finishes, every agent that exited successfully has its ticket
+marked `done`, which unlocks dependency tickets, which are grouped into the
+next wave. This continues until all tickets are complete.
+
+
+### Select a ticket
+
+* Build a ticket dependency graph with the `Blocked by:` fields
+* A ticket is eligible for execution when its status is `ready-for-agent` and
+  every ticket listed in its `Blocked by:` field is completed.
+
+
+### Worktrees
+
+Each ticket gets its own git worktree. Agents work in
+isolation so parallel tickets never conflict on disk. After a wave
+completes, successful branches are merged back into the base branch.
+The first branch merges directly, and subsequent branches rebase
+onto the updated base before merging.
+
+If a merge conflict occurs, the behavior depends on the `-X` flag: by
+default the agent is re-spawned to resolve it; with `-X`,
+the run stops immediately.
+
+### Progress
+
+A file `progress.md` is written to the `.scratch/<feature>/` directory
+and committed after each ticket completes, so you can monitor the run from
+another terminal by reading the file.
+
+
+---
+
+## Keep Your Machine Awake
+
+This is expected to run for a long time, like overnight.
+
+### Mac OS
+
+```sh
+caffeinate -i npx nightralph claude -m claude-opus-4-6
+```
 
+That command will prevent your machine from sleeping, but the display can still
+go dark.

package/dist/index.js

@@ -10,13 +10,17 @@ import { setup, checkGhAuth } from "./setup.js";
 import {
   scanTickets,
   dryRun,
-  runWaves
+  dryRunIsolated,
+  runWaves,
+  runWavesIsolated
 } from "./orchestrator.js";
 import {
   findFeatureDirs,
-  resolveIssuesDir
+  resolveIssuesDir,
+  getScriptDir
 } from "./resolve.js";
-const scriptDir = dirname(process.argv[1]);
+import { getRepoRoot, getRepoName } from "./worktree.js";
+const scriptDir = getScriptDir(import.meta.url);
 yargs(hideBin(process.argv)).scriptName("nightralph").usage("$0 <command>").command(
   "setup",
   "Install bundled skills and doc templates",
@@ -71,35 +75,55 @@ yargs(hideBin(process.argv)).scriptName("nightralph").usage("$0 <command>").comm
     alias: "model",
     type: "string",
     describe: "Model passed to the agent"
-  }).option("dir", {
-    type: "string",
-    describe: "Path to the issues directory"
   }).option("spec", {
     type: "string",
-    describe: "Path to the spec file"
+    describe: "Feature name (resolves .scratch/<name>/)"
   }).option("dry-run", {
     type: "boolean",
     describe: "Show wave order without running",
     default: false
-  }).option("timeout-secs", {
+  }).option("timeout", {
     type: "number",
     describe: "Kill agent after N seconds",
     default: 300
+  }).option("X", {
+    type: "boolean",
+    describe: "Stop on merge conflict instead of re-spawning",
+    default: false
   }),
   async (argv) => {
     await runExecute({
       provider: argv.provider,
       model: argv.model,
-      dir: argv.dir,
       spec: argv.spec,
       dryRun: argv.dryRun,
-      timeoutSecs: argv.timeoutSecs
+      timeout: argv.timeout,
+      stopOnConflict: argv.X
     });
   }
 ).strict().demandCommand(1, "Specify a command or provider").help().parse();
+function isGitRepo() {
+  try {
+    getRepoRoot();
+    return true;
+  } catch {
+    return false;
+  }
+}
+__name(isGitRepo, "isGitRepo");
+function extractFeatureName(spec) {
+  const parts = spec.split(
+    /[\\/]/
+  );
+  const scratchIndex = parts.indexOf(".scratch");
+  if (scratchIndex >= 0 && scratchIndex < parts.length - 1) {
+    return parts[scratchIndex + 1];
+  }
+  return parts[parts.length - 2] ?? parts[parts.length - 1] ?? "feature";
+}
+__name(extractFeatureName, "extractFeatureName");
 async function runExecute(argv) {
   const { dir, spec } = await resolveIssuesDir(
-    argv.dir,
     argv.spec
   );
   if (!existsSync(dir)) {
@@ -131,20 +155,54 @@ async function runExecute(argv) {
       (b) => knownNums.has(b)
     );
   }
+  const logsDir = join(dirname(dir), "logs");
+  const timeout = argv.timeout ?? 300;
+  const featureName = extractFeatureName(spec);
+  const conflictStrategy = argv.stopOnConflict ? "stop" : "respawn";
+  const progressPath = join(
+    dirname(dir),
+    "progress.md"
+  );
   if (argv.dryRun) {
-    dryRun(tickets, specBody);
+    if (isGitRepo()) {
+      const repoName = getRepoName();
+      dryRunIsolated({
+        tickets,
+        specBody,
+        repoName,
+        conflictStrategy,
+        progressPath
+      });
+    } else {
+      dryRun(tickets, specBody);
+    }
     return;
   }
-  const logsDir = join(dirname(dir), "logs");
-  const timeoutSecs = argv.timeoutSecs ?? 300;
-  await runWaves(
-    tickets,
-    specBody,
-    argv.provider,
-    argv.model ?? null,
-    timeoutSecs,
-    logsDir
-  );
+  let result;
+  if (isGitRepo()) {
+    result = await runWavesIsolated({
+      tickets,
+      specBody,
+      agentCmd: argv.provider,
+      model: argv.model ?? null,
+      timeout,
+      logsDir,
+      featureName,
+      conflictStrategy
+    });
+  } else {
+    result = await runWaves(
+      tickets,
+      specBody,
+      argv.provider,
+      argv.model ?? null,
+      timeout,
+      logsDir
+    );
+  }
+  if (!result.allDone) {
+    process.exit(1);
+  }
 }
 __name(runExecute, "runExecute");
 export {

package/dist/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/index.ts"],
-  "sourcesContent": ["#!/usr/bin/env node\n\nimport { existsSync, readFileSync } from 'node:fs'\nimport { dirname, join } from 'node:path'\nimport yargs from 'yargs'\nimport { hideBin } from 'yargs/helpers'\nimport { select } from '@inquirer/prompts'\nimport { setup, checkGhAuth, type TrackerKind } from './setup.js'\nimport {\n    scanTickets,\n    dryRun,\n    runWaves,\n} from './orchestrator.js'\nimport {\n    findFeatureDirs,\n    resolveIssuesDir,\n} from './resolve.js'\n\nexport { findFeatureDirs, resolveIssuesDir }\n\nconst scriptDir = dirname(process.argv[1])\n\nyargs(hideBin(process.argv))\n    .scriptName('nightralph')\n    .usage('$0 <command>')\n    .command(\n        'setup',\n        'Install bundled skills and doc templates',\n        y => y.option('claude', {\n            type:'boolean',\n            describe:'Also create .claude/skills/ symlinks',\n            default:false,\n        }),\n        async argv => {\n            const tracker = await select<TrackerKind>({\n                message:'Issue tracker format',\n                choices:[\n                    {\n                        name:'Local Markdown',\n                        value:'local' as const,\n                        description:'Issues as .md files in ' +\n                            '.scratch/',\n                    },\n                    {\n                        name:'GitHub Issues',\n                        value:'github' as const,\n                        description:'Issues via gh CLI',\n                    },\n                ],\n            })\n\n            if (tracker === 'github') {\n                if (!checkGhAuth()) {\n                    console.error(\n                        'GitHub Issues requires the gh CLI, ' +\n                        'authenticated.\\n' +\n                        'Install: https://cli.github.com\\n' +\n                        'Then run: gh auth login'\n                    )\n                    process.exit(2)\n                }\n            }\n\n            setup({\n                bundledSkillsDir:join(scriptDir, 'skills'),\n                docsTemplatesDir:join(\n                    scriptDir, 'docs-templates'\n                ),\n                projectDir:process.cwd(),\n                claude:argv.claude,\n                tracker,\n            })\n        }\n    )\n    .command(\n        '$0 <provider>',\n        'Execute tickets with the given provider',\n        y => y\n            .positional('provider', {\n                type:'string',\n                describe:'Agent CLI to spawn (e.g. claude, codex)',\n                demandOption:true,\n            })\n            .option('m', {\n                alias:'model',\n                type:'string',\n                describe:'Model passed to the agent',\n            })\n            .option('dir', {\n                type:'string',\n                describe:'Path to the issues directory',\n            })\n            .option('spec', {\n                type:'string',\n                describe:'Path to the spec file',\n            })\n            .option('dry-run', {\n                type:'boolean',\n                describe:'Show wave order without running',\n                default:false,\n            })\n            .option('timeout-secs', {\n                type:'number',\n                describe:'Kill agent after N seconds',\n                default:300,\n            }),\n        async argv => {\n            await runExecute({\n                provider:argv.provider as string,\n                model:argv.model as string|undefined,\n                dir:argv.dir as string|undefined,\n                spec:argv.spec as string|undefined,\n                dryRun:argv.dryRun as boolean|undefined,\n                timeoutSecs:argv.timeoutSecs as\n                    number|undefined,\n            })\n        }\n    )\n    .strict()\n    .demandCommand(1, 'Specify a command or provider')\n    .help()\n    .parse()\n\nasync function runExecute (argv:{\n    provider:string\n    model?:string\n    dir?:string\n    spec?:string\n    dryRun?:boolean\n    timeoutSecs?:number\n}):Promise<void> {\n    const { dir, spec } = await resolveIssuesDir(\n        argv.dir, argv.spec\n    )\n\n    if (!existsSync(dir)) {\n        console.error(`Directory not found: ${dir}`)\n        process.exit(2)\n    }\n    if (!existsSync(spec)) {\n        console.error(`Spec file not found: ${spec}`)\n        process.exit(2)\n    }\n\n    const specBody = readFileSync(spec, 'utf8')\n    const tickets = scanTickets(dir)\n\n    if (tickets.length === 0) {\n        console.log('No ticket files found. Exiting.')\n        return\n    }\n\n    console.log(`Found ${tickets.length} tickets`)\n\n    const knownNums = new Set(tickets.map(t => t.num))\n    for (const t of tickets) {\n        const unknown = t.blockers.filter(\n            b => !knownNums.has(b)\n        )\n        if (unknown.length > 0) {\n            console.warn(\n                `${t.filename}: blockers ` +\n                `[${unknown.join(', ')}] ` +\n                'not found in directory'\n            )\n        }\n        t.blockers = t.blockers.filter(\n            b => knownNums.has(b)\n        )\n    }\n\n    if (argv.dryRun) {\n        dryRun(tickets, specBody)\n        return\n    }\n\n    const logsDir = join(dirname(dir), 'logs')\n    const timeoutSecs = argv.timeoutSecs ?? 300\n    await runWaves(\n        tickets, specBody,\n        argv.provider, argv.model ?? null, timeoutSecs,\n        logsDir,\n    )\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["#!/usr/bin/env node\n\nimport { existsSync, readFileSync } from 'node:fs'\nimport { dirname, join } from 'node:path'\nimport yargs from 'yargs'\nimport { hideBin } from 'yargs/helpers'\nimport { select } from '@inquirer/prompts'\nimport { setup, checkGhAuth, type TrackerKind } from './setup.js'\nimport {\n    scanTickets,\n    dryRun,\n    dryRunIsolated,\n    runWaves,\n    runWavesIsolated,\n} from './orchestrator.js'\nimport {\n    findFeatureDirs,\n    resolveIssuesDir,\n    getScriptDir,\n} from './resolve.js'\nimport { getRepoRoot, getRepoName } from './worktree.js'\n\nexport { findFeatureDirs, resolveIssuesDir }\n\nconst scriptDir = getScriptDir(import.meta.url)\n\nyargs(hideBin(process.argv))\n    .scriptName('nightralph')\n    .usage('$0 <command>')\n    .command(\n        'setup',\n        'Install bundled skills and doc templates',\n        y => y.option('claude', {\n            type:'boolean',\n            describe:'Also create .claude/skills/ symlinks',\n            default:false,\n        }),\n        async argv => {\n            const tracker = await select<TrackerKind>({\n                message:'Issue tracker format',\n                choices:[\n                    {\n                        name:'Local Markdown',\n                        value:'local' as const,\n                        description:'Issues as .md files in ' +\n                            '.scratch/',\n                    },\n                    {\n                        name:'GitHub Issues',\n                        value:'github' as const,\n                        description:'Issues via gh CLI',\n                    },\n                ],\n            })\n\n            if (tracker === 'github') {\n                if (!checkGhAuth()) {\n                    console.error(\n                        'GitHub Issues requires the gh CLI, ' +\n                        'authenticated.\\n' +\n                        'Install: https://cli.github.com\\n' +\n                        'Then run: gh auth login'\n                    )\n                    process.exit(2)\n                }\n            }\n\n            setup({\n                bundledSkillsDir:join(scriptDir, 'skills'),\n                docsTemplatesDir:join(\n                    scriptDir, 'docs-templates'\n                ),\n                projectDir:process.cwd(),\n                claude:argv.claude,\n                tracker,\n            })\n        }\n    )\n    .command(\n        '$0 <provider>',\n        'Execute tickets with the given provider',\n        y => y\n            .positional('provider', {\n                type:'string',\n                describe:'Agent CLI to spawn (e.g. claude, codex)',\n                demandOption:true,\n            })\n            .option('m', {\n                alias:'model',\n                type:'string',\n                describe:'Model passed to the agent',\n            })\n            .option('spec', {\n                type:'string',\n                describe:'Feature name ' +\n                    '(resolves .scratch/<name>/)',\n            })\n            .option('dry-run', {\n                type:'boolean',\n                describe:'Show wave order without running',\n                default:false,\n            })\n            .option('timeout', {\n                type:'number',\n                describe:'Kill agent after N seconds',\n                default:300,\n            })\n            .option('X', {\n                type:'boolean',\n                describe:'Stop on merge conflict instead of ' +\n                    're-spawning',\n                default:false,\n            }),\n        async argv => {\n            await runExecute({\n                provider:argv.provider as string,\n                model:argv.model as string|undefined,\n                spec:argv.spec as string|undefined,\n                dryRun:argv.dryRun as boolean|undefined,\n                timeout:argv.timeout as\n                    number|undefined,\n                stopOnConflict:argv.X as\n                    boolean|undefined,\n            })\n        }\n    )\n    .strict()\n    .demandCommand(1, 'Specify a command or provider')\n    .help()\n    .parse()\n\nfunction isGitRepo ():boolean {\n    try {\n        getRepoRoot()\n        return true\n    } catch {\n        return false\n    }\n}\n\nfunction extractFeatureName (spec:string):string {\n    const parts = spec.split(\n        /[\\\\/]/\n    )\n    const scratchIndex = parts.indexOf('.scratch')\n    if (scratchIndex >= 0 && scratchIndex < parts.length - 1) {\n        return parts[scratchIndex + 1]\n    }\n    return parts[parts.length - 2] ??\n        parts[parts.length - 1] ?? 'feature'\n}\n\nasync function runExecute (argv:{\n    provider:string\n    model?:string\n    spec?:string\n    dryRun?:boolean\n    timeout?:number\n    stopOnConflict?:boolean\n}):Promise<void> {\n    const { dir, spec } = await resolveIssuesDir(\n        argv.spec\n    )\n\n    if (!existsSync(dir)) {\n        console.error(`Directory not found: ${dir}`)\n        process.exit(2)\n    }\n    if (!existsSync(spec)) {\n        console.error(`Spec file not found: ${spec}`)\n        process.exit(2)\n    }\n\n    const specBody = readFileSync(spec, 'utf8')\n    const tickets = scanTickets(dir)\n\n    if (tickets.length === 0) {\n        console.log('No ticket files found. Exiting.')\n        return\n    }\n\n    console.log(`Found ${tickets.length} tickets`)\n\n    const knownNums = new Set(tickets.map(t => t.num))\n    for (const t of tickets) {\n        const unknown = t.blockers.filter(\n            b => !knownNums.has(b)\n        )\n        if (unknown.length > 0) {\n            console.warn(\n                `${t.filename}: blockers ` +\n                `[${unknown.join(', ')}] ` +\n                'not found in directory'\n            )\n        }\n        t.blockers = t.blockers.filter(\n            b => knownNums.has(b)\n        )\n    }\n\n    const logsDir = join(dirname(dir), 'logs')\n    const timeout = argv.timeout ?? 300\n    const featureName = extractFeatureName(spec)\n    const conflictStrategy = argv.stopOnConflict ?\n        'stop' :\n        'respawn'\n    const progressPath = join(\n        dirname(dir), 'progress.md'\n    )\n\n    if (argv.dryRun) {\n        if (isGitRepo()) {\n            const repoName = getRepoName()\n            dryRunIsolated({\n                tickets,\n                specBody,\n                repoName,\n                conflictStrategy,\n                progressPath,\n            })\n        } else {\n            dryRun(tickets, specBody)\n        }\n        return\n    }\n\n    let result:{ allDone:boolean }\n\n    if (isGitRepo()) {\n        result = await runWavesIsolated({\n            tickets,\n            specBody,\n            agentCmd:argv.provider,\n            model:argv.model ?? null,\n            timeout,\n            logsDir,\n            featureName,\n            conflictStrategy,\n        })\n    } else {\n        result = await runWaves(\n            tickets, specBody,\n            argv.provider, argv.model ?? null,\n            timeout,\n            logsDir,\n        )\n    }\n\n    if (!result.allDone) {\n        process.exit(1)\n    }\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/merge.js

@@ -0,0 +1,194 @@
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+import { execFile } from "node:child_process";
+import { promisify } from "node:util";
+const execFileAsync = promisify(execFile);
+async function mergeBranch(repoRoot, branch) {
+  if (!repoRoot || typeof repoRoot !== "string") {
+    throw new Error("repoRoot must be a non-empty string");
+  }
+  if (!branch || typeof branch !== "string") {
+    throw new Error("branch must be a non-empty string");
+  }
+  try {
+    await execFileAsync(
+      "git",
+      ["merge", branch, "--no-edit"],
+      { cwd: repoRoot }
+    );
+    return true;
+  } catch {
+    try {
+      await execFileAsync(
+        "git",
+        ["merge", "--abort"],
+        { cwd: repoRoot }
+      );
+    } catch {
+    }
+    return false;
+  }
+}
+__name(mergeBranch, "mergeBranch");
+async function rebaseBranch(repoRoot, branch, onto, worktreePath) {
+  if (!repoRoot || typeof repoRoot !== "string") {
+    throw new Error("repoRoot must be a non-empty string");
+  }
+  if (!branch || typeof branch !== "string") {
+    throw new Error("branch must be a non-empty string");
+  }
+  if (!onto || typeof onto !== "string") {
+    throw new Error("onto must be a non-empty string");
+  }
+  if (worktreePath) {
+    try {
+      await execFileAsync(
+        "git",
+        ["rebase", onto],
+        { cwd: worktreePath }
+      );
+      return true;
+    } catch {
+      try {
+        await execFileAsync(
+          "git",
+          ["rebase", "--abort"],
+          { cwd: worktreePath }
+        );
+      } catch {
+      }
+      return false;
+    }
+  }
+  try {
+    await execFileAsync(
+      "git",
+      ["checkout", branch],
+      { cwd: repoRoot }
+    );
+    await execFileAsync(
+      "git",
+      ["rebase", onto],
+      { cwd: repoRoot }
+    );
+    await execFileAsync(
+      "git",
+      ["checkout", onto],
+      { cwd: repoRoot }
+    );
+    return true;
+  } catch {
+    try {
+      await execFileAsync(
+        "git",
+        ["rebase", "--abort"],
+        { cwd: repoRoot }
+      );
+    } catch {
+    }
+    try {
+      await execFileAsync(
+        "git",
+        ["checkout", onto],
+        { cwd: repoRoot }
+      );
+    } catch {
+    }
+    return false;
+  }
+}
+__name(rebaseBranch, "rebaseBranch");
+async function updateWorktreeFromBase(worktreePath, baseBranch) {
+  try {
+    await execFileAsync(
+      "git",
+      ["merge", baseBranch, "--no-edit"],
+      { cwd: worktreePath }
+    );
+  } catch {
+  }
+}
+__name(updateWorktreeFromBase, "updateWorktreeFromBase");
+async function mergeWave(opts) {
+  const { repoRoot, baseBranch, branches, strategy } = opts;
+  if (!repoRoot || typeof repoRoot !== "string") {
+    throw new Error("repoRoot must be a non-empty string");
+  }
+  if (!baseBranch || typeof baseBranch !== "string") {
+    throw new Error("baseBranch must be a non-empty string");
+  }
+  const merged = [];
+  let stoppedAt = null;
+  for (let i = 0; i < branches.length; i++) {
+    const { branch, ticketNum, worktreePath } = branches[i];
+    const mergingResult = {
+      branch,
+      ticketNum,
+      merged: false,
+      conflicted: false
+    };
+    if (i === 0) {
+      const success = await mergeBranch(
+        repoRoot,
+        branch
+      );
+      mergingResult.merged = success;
+      mergingResult.conflicted = !success;
+      if (!success) {
+        if (strategy === "stop") {
+          stoppedAt = mergingResult;
+          merged.push(mergingResult);
+          break;
+        }
+        merged.push(mergingResult);
+        continue;
+      }
+    } else {
+      const rebaseSuccess = await rebaseBranch(
+        repoRoot,
+        branch,
+        baseBranch,
+        worktreePath
+      );
+      if (!rebaseSuccess) {
+        mergingResult.conflicted = true;
+        if (strategy === "stop") {
+          stoppedAt = mergingResult;
+          merged.push(mergingResult);
+          break;
+        } else {
+          merged.push(mergingResult);
+          continue;
+        }
+      }
+      const mergeSuccess = await mergeBranch(
+        repoRoot,
+        branch
+      );
+      mergingResult.merged = mergeSuccess;
+      mergingResult.conflicted = !mergeSuccess;
+      if (!mergeSuccess) {
+        if (strategy === "stop") {
+          stoppedAt = mergingResult;
+          merged.push(mergingResult);
+          break;
+        }
+        merged.push(mergingResult);
+        continue;
+      }
+    }
+    merged.push(mergingResult);
+  }
+  return {
+    merged,
+    stoppedAt
+  };
+}
+__name(mergeWave, "mergeWave");
+export {
+  mergeBranch,
+  mergeWave,
+  rebaseBranch,
+  updateWorktreeFromBase
+};
+//# sourceMappingURL=merge.js.map

package/dist/merge.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../src/merge.ts"],
+  "sourcesContent": ["import { execFile } from 'node:child_process'\nimport { promisify } from 'node:util'\n\nconst execFileAsync = promisify(execFile)\n\nexport type MergeConflictStrategy = 'respawn'|'stop'\n\nexport type MergeResult = {\n    branch:string\n    ticketNum:number\n    merged:boolean\n    conflicted:boolean\n}\n\nexport type WaveMergeResult = {\n    merged:Array<MergeResult>\n    stoppedAt:MergeResult|null\n}\n\nexport async function mergeBranch (\n    repoRoot:string,\n    branch:string\n):Promise<boolean> {\n    if (!repoRoot || typeof repoRoot !== 'string') {\n        throw new Error('repoRoot must be a non-empty string')\n    }\n    if (!branch || typeof branch !== 'string') {\n        throw new Error('branch must be a non-empty string')\n    }\n\n    try {\n        await execFileAsync(\n            'git',\n            ['merge', branch, '--no-edit'],\n            { cwd:repoRoot }\n        )\n        return true\n    } catch {\n        try {\n            await execFileAsync(\n                'git',\n                ['merge', '--abort'],\n                { cwd:repoRoot }\n            )\n        } catch {\n            // no merge in progress to abort\n        }\n        return false\n    }\n}\n\nexport async function rebaseBranch (\n    repoRoot:string,\n    branch:string,\n    onto:string,\n    worktreePath?:string\n):Promise<boolean> {\n    if (!repoRoot || typeof repoRoot !== 'string') {\n        throw new Error('repoRoot must be a non-empty string')\n    }\n    if (!branch || typeof branch !== 'string') {\n        throw new Error('branch must be a non-empty string')\n    }\n    if (!onto || typeof onto !== 'string') {\n        throw new Error('onto must be a non-empty string')\n    }\n\n    // When the branch has its own worktree, it is already checked\n    // out there -- checking it out in repoRoot too would fail with\n    // \"already used by worktree\", so rebase in place instead.\n    if (worktreePath) {\n        try {\n            await execFileAsync(\n                'git',\n                ['rebase', onto],\n                { cwd:worktreePath }\n            )\n            return true\n        } catch {\n            try {\n                await execFileAsync(\n                    'git',\n                    ['rebase', '--abort'],\n                    { cwd:worktreePath }\n                )\n            } catch {\n                // ignore abort errors\n            }\n            return false\n        }\n    }\n\n    try {\n        await execFileAsync(\n            'git',\n            ['checkout', branch],\n            { cwd:repoRoot }\n        )\n\n        await execFileAsync(\n            'git',\n            ['rebase', onto],\n            { cwd:repoRoot }\n        )\n\n        await execFileAsync(\n            'git',\n            ['checkout', onto],\n            { cwd:repoRoot }\n        )\n\n        return true\n    } catch {\n        try {\n            await execFileAsync(\n                'git',\n                ['rebase', '--abort'],\n                { cwd:repoRoot }\n            )\n        } catch {\n            // ignore abort errors\n        }\n        try {\n            await execFileAsync(\n                'git',\n                ['checkout', onto],\n                { cwd:repoRoot }\n            )\n        } catch {\n            // ignore checkout errors\n        }\n        return false\n    }\n}\n\n// Merges baseBranch into the worktree's branch so a\n// respawned agent sees the latest code. Conflicts are\n// left in place (not aborted) so the agent can resolve\n// and commit them.\nexport async function updateWorktreeFromBase (\n    worktreePath:string,\n    baseBranch:string\n):Promise<void> {\n    try {\n        await execFileAsync(\n            'git',\n            ['merge', baseBranch, '--no-edit'],\n            { cwd:worktreePath }\n        )\n    } catch {\n        // conflict markers intentionally left for the\n        // respawned agent to resolve\n    }\n}\n\nexport async function mergeWave (\n    opts:Readonly<{\n        repoRoot:string\n        baseBranch:string\n        branches:ReadonlyArray<{\n            branch:string\n            ticketNum:number\n            worktreePath?:string\n        }>\n        strategy:MergeConflictStrategy\n    }>\n):Promise<WaveMergeResult> {\n    const { repoRoot, baseBranch, branches, strategy } = opts\n\n    if (!repoRoot || typeof repoRoot !== 'string') {\n        throw new Error('repoRoot must be a non-empty string')\n    }\n    if (!baseBranch || typeof baseBranch !== 'string') {\n        throw new Error('baseBranch must be a non-empty string')\n    }\n\n    const merged:Array<MergeResult> = []\n    let stoppedAt:MergeResult|null = null\n\n    for (let i = 0; i < branches.length; i++) {\n        const { branch, ticketNum, worktreePath } = branches[i]\n        const mergingResult:MergeResult = {\n            branch,\n            ticketNum,\n            merged:false,\n            conflicted:false,\n        }\n\n        if (i === 0) {\n            const success = await mergeBranch(\n                repoRoot,\n                branch\n            )\n            mergingResult.merged = success\n            mergingResult.conflicted = !success\n\n            if (!success) {\n                if (strategy === 'stop') {\n                    stoppedAt = mergingResult\n                    merged.push(mergingResult)\n                    break\n                }\n                merged.push(mergingResult)\n                continue\n            }\n        } else {\n            const rebaseSuccess = await rebaseBranch(\n                repoRoot,\n                branch,\n                baseBranch,\n                worktreePath\n            )\n\n            if (!rebaseSuccess) {\n                mergingResult.conflicted = true\n\n                if (strategy === 'stop') {\n                    stoppedAt = mergingResult\n                    merged.push(mergingResult)\n                    break\n                } else {\n                    // strategy === 'respawn'\n                    merged.push(mergingResult)\n                    continue\n                }\n            }\n\n            const mergeSuccess = await mergeBranch(\n                repoRoot,\n                branch\n            )\n            mergingResult.merged = mergeSuccess\n            mergingResult.conflicted = !mergeSuccess\n\n            if (!mergeSuccess) {\n                if (strategy === 'stop') {\n                    stoppedAt = mergingResult\n                    merged.push(mergingResult)\n                    break\n                }\n                merged.push(mergingResult)\n                continue\n            }\n        }\n\n        merged.push(mergingResult)\n    }\n\n    return {\n        merged,\n        stoppedAt,\n    }\n}\n"],
+  "mappings": "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",
+  "names": []
+}