nightralph 0.0.52 → 0.0.54

package/dist/src/review.d.ts

@@ -0,0 +1,127 @@
+import { type EffortLevel } from './retry.js';
+import type { AgentResult } from './orchestrator.js';
+export declare const FINDINGS_FILE = "findings.md";
+export declare const FINDINGS_PATH: string;
+export declare const NO_FINDINGS = "No findings.";
+export declare const REVIEW_EXCLUDE = ".scratch";
+export declare const REVIEW_MARKER = "---- REVIEW INSTRUCTIONS ----";
+export declare const FIX_MARKER = "---- REVIEW FINDINGS ----";
+export declare function reviewExcludeFor(repoRoot: string, reviewPath: string): string;
+export declare function reviewDiffCommand(from: string, to: string, exclude?: string): string;
+export declare function renderReviewPrompt(opts: {
+    specBody: string;
+    from: string;
+    to: string;
+    exclude?: string;
+}): string;
+export type FixFailure = 'install' | 'exit' | 'no-commits' | 'tests' | 'merge';
+export declare const FIX_FAILURE_TEXT: Record<FixFailure, string>;
+export declare function renderFixPrompt(opts: {
+    specBody: string;
+    findings: ReadonlyArray<Finding>;
+    testCmd: string;
+    installCmd?: string;
+    previous?: {
+        reason: FixFailure;
+        notes: string | null;
+    };
+}): string;
+export declare const REVIEW_STATUSES: readonly ["clean", "fixed", "unresolved", "review-failed"];
+export type ReviewStatus = typeof REVIEW_STATUSES[number];
+export type Finding = {
+    summary: string;
+    detail: string;
+    checked: boolean;
+};
+export type FixRecord = {
+    attempts: number;
+    maxAttempts: number;
+    effort?: string;
+    exitCode: number | null;
+    result: string;
+    notes: string | null;
+};
+export type ReviewEntryInput = {
+    from: string;
+    to: string;
+    status: ReviewStatus;
+    now: Date;
+    findings: Finding[];
+    fix?: FixRecord;
+};
+export type ReviewEntry = {
+    from: string;
+    to: string;
+    status: ReviewStatus;
+    findings: Finding[];
+    body: string;
+};
+export type ReviewOutcome = {
+    status: ReviewStatus | 'skipped';
+    findings: number;
+    fixed: number;
+};
+export declare function parseFindings(text: string): Finding[] | null;
+export declare function markFixed(findings: ReadonlyArray<Finding>, completedItems: ReadonlyArray<string>): Finding[];
+export declare function renderReviewEntry(input: ReviewEntryInput): string;
+export declare function parseReviewEntries(text: string): ReviewEntry[];
+export declare function selectReviewBase(entries: ReadonlyArray<ReviewEntry>, opts: {
+    isAncestor: (sha: string) => boolean;
+    forkPoint: string | null;
+    launchCommit: string;
+}): string;
+export declare function renderReviewSummary(outcome: ReviewOutcome, reviewPath: string): string | null;
+export type SpawnAgentFn = (opts: {
+    prompt: string;
+    agentCmd: string;
+    model: string | null;
+    timeout: number;
+    logPath: string;
+    cwd?: string;
+    label?: string;
+    maxTurns?: number;
+    effort?: EffortLevel;
+    onLine?: (line: string) => void;
+}) => Promise<AgentResult>;
+export type ReviewDeps = {
+    spawnAgent: SpawnAgentFn;
+    registry?: Set<number>;
+};
+export type ReviewPassOpts = {
+    repoRoot: string;
+    repoName: string;
+    baseBranch: string;
+    reviewPath: string;
+    forkedFrom?: string;
+    launchCommit: string;
+    specBody: string;
+    agentCmd: string;
+    model: string | null;
+    timeout: number;
+    logsDir: string;
+    testCmd: string;
+    installCmd?: string;
+    maxTurns?: number;
+    effort?: EffortLevel;
+    retries: number;
+    retryDelay: number;
+    log: (msg: string) => void;
+    now?: () => Date;
+};
+export declare function runReviewer(opts: ReviewPassOpts, deps: ReviewDeps, range: {
+    from: string;
+    to: string;
+}): Promise<Finding[] | null>;
+export type FixResult = {
+    merged: boolean;
+    findings: Finding[];
+    attempts: number;
+    effort?: EffortLevel;
+    exitCode: number | null;
+    result: string;
+    notes: string | null;
+};
+export declare function runFixer(opts: ReviewPassOpts, deps: ReviewDeps, findings: ReadonlyArray<Finding>): Promise<FixResult>;
+export declare function readReviewEntries(path: string): ReviewEntry[];
+export declare function runReviewPass(opts: ReviewPassOpts, deps: ReviewDeps): Promise<ReviewOutcome>;
+//# sourceMappingURL=review.d.ts.map

package/dist/src/review.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"review.d.ts","sourceRoot":"","sources":["../../src/review.ts"],"names":[],"mappings":"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"}

package/dist/src/rules.d.ts

@@ -0,0 +1,10 @@
+export declare function readDocsRule(subject: string): string;
+export declare function installRule(installCmd?: string): string[];
+export declare function testGateRule(testCmd: string, subject: string): string;
+export declare const LINT_RULE: string;
+export declare function integrityRule(unit: string): string;
+export declare const CONFINEMENT_RULES: string[];
+export declare function commitRule(unit: string): string;
+export declare function notesRule(unit: string, subject: string): string;
+export declare function agentsMdRule(subject: string): string;
+//# sourceMappingURL=rules.d.ts.map

package/dist/src/rules.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rules.d.ts","sourceRoot":"","sources":["../../src/rules.ts"],"names":[],"mappings":"AAMA,wBAAgB,YAAY,CAAE,OAAO,EAAC,MAAM,GAAE,MAAM,CAOnD;AAID,wBAAgB,WAAW,CAAE,UAAU,CAAC,EAAC,MAAM,GAAE,MAAM,EAAE,CAUxD;AAED,wBAAgB,YAAY,CAAE,OAAO,EAAC,MAAM,EAAE,OAAO,EAAC,MAAM,GAAE,MAAM,CAenE;AAED,eAAO,MAAM,SAAS,QACQ,CAAA;AAE9B,wBAAgB,aAAa,CAAE,IAAI,EAAC,MAAM,GAAE,MAAM,CAQjD;AAED,eAAO,MAAM,iBAAiB,EAAC,MAAM,EAIpC,CAAA;AAED,wBAAgB,UAAU,CAAE,IAAI,EAAC,MAAM,GAAE,MAAM,CAI9C;AAED,wBAAgB,SAAS,CAAE,IAAI,EAAC,MAAM,EAAE,OAAO,EAAC,MAAM,GAAE,MAAM,CAU7D;AAED,wBAAgB,YAAY,CAAE,OAAO,EAAC,MAAM,GAAE,MAAM,CAenD"}

package/dist/src/testcmd.d.ts

@@ -3,6 +3,7 @@ export type TestResult = {
     output: string;
 };
 export declare function detectTestCmd(projectDir: string): string | null;
+export declare function detectInstallCmd(projectDir: string): string | null;
 export declare function runTestCmd(opts: {
     cmd: string;
     cwd: string;

package/dist/src/testcmd.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"testcmd.d.ts","sourceRoot":"","sources":["../../src/testcmd.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,UAAU,GAAG;IACrB,QAAQ,EAAC,MAAM,CAAA;IACf,MAAM,EAAC,MAAM,CAAA;CAChB,CAAA;AAID,wBAAgB,aAAa,CAAE,UAAU,EAAC,MAAM,GAAE,MAAM,GAAC,IAAI,CAa5D;AAED,wBAAgB,UAAU,CAAE,IAAI,EAAC;IAC7B,GAAG,EAAC,MAAM,CAAA;IACV,GAAG,EAAC,MAAM,CAAA;IACV,OAAO,EAAC,MAAM,CAAA;IACd,QAAQ,CAAC,EAAC,GAAG,CAAC,MAAM,CAAC,CAAA;CACxB,GAAE,OAAO,CAAC,UAAU,CAAC,CAwDrB"}
+{"version":3,"file":"testcmd.d.ts","sourceRoot":"","sources":["../../src/testcmd.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,UAAU,GAAG;IACrB,QAAQ,EAAC,MAAM,CAAA;IACf,MAAM,EAAC,MAAM,CAAA;CAChB,CAAA;AAID,wBAAgB,aAAa,CAAE,UAAU,EAAC,MAAM,GAAE,MAAM,GAAC,IAAI,CAa5D;AAOD,wBAAgB,gBAAgB,CAAE,UAAU,EAAC,MAAM,GAAE,MAAM,GAAC,IAAI,CAW/D;AAED,wBAAgB,UAAU,CAAE,IAAI,EAAC;IAC7B,GAAG,EAAC,MAAM,CAAA;IACV,GAAG,EAAC,MAAM,CAAA;IACV,OAAO,EAAC,MAAM,CAAA;IACd,QAAQ,CAAC,EAAC,GAAG,CAAC,MAAM,CAAC,CAAA;CACxB,GAAE,OAAO,CAAC,UAAU,CAAC,CAwDrB"}

package/dist/src/worktree.d.ts

@@ -1,7 +1,22 @@
 import type { Ticket } from './orchestrator.js';
 export declare function getRepoRoot(): string;
 export declare function getRepoName(): string;
-export declare function getCurrentBranch(): string;
+export declare function getCurrentBranch(cwd?: string): string;
+export declare function localBranchExists(repoRoot: string, name: string): boolean;
+export declare function getDefaultBranch(repoRoot: string): string | null;
+export declare function integrationBranchName(features: ReadonlyArray<string>): string;
+export declare function planIntegrationBranch(current: string, defaultBranch: string | null, features: ReadonlyArray<string>): string | null;
+export type IntegrationPlan = {
+    branch: string;
+    created: boolean;
+    resumed: boolean;
+    behind: number;
+    fastForwarded: boolean;
+    launchBranch: string;
+    forkedFrom: string | null;
+};
+export declare function prepareIntegrationBranch(repoRoot: string, features: ReadonlyArray<string>): IntegrationPlan;
+export declare function describeIntegrationBranch(repoRoot: string, features: ReadonlyArray<string>): string;
 export declare function buildBranchName(repoName: string, ticket: Ticket): string;
 export declare function createWorktree(opts: {
     repoRoot: string;
@@ -12,10 +27,24 @@ export declare function createWorktree(opts: {
     worktreePath: string;
     branchName: string;
 }>;
+export declare function createNamedWorktree(opts: {
+    repoRoot: string;
+    repoName: string;
+    baseBranch: string;
+    name: string;
+}): Promise<{
+    worktreePath: string;
+    branchName: string;
+}>;
 export declare function removeWorktree(worktreePath: string, opts?: {
     force?: boolean;
 }): Promise<void>;
+export declare function deleteBranch(repoRoot: string, name: string): Promise<void>;
 export declare function hasNewCommits(repoRoot: string, base: string, branch: string): boolean;
+export declare function headCommit(cwd: string): string;
+export declare function mergeBase(cwd: string, a: string, b: string): string | null;
+export declare function isAncestor(cwd: string, ancestor: string, of: string): boolean;
+export declare function hasChangesOutside(cwd: string, from: string, to: string, excludeDir: string): boolean;
 export declare function isDirty(cwd: string): boolean;
 export declare function commitDirty(cwd: string, message?: string): Promise<boolean>;
 export declare function listWorktrees(repoRoot: string): Promise<Array<string>>;

package/dist/src/worktree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worktree.d.ts","sourceRoot":"","sources":["../../src/worktree.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAI/C,wBAAgB,WAAW,IAAI,MAAM,CAOpC;AAED,wBAAgB,WAAW,IAAI,MAAM,CAOpC;AAED,wBAAgB,gBAAgB,IAAI,MAAM,CAOzC;AAkBD,wBAAgB,eAAe,CAC3B,QAAQ,EAAC,MAAM,EACf,MAAM,EAAC,MAAM,GACf,MAAM,CAMP;AAwED,wBAAgB,cAAc,CAC1B,IAAI,EAAC;IACD,QAAQ,EAAC,MAAM,CAAA;IACf,QAAQ,EAAC,MAAM,CAAA;IACf,UAAU,EAAC,MAAM,CAAA;IACjB,MAAM,EAAC,MAAM,CAAA;CAChB,GACH,OAAO,CAAC;IAAE,YAAY,EAAC,MAAM,CAAC;IAAC,UAAU,EAAC,MAAM,CAAA;CAAE,CAAC,CAIpD;AAeD,wBAAgB,cAAc,CAC1B,YAAY,EAAC,MAAM,EACnB,IAAI,CAAC,EAAC;IAAE,KAAK,CAAC,EAAC,OAAO,CAAA;CAAE,GAC1B,OAAO,CAAC,IAAI,CAAC,CAMd;AAED,wBAAgB,aAAa,CACzB,QAAQ,EAAC,MAAM,EACf,IAAI,EAAC,MAAM,EACX,MAAM,EAAC,MAAM,GACf,OAAO,CAOR;AAED,wBAAgB,OAAO,CAAE,GAAG,EAAC,MAAM,GAAE,OAAO,CAO3C;AAED,wBAAsB,WAAW,CAC7B,GAAG,EAAC,MAAM,EACV,OAAO,CAAC,EAAC,MAAM,GACjB,OAAO,CAAC,OAAO,CAAC,CAsBjB;AAED,wBAAsB,aAAa,CAC/B,QAAQ,EAAC,MAAM,GACjB,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAWvB"}
+{"version":3,"file":"worktree.d.ts","sourceRoot":"","sources":["../../src/worktree.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAI/C,wBAAgB,WAAW,IAAI,MAAM,CAOpC;AAED,wBAAgB,WAAW,IAAI,MAAM,CAOpC;AAED,wBAAgB,gBAAgB,CAAE,GAAG,CAAC,EAAC,MAAM,GAAE,MAAM,CAOpD;AAED,wBAAgB,iBAAiB,CAC7B,QAAQ,EAAC,MAAM,EACf,IAAI,EAAC,MAAM,GACb,OAAO,CAWR;AAID,wBAAgB,gBAAgB,CAAE,QAAQ,EAAC,MAAM,GAAE,MAAM,GAAC,IAAI,CAsB7D;AAKD,wBAAgB,qBAAqB,CACjC,QAAQ,EAAC,aAAa,CAAC,MAAM,CAAC,GAChC,MAAM,CAKP;AAKD,wBAAgB,qBAAqB,CACjC,OAAO,EAAC,MAAM,EACd,aAAa,EAAC,MAAM,GAAC,IAAI,EACzB,QAAQ,EAAC,aAAa,CAAC,MAAM,CAAC,GAChC,MAAM,GAAC,IAAI,CAIZ;AAED,MAAM,MAAM,eAAe,GAAG;IAE1B,MAAM,EAAC,MAAM,CAAA;IACb,OAAO,EAAC,OAAO,CAAA;IACf,OAAO,EAAC,OAAO,CAAA;IAEf,MAAM,EAAC,MAAM,CAAA;IAGb,aAAa,EAAC,OAAO,CAAA;IACrB,YAAY,EAAC,MAAM,CAAA;IAGnB,UAAU,EAAC,MAAM,GAAC,IAAI,CAAA;CACzB,CAAA;AAUD,wBAAgB,wBAAwB,CACpC,QAAQ,EAAC,MAAM,EACf,QAAQ,EAAC,aAAa,CAAC,MAAM,CAAC,GAChC,eAAe,CA0DhB;AAGD,wBAAgB,yBAAyB,CACrC,QAAQ,EAAC,MAAM,EACf,QAAQ,EAAC,aAAa,CAAC,MAAM,CAAC,GAChC,MAAM,CASP;AAkBD,wBAAgB,eAAe,CAC3B,QAAQ,EAAC,MAAM,EACf,MAAM,EAAC,MAAM,GACf,MAAM,CAMP;AAqFD,wBAAgB,cAAc,CAC1B,IAAI,EAAC;IACD,QAAQ,EAAC,MAAM,CAAA;IACf,QAAQ,EAAC,MAAM,CAAA;IACf,UAAU,EAAC,MAAM,CAAA;IACjB,MAAM,EAAC,MAAM,CAAA;CAChB,GACH,OAAO,CAAC;IAAE,YAAY,EAAC,MAAM,CAAC;IAAC,UAAU,EAAC,MAAM,CAAA;CAAE,CAAC,CAgBpD;AAKD,wBAAgB,mBAAmB,CAC/B,IAAI,EAAC;IACD,QAAQ,EAAC,MAAM,CAAA;IACf,QAAQ,EAAC,MAAM,CAAA;IACf,UAAU,EAAC,MAAM,CAAA;IACjB,IAAI,EAAC,MAAM,CAAA;CACd,GACH,OAAO,CAAC;IAAE,YAAY,EAAC,MAAM,CAAC;IAAC,UAAU,EAAC,MAAM,CAAA;CAAE,CAAC,CAQpD;AAED,wBAAgB,cAAc,CAC1B,YAAY,EAAC,MAAM,EACnB,IAAI,CAAC,EAAC;IAAE,KAAK,CAAC,EAAC,OAAO,CAAA;CAAE,GAC1B,OAAO,CAAC,IAAI,CAAC,CAEd;AAGD,wBAAgB,YAAY,CACxB,QAAQ,EAAC,MAAM,EACf,IAAI,EAAC,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAOd;AAED,wBAAgB,aAAa,CACzB,QAAQ,EAAC,MAAM,EACf,IAAI,EAAC,MAAM,EACX,MAAM,EAAC,MAAM,GACf,OAAO,CAOR;AAED,wBAAgB,UAAU,CAAE,GAAG,EAAC,MAAM,GAAE,MAAM,CAE7C;AAED,wBAAgB,SAAS,CACrB,GAAG,EAAC,MAAM,EACV,CAAC,EAAC,MAAM,EACR,CAAC,EAAC,MAAM,GACV,MAAM,GAAC,IAAI,CAMZ;AAID,wBAAgB,UAAU,CACtB,GAAG,EAAC,MAAM,EACV,QAAQ,EAAC,MAAM,EACf,EAAE,EAAC,MAAM,GACX,OAAO,CAWR;AAGD,wBAAgB,iBAAiB,CAC7B,GAAG,EAAC,MAAM,EACV,IAAI,EAAC,MAAM,EACX,EAAE,EAAC,MAAM,EACT,UAAU,EAAC,MAAM,GACnB,OAAO,CAcR;AAED,wBAAgB,OAAO,CAAE,GAAG,EAAC,MAAM,GAAE,OAAO,CAO3C;AAED,wBAAsB,WAAW,CAC7B,GAAG,EAAC,MAAM,EACV,OAAO,CAAC,EAAC,MAAM,GACjB,OAAO,CAAC,OAAO,CAAC,CAsBjB;AAED,wBAAsB,aAAa,CAC/B,QAAQ,EAAC,MAAM,GACjB,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAWvB"}

package/dist/testcmd.js

@@ -16,6 +16,18 @@ function detectTestCmd(projectDir) {
   }
 }
 __name(detectTestCmd, "detectTestCmd");
+function detectInstallCmd(projectDir) {
+  const has = /* @__PURE__ */ __name((name) => existsSync(join(projectDir, name)), "has");
+  if (!has("package.json")) return null;
+  if (has("pnpm-lock.yaml")) {
+    return "pnpm install --prefer-offline --frozen-lockfile";
+  }
+  if (has("package-lock.json")) {
+    return "npm ci --prefer-offline --no-audit --no-fund";
+  }
+  return "npm install --prefer-offline --no-audit --no-fund --no-package-lock";
+}
+__name(detectInstallCmd, "detectInstallCmd");
 function runTestCmd(opts) {
   return new Promise((resolve) => {
     let settled = false;
@@ -70,6 +82,7 @@ function runTestCmd(opts) {
 }
 __name(runTestCmd, "runTestCmd");
 export {
+  detectInstallCmd,
   detectTestCmd,
   runTestCmd
 };

package/dist/testcmd.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/testcmd.ts"],
-  "sourcesContent": ["import { spawn } from 'node:child_process'\nimport { existsSync, readFileSync } from 'node:fs'\nimport { join } from 'node:path'\n\nexport type TestResult = {\n    exitCode:number\n    output:string\n}\n\n// Returns the command to run the project's tests, or null\n// when the project does not declare one.\nexport function detectTestCmd (projectDir:string):string|null {\n    const pkgPath = join(projectDir, 'package.json')\n    if (!existsSync(pkgPath)) return null\n    try {\n        const pkg = JSON.parse(\n            readFileSync(pkgPath, 'utf8')\n        ) as { scripts?:Record<string, string> }\n        return pkg.scripts?.test ?\n            'npm test' :\n            null\n    } catch {\n        return null\n    }\n}\n\nexport function runTestCmd (opts:{\n    cmd:string\n    cwd:string\n    timeout:number\n    registry?:Set<number>\n}):Promise<TestResult> {\n    return new Promise(resolve => {\n        let settled = false\n        const child = spawn('sh', ['-c', opts.cmd], {\n            cwd:opts.cwd,\n            stdio:['ignore', 'pipe', 'pipe'],\n            detached:true,\n        })\n\n        if (child.pid !== undefined && opts.registry) {\n            opts.registry.add(child.pid)\n        }\n\n        const chunks:string[] = []\n        child.stdout.on('data', d => chunks.push(String(d)))\n        child.stderr.on('data', d => chunks.push(String(d)))\n\n        const timer = setTimeout(() => {\n            if (child.pid) {\n                try {\n                    process.kill(-child.pid, 'SIGKILL')\n                } catch {\n                    child.kill('SIGKILL')\n                }\n            } else {\n                child.kill('SIGKILL')\n            }\n        }, opts.timeout * 1000)\n\n        child.on('error', err => {\n            if (settled) return\n            settled = true\n            clearTimeout(timer)\n            if (child.pid !== undefined && opts.registry) {\n                opts.registry.delete(child.pid)\n            }\n            chunks.push(String(err))\n            resolve({\n                exitCode:1,\n                output:chunks.join(''),\n            })\n        })\n\n        child.on('close', code => {\n            if (settled) return\n            settled = true\n            clearTimeout(timer)\n            if (child.pid !== undefined && opts.registry) {\n                opts.registry.delete(child.pid)\n            }\n            resolve({\n                exitCode:code ?? 1,\n                output:chunks.join(''),\n            })\n        })\n    })\n}\n"],
-  "mappings": ";;AAAA,SAAS,aAAa;AACtB,SAAS,YAAY,oBAAoB;AACzC,SAAS,YAAY;AASd,SAAS,cAAe,YAA+B;AAC1D,QAAM,UAAU,KAAK,YAAY,cAAc;AAC/C,MAAI,CAAC,WAAW,OAAO,EAAG,QAAO;AACjC,MAAI;AACA,UAAM,MAAM,KAAK;AAAA,MACb,aAAa,SAAS,MAAM;AAAA,IAChC;AACA,WAAO,IAAI,SAAS,OAChB,aACA;AAAA,EACR,QAAQ;AACJ,WAAO;AAAA,EACX;AACJ;AAbgB;AAeT,SAAS,WAAY,MAKL;AACnB,SAAO,IAAI,QAAQ,aAAW;AAC1B,QAAI,UAAU;AACd,UAAM,QAAQ,MAAM,MAAM,CAAC,MAAM,KAAK,GAAG,GAAG;AAAA,MACxC,KAAI,KAAK;AAAA,MACT,OAAM,CAAC,UAAU,QAAQ,MAAM;AAAA,MAC/B,UAAS;AAAA,IACb,CAAC;AAED,QAAI,MAAM,QAAQ,UAAa,KAAK,UAAU;AAC1C,WAAK,SAAS,IAAI,MAAM,GAAG;AAAA,IAC/B;AAEA,UAAM,SAAkB,CAAC;AACzB,UAAM,OAAO,GAAG,QAAQ,OAAK,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC;AACnD,UAAM,OAAO,GAAG,QAAQ,OAAK,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC;AAEnD,UAAM,QAAQ,WAAW,MAAM;AAC3B,UAAI,MAAM,KAAK;AACX,YAAI;AACA,kBAAQ,KAAK,CAAC,MAAM,KAAK,SAAS;AAAA,QACtC,QAAQ;AACJ,gBAAM,KAAK,SAAS;AAAA,QACxB;AAAA,MACJ,OAAO;AACH,cAAM,KAAK,SAAS;AAAA,MACxB;AAAA,IACJ,GAAG,KAAK,UAAU,GAAI;AAEtB,UAAM,GAAG,SAAS,SAAO;AACrB,UAAI,QAAS;AACb,gBAAU;AACV,mBAAa,KAAK;AAClB,UAAI,MAAM,QAAQ,UAAa,KAAK,UAAU;AAC1C,aAAK,SAAS,OAAO,MAAM,GAAG;AAAA,MAClC;AACA,aAAO,KAAK,OAAO,GAAG,CAAC;AACvB,cAAQ;AAAA,QACJ,UAAS;AAAA,QACT,QAAO,OAAO,KAAK,EAAE;AAAA,MACzB,CAAC;AAAA,IACL,CAAC;AAED,UAAM,GAAG,SAAS,UAAQ;AACtB,UAAI,QAAS;AACb,gBAAU;AACV,mBAAa,KAAK;AAClB,UAAI,MAAM,QAAQ,UAAa,KAAK,UAAU;AAC1C,aAAK,SAAS,OAAO,MAAM,GAAG;AAAA,MAClC;AACA,cAAQ;AAAA,QACJ,UAAS,QAAQ;AAAA,QACjB,QAAO,OAAO,KAAK,EAAE;AAAA,MACzB,CAAC;AAAA,IACL,CAAC;AAAA,EACL,CAAC;AACL;AA7DgB;",
+  "sourcesContent": ["import { spawn } from 'node:child_process'\nimport { existsSync, readFileSync } from 'node:fs'\nimport { join } from 'node:path'\n\nexport type TestResult = {\n    exitCode:number\n    output:string\n}\n\n// Returns the command to run the project's tests, or null\n// when the project does not declare one.\nexport function detectTestCmd (projectDir:string):string|null {\n    const pkgPath = join(projectDir, 'package.json')\n    if (!existsSync(pkgPath)) return null\n    try {\n        const pkg = JSON.parse(\n            readFileSync(pkgPath, 'utf8')\n        ) as { scripts?:Record<string, string> }\n        return pkg.scripts?.test ?\n            'npm test' :\n            null\n    } catch {\n        return null\n    }\n}\n\n// Returns the command that installs dependencies in a fresh\n// worktree, or null when the project has no package.json.\n// Follows the project's lockfile, so the worktree gets the\n// same dependency tree as the main checkout, and never\n// writes a lockfile a ticket branch would then commit.\nexport function detectInstallCmd (projectDir:string):string|null {\n    const has = (name:string) => existsSync(join(projectDir, name))\n    if (!has('package.json')) return null\n    if (has('pnpm-lock.yaml')) {\n        return 'pnpm install --prefer-offline --frozen-lockfile'\n    }\n    if (has('package-lock.json')) {\n        return 'npm ci --prefer-offline --no-audit --no-fund'\n    }\n    return 'npm install --prefer-offline --no-audit ' +\n        '--no-fund --no-package-lock'\n}\n\nexport function runTestCmd (opts:{\n    cmd:string\n    cwd:string\n    timeout:number\n    registry?:Set<number>\n}):Promise<TestResult> {\n    return new Promise(resolve => {\n        let settled = false\n        const child = spawn('sh', ['-c', opts.cmd], {\n            cwd:opts.cwd,\n            stdio:['ignore', 'pipe', 'pipe'],\n            detached:true,\n        })\n\n        if (child.pid !== undefined && opts.registry) {\n            opts.registry.add(child.pid)\n        }\n\n        const chunks:string[] = []\n        child.stdout.on('data', d => chunks.push(String(d)))\n        child.stderr.on('data', d => chunks.push(String(d)))\n\n        const timer = setTimeout(() => {\n            if (child.pid) {\n                try {\n                    process.kill(-child.pid, 'SIGKILL')\n                } catch {\n                    child.kill('SIGKILL')\n                }\n            } else {\n                child.kill('SIGKILL')\n            }\n        }, opts.timeout * 1000)\n\n        child.on('error', err => {\n            if (settled) return\n            settled = true\n            clearTimeout(timer)\n            if (child.pid !== undefined && opts.registry) {\n                opts.registry.delete(child.pid)\n            }\n            chunks.push(String(err))\n            resolve({\n                exitCode:1,\n                output:chunks.join(''),\n            })\n        })\n\n        child.on('close', code => {\n            if (settled) return\n            settled = true\n            clearTimeout(timer)\n            if (child.pid !== undefined && opts.registry) {\n                opts.registry.delete(child.pid)\n            }\n            resolve({\n                exitCode:code ?? 1,\n                output:chunks.join(''),\n            })\n        })\n    })\n}\n"],
+  "mappings": ";;AAAA,SAAS,aAAa;AACtB,SAAS,YAAY,oBAAoB;AACzC,SAAS,YAAY;AASd,SAAS,cAAe,YAA+B;AAC1D,QAAM,UAAU,KAAK,YAAY,cAAc;AAC/C,MAAI,CAAC,WAAW,OAAO,EAAG,QAAO;AACjC,MAAI;AACA,UAAM,MAAM,KAAK;AAAA,MACb,aAAa,SAAS,MAAM;AAAA,IAChC;AACA,WAAO,IAAI,SAAS,OAChB,aACA;AAAA,EACR,QAAQ;AACJ,WAAO;AAAA,EACX;AACJ;AAbgB;AAoBT,SAAS,iBAAkB,YAA+B;AAC7D,QAAM,MAAM,wBAAC,SAAgB,WAAW,KAAK,YAAY,IAAI,CAAC,GAAlD;AACZ,MAAI,CAAC,IAAI,cAAc,EAAG,QAAO;AACjC,MAAI,IAAI,gBAAgB,GAAG;AACvB,WAAO;AAAA,EACX;AACA,MAAI,IAAI,mBAAmB,GAAG;AAC1B,WAAO;AAAA,EACX;AACA,SAAO;AAEX;AAXgB;AAaT,SAAS,WAAY,MAKL;AACnB,SAAO,IAAI,QAAQ,aAAW;AAC1B,QAAI,UAAU;AACd,UAAM,QAAQ,MAAM,MAAM,CAAC,MAAM,KAAK,GAAG,GAAG;AAAA,MACxC,KAAI,KAAK;AAAA,MACT,OAAM,CAAC,UAAU,QAAQ,MAAM;AAAA,MAC/B,UAAS;AAAA,IACb,CAAC;AAED,QAAI,MAAM,QAAQ,UAAa,KAAK,UAAU;AAC1C,WAAK,SAAS,IAAI,MAAM,GAAG;AAAA,IAC/B;AAEA,UAAM,SAAkB,CAAC;AACzB,UAAM,OAAO,GAAG,QAAQ,OAAK,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC;AACnD,UAAM,OAAO,GAAG,QAAQ,OAAK,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC;AAEnD,UAAM,QAAQ,WAAW,MAAM;AAC3B,UAAI,MAAM,KAAK;AACX,YAAI;AACA,kBAAQ,KAAK,CAAC,MAAM,KAAK,SAAS;AAAA,QACtC,QAAQ;AACJ,gBAAM,KAAK,SAAS;AAAA,QACxB;AAAA,MACJ,OAAO;AACH,cAAM,KAAK,SAAS;AAAA,MACxB;AAAA,IACJ,GAAG,KAAK,UAAU,GAAI;AAEtB,UAAM,GAAG,SAAS,SAAO;AACrB,UAAI,QAAS;AACb,gBAAU;AACV,mBAAa,KAAK;AAClB,UAAI,MAAM,QAAQ,UAAa,KAAK,UAAU;AAC1C,aAAK,SAAS,OAAO,MAAM,GAAG;AAAA,MAClC;AACA,aAAO,KAAK,OAAO,GAAG,CAAC;AACvB,cAAQ;AAAA,QACJ,UAAS;AAAA,QACT,QAAO,OAAO,KAAK,EAAE;AAAA,MACzB,CAAC;AAAA,IACL,CAAC;AAED,UAAM,GAAG,SAAS,UAAQ;AACtB,UAAI,QAAS;AACb,gBAAU;AACV,mBAAa,KAAK;AAClB,UAAI,MAAM,QAAQ,UAAa,KAAK,UAAU;AAC1C,aAAK,SAAS,OAAO,MAAM,GAAG;AAAA,MAClC;AACA,cAAQ;AAAA,QACJ,UAAS,QAAQ;AAAA,QACjB,QAAO,OAAO,KAAK,EAAE;AAAA,MACzB,CAAC;AAAA,IACL,CAAC;AAAA,EACL,CAAC;AACL;AA7DgB;",
   "names": []
 }

package/dist/worktree.js

@@ -23,15 +23,138 @@ function getRepoName() {
   return basename(dirname(resolve(commonDir)));
 }
 __name(getRepoName, "getRepoName");
-function getCurrentBranch() {
+function getCurrentBranch(cwd) {
   const stdout = execFileSync(
     "git",
     ["rev-parse", "--abbrev-ref", "HEAD"],
-    { encoding: "utf8" }
+    { cwd, encoding: "utf8" }
   );
   return stdout.trim();
 }
 __name(getCurrentBranch, "getCurrentBranch");
+function localBranchExists(repoRoot, name) {
+  try {
+    execFileSync(
+      "git",
+      ["show-ref", "--verify", "--quiet", `refs/heads/${name}`],
+      { cwd: repoRoot, stdio: "ignore" }
+    );
+    return true;
+  } catch {
+    return false;
+  }
+}
+__name(localBranchExists, "localBranchExists");
+function getDefaultBranch(repoRoot) {
+  try {
+    const ref = execFileSync(
+      "git",
+      [
+        "symbolic-ref",
+        "--quiet",
+        "--short",
+        "refs/remotes/origin/HEAD"
+      ],
+      {
+        cwd: repoRoot,
+        encoding: "utf8",
+        stdio: ["ignore", "pipe", "ignore"]
+      }
+    ).trim();
+    if (ref) return ref.replace(/^origin\//, "");
+  } catch {
+  }
+  for (const name of ["main", "master"]) {
+    if (localBranchExists(repoRoot, name)) return name;
+  }
+  return null;
+}
+__name(getDefaultBranch, "getDefaultBranch");
+function integrationBranchName(features) {
+  const distinct = [...new Set(features.filter(Boolean))];
+  return distinct.length === 1 ? `nightralph--${distinct[0]}` : "nightralph--all";
+}
+__name(integrationBranchName, "integrationBranchName");
+function planIntegrationBranch(current, defaultBranch, features) {
+  if (!defaultBranch || current === "HEAD") return null;
+  if (current !== defaultBranch) return null;
+  return integrationBranchName(features);
+}
+__name(planIntegrationBranch, "planIntegrationBranch");
+function gitText(cwd, args) {
+  return execFileSync("git", args, { cwd, encoding: "utf8" }).trim();
+}
+__name(gitText, "gitText");
+function prepareIntegrationBranch(repoRoot, features) {
+  const current = getCurrentBranch(repoRoot);
+  const defaultBranch = getDefaultBranch(repoRoot);
+  const name = planIntegrationBranch(
+    current,
+    defaultBranch,
+    features
+  );
+  if (!name) {
+    const onIntegration = defaultBranch !== null && current === integrationBranchName(features);
+    return {
+      branch: current,
+      created: false,
+      resumed: false,
+      behind: 0,
+      fastForwarded: false,
+      launchBranch: current,
+      forkedFrom: onIntegration ? defaultBranch : null
+    };
+  }
+  if (isDirty(repoRoot)) {
+    throw new Error(
+      "Working tree is dirty; commit or stash changes before running"
+    );
+  }
+  if (localBranchExists(repoRoot, name)) {
+    const contained = isAncestor(repoRoot, name, current);
+    gitText(repoRoot, ["checkout", "--quiet", name]);
+    let behind = Number(gitText(
+      repoRoot,
+      ["rev-list", "--count", `${name}..${current}`]
+    ));
+    const fastForwarded = contained && behind > 0;
+    if (fastForwarded) {
+      gitText(repoRoot, ["merge", "--ff-only", "--quiet", current]);
+      behind = 0;
+    }
+    return {
+      branch: name,
+      created: false,
+      resumed: true,
+      behind,
+      fastForwarded,
+      launchBranch: current,
+      forkedFrom: defaultBranch
+    };
+  }
+  gitText(repoRoot, ["checkout", "--quiet", "-b", name]);
+  return {
+    branch: name,
+    created: true,
+    resumed: false,
+    behind: 0,
+    fastForwarded: false,
+    launchBranch: current,
+    forkedFrom: defaultBranch
+  };
+}
+__name(prepareIntegrationBranch, "prepareIntegrationBranch");
+function describeIntegrationBranch(repoRoot, features) {
+  const current = getCurrentBranch(repoRoot);
+  const name = planIntegrationBranch(
+    current,
+    getDefaultBranch(repoRoot),
+    features
+  );
+  if (!name) return `Branch:       merges into ${current}`;
+  return localBranchExists(repoRoot, name) ? `Branch:       would resume ${name}` : `Branch:       would create ${name} from ${current}`;
+}
+__name(describeIntegrationBranch, "describeIntegrationBranch");
 async function branchExists(repoRoot, branchName) {
   try {
     await execFileAsync(
@@ -51,16 +174,20 @@ function buildBranchName(repoName, ticket) {
   return `${repoName}--${prefix}${num}-${ticket.slug}`;
 }
 __name(buildBranchName, "buildBranchName");
-async function createWorktreeNow(opts) {
-  const { repoRoot, repoName, baseBranch, ticket } = opts;
-  const branchName = buildBranchName(repoName, ticket);
-  const num = String(ticket.num).padStart(2, "0");
-  const prefix = ticket.feature ? `${ticket.feature}-` : "";
-  const worktreePath = join(
-    repoRoot,
-    "..",
-    `${repoName}.${prefix}${num}-${ticket.slug}`
-  );
+async function removeWorktreeNow(worktreePath, opts) {
+  const args = [
+    "-C",
+    worktreePath,
+    "worktree",
+    "remove"
+  ];
+  if (opts?.force) args.push("--force");
+  args.push(worktreePath);
+  await execFileAsync("git", args);
+}
+__name(removeWorktreeNow, "removeWorktreeNow");
+async function addWorktreeNow(opts) {
+  const { repoRoot, baseBranch, branchName, worktreePath } = opts;
   if (existsSync(worktreePath)) {
     try {
       await execFileAsync(
@@ -100,36 +227,56 @@ async function createWorktreeNow(opts) {
   );
   return { worktreePath, branchName };
 }
-__name(createWorktreeNow, "createWorktreeNow");
+__name(addWorktreeNow, "addWorktreeNow");
 let worktreeQueue = Promise.resolve();
-function createWorktree(opts) {
-  const result = worktreeQueue.then(() => createWorktreeNow(opts));
+function enqueue(fn) {
+  const result = worktreeQueue.then(fn);
   worktreeQueue = result.catch(() => {
   });
   return result;
 }
+__name(enqueue, "enqueue");
+function createWorktree(opts) {
+  const { repoRoot, repoName, ticket } = opts;
+  const num = String(ticket.num).padStart(2, "0");
+  const prefix = ticket.feature ? `${ticket.feature}-` : "";
+  return enqueue(() => addWorktreeNow({
+    repoRoot,
+    baseBranch: opts.baseBranch,
+    branchName: buildBranchName(repoName, ticket),
+    worktreePath: join(
+      repoRoot,
+      "..",
+      `${repoName}.${prefix}${num}-${ticket.slug}`
+    )
+  }));
+}
 __name(createWorktree, "createWorktree");
-async function removeWorktreeNow(worktreePath, opts) {
-  const args = [
-    "-C",
-    worktreePath,
-    "worktree",
-    "remove"
-  ];
-  if (opts?.force) args.push("--force");
-  args.push(worktreePath);
-  await execFileAsync("git", args);
+function createNamedWorktree(opts) {
+  const { repoRoot, repoName, name } = opts;
+  return enqueue(() => addWorktreeNow({
+    repoRoot,
+    baseBranch: opts.baseBranch,
+    branchName: `${repoName}--${name}`,
+    worktreePath: join(repoRoot, "..", `${repoName}.${name}`)
+  }));
 }
-__name(removeWorktreeNow, "removeWorktreeNow");
+__name(createNamedWorktree, "createNamedWorktree");
 function removeWorktree(worktreePath, opts) {
-  const result = worktreeQueue.then(
-    () => removeWorktreeNow(worktreePath, opts)
-  );
-  worktreeQueue = result.catch(() => {
-  });
-  return result;
+  return enqueue(() => removeWorktreeNow(worktreePath, opts));
 }
 __name(removeWorktree, "removeWorktree");
+function deleteBranch(repoRoot, name) {
+  return enqueue(async () => {
+    if (!await branchExists(repoRoot, name)) return;
+    await execFileAsync(
+      "git",
+      ["branch", "-D", name],
+      { cwd: repoRoot }
+    );
+  });
+}
+__name(deleteBranch, "deleteBranch");
 function hasNewCommits(repoRoot, base, branch) {
   const stdout = execFileSync(
     "git",
@@ -139,6 +286,51 @@ function hasNewCommits(repoRoot, base, branch) {
   return Number(stdout.trim()) > 0;
 }
 __name(hasNewCommits, "hasNewCommits");
+function headCommit(cwd) {
+  return gitText(cwd, ["rev-parse", "HEAD"]);
+}
+__name(headCommit, "headCommit");
+function mergeBase(cwd, a, b) {
+  try {
+    return gitText(cwd, ["merge-base", a, b]) || null;
+  } catch {
+    return null;
+  }
+}
+__name(mergeBase, "mergeBase");
+function isAncestor(cwd, ancestor, of) {
+  try {
+    execFileSync(
+      "git",
+      ["merge-base", "--is-ancestor", ancestor, of],
+      { cwd, stdio: "ignore" }
+    );
+    return true;
+  } catch {
+    return false;
+  }
+}
+__name(isAncestor, "isAncestor");
+function hasChangesOutside(cwd, from, to, excludeDir) {
+  try {
+    execFileSync(
+      "git",
+      [
+        "diff",
+        "--quiet",
+        `${from}..${to}`,
+        "--",
+        ".",
+        `:(exclude)${excludeDir}`
+      ],
+      { cwd, stdio: "ignore" }
+    );
+    return false;
+  } catch {
+    return true;
+  }
+}
+__name(hasChangesOutside, "hasChangesOutside");
 function isDirty(cwd) {
   const stdout = execFileSync(
     "git",
@@ -183,13 +375,25 @@ __name(listWorktrees, "listWorktrees");
 export {
   buildBranchName,
   commitDirty,
+  createNamedWorktree,
   createWorktree,
+  deleteBranch,
+  describeIntegrationBranch,
   getCurrentBranch,
+  getDefaultBranch,
   getRepoName,
   getRepoRoot,
+  hasChangesOutside,
   hasNewCommits,
+  headCommit,
+  integrationBranchName,
+  isAncestor,
   isDirty,
   listWorktrees,
+  localBranchExists,
+  mergeBase,
+  planIntegrationBranch,
+  prepareIntegrationBranch,
   removeWorktree
 };
 //# sourceMappingURL=worktree.js.map