@on-par/factory-cli 0.9.8-next.7 → 0.9.8-next.70

package/dist/cli/worktree-reap.js

@@ -0,0 +1,72 @@
+// packages/cli/src/cli/worktree-reap.ts — eager lane-worktree reaps (#1007, #3008), moved out of index.ts
+import { resolveSandboxPolicy } from '@on-par/factory-core';
+import { logEvent, resolveEffectiveConfig, withFileLock, withGitLock, worktreeSandboxFor, } from '@on-par/factory-core/internal';
+/** The repo's current docker-sandbox descriptor for worktree-gc sweeps, or undefined for
+ *  every other runtime/config state (including a fixture config with no `sandbox` key). */
+export function gcWorktreeSandbox(sandboxCfg, repoRoot) {
+    if (!sandboxCfg)
+        return undefined;
+    const policy = resolveSandboxPolicy(sandboxCfg, { worktree: repoRoot, repoRoot });
+    return worktreeSandboxFor(policy?.runtime);
+}
+/** Shared body of both reaps: resolves the lane's conventional worktree under the git+file
+ *  lock pairing every worktree mutation site uses. Failures are logged as a warn and never surface. */
+async function reapUnderLock(rt, [issue, repoRoot, ghRepo, paths, prefixOverride], failure, reap) {
+    let worktreePath;
+    try {
+        const factoryConfig = rt.configLoaders.loadFactoryConfigForRepo(paths.config);
+        const branchPrefix = prefixOverride ?? resolveEffectiveConfig(rt.configLoaders.loadRepoConfig(repoRoot)).branchPrefix;
+        const resolved = rt.worktreePathFor(repoRoot, ghRepo, issue, branchPrefix);
+        worktreePath = resolved;
+        const log = (type, msg) => logEvent(paths.events, type, issue, msg);
+        const sandbox = gcWorktreeSandbox(factoryConfig.sandbox, repoRoot);
+        const result = await withGitLock(repoRoot, () => withFileLock(paths.gitLock, () => reap(resolved, { issue, branchPrefix, log, sandbox })));
+        return { worktreePath, result };
+    }
+    catch (err) {
+        logEvent(paths.events, 'warn', issue, `${failure}: ${err?.message ?? String(err)}`);
+        return { worktreePath, result: undefined };
+    }
+}
+/** Eagerly reaps a parked lane's own worktree inside `factory run` (#1007). All the safety
+ *  gates live in reapLaneWorktree. A reap failure is logged as a warn and never surfaces —
+ *  parking must always succeed. */
+export async function reapParkedLane(rt, reap, args) {
+    await reapUnderLock(rt, args, 'parked-lane worktree reap failed', (worktreePath, opts) => reap(args[1], worktreePath, opts));
+}
+/** The one run-output line for a PR-less ship's reap: where the worktree is and why it was kept
+ *  or removed (#3009). `undefined` means the reap threw, so the state is unknown. */
+export function formatShipReapLine(worktreePath, result) {
+    const unverified = `📌 Kept worktree ${worktreePath} — its state could not be verified, so nothing was removed`;
+    if (result === undefined)
+        return unverified;
+    const withBranch = result.branch ? ` and branch ${result.branch}` : '';
+    switch (result.outcome) {
+        case 'removed':
+            return `🧹 Removed worktree ${worktreePath}${result.branchDeleted ? ` and branch ${result.branch}` : ''} — no PR was opened and nothing was committed`;
+        case 'kept-dirty':
+            return `📌 Kept worktree ${worktreePath}${withBranch} — it has uncommitted changes`;
+        case 'kept-committed':
+            return `📌 Kept worktree ${worktreePath}${withBranch} — it has commits beyond the base`;
+        case 'kept-branch-mismatch':
+            return `📌 Kept worktree ${worktreePath} — it is on '${result.branch}', not this issue's lane branch`;
+        case 'kept-unverified':
+            return unverified;
+        case 'absent':
+            return null;
+    }
+}
+/** Removes a one-shot `factory ship`'s worktree and branch when it ended without a PR and left
+ *  them clean with no commits (#3008). All safety gates live in reapCleanShipWorktree; a
+ *  failure is logged as a warn and never changes the ship's exit. */
+export async function reapPrlessShip(rt, reap, args) {
+    const done = await reapUnderLock(rt, args, 'PR-less ship worktree cleanup failed', (worktreePath, opts) => reap(args[1], worktreePath, opts));
+    if (done.worktreePath === undefined) {
+        console.log(`📌 Kept the worktree for issue #${args[0]} — its state could not be verified, so nothing was removed`);
+        return;
+    }
+    const line = formatShipReapLine(done.worktreePath, done.result);
+    if (line !== null)
+        console.log(line);
+}
+//# sourceMappingURL=worktree-reap.js.map

package/dist/cli/worktree-reap.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"worktree-reap.js","sourceRoot":"","sources":["../../src/cli/worktree-reap.ts"],"names":[],"mappings":"AAAA,0GAA0G;AAG1G,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAGL,QAAQ,EACR,sBAAsB,EAGtB,YAAY,EACZ,WAAW,EACX,kBAAkB,GACnB,MAAM,+BAA+B,CAAC;AAYvC;2FAC2F;AAC3F,MAAM,UAAU,iBAAiB,CAC/B,UAAgD,EAChD,QAAgB;IAEhB,IAAI,CAAC,UAAU;QAAE,OAAO,SAAS,CAAC;IAClC,MAAM,MAAM,GAAG,oBAAoB,CAAC,UAAU,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;IAClF,OAAO,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAC7C,CAAC;AAED;uGACuG;AACvG,KAAK,UAAU,aAAa,CAC1B,EAAe,EACf,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,CAAsD,EACrG,OAAe,EACf,IAAwF;IAExF,IAAI,YAAgC,CAAC;IACrC,IAAI,CAAC;QACH,MAAM,aAAa,GAAG,EAAE,CAAC,aAAa,CAAC,wBAAwB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC9E,MAAM,YAAY,GAChB,cAAc,IAAI,sBAAsB,CAAC,EAAE,CAAC,aAAa,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC;QACnG,MAAM,QAAQ,GAAG,EAAE,CAAC,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;QAC3E,YAAY,GAAG,QAAQ,CAAC;QACxB,MAAM,GAAG,GAAG,CAAC,IAAe,EAAE,GAAW,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;QACvF,MAAM,OAAO,GAAG,iBAAiB,CAAC,aAAa,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QACnE,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,QAAQ,EAAE,GAAG,EAAE,CAC9C,YAAY,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC,CACzF,CAAC;QACF,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC;IAClC,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAClB,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,KAAK,GAAG,EAAE,OAAO,IAAI,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACpF,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;IAC7C,CAAC;AACH,CAAC;AAED;;mCAEmC;AACnC,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,EAAe,EACf,IAA6B,EAC7B,IAAyC;IAEzC,MAAM,aAAa,CAAC,EAAE,EAAE,IAAI,EAAE,kCAAkC,EAAE,CAAC,YAAY,EAAE,IAAI,EAAE,EAAE,CACvF,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,CAClC,CAAC;AACJ,CAAC;AAED;qFACqF;AACrF,MAAM,UAAU,kBAAkB,CAAC,YAAoB,EAAE,MAA0C;IACjG,MAAM,UAAU,GAAG,oBAAoB,YAAY,4DAA4D,CAAC;IAChH,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,UAAU,CAAC;IAC5C,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,eAAe,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACvE,QAAQ,MAAM,CAAC,OAAO,EAAE,CAAC;QACvB,KAAK,SAAS;YACZ,OAAO,uBAAuB,YAAY,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,eAAe,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,+CAA+C,CAAC;QACzJ,KAAK,YAAY;YACf,OAAO,oBAAoB,YAAY,GAAG,UAAU,+BAA+B,CAAC;QACtF,KAAK,gBAAgB;YACnB,OAAO,oBAAoB,YAAY,GAAG,UAAU,mCAAmC,CAAC;QAC1F,KAAK,sBAAsB;YACzB,OAAO,oBAAoB,YAAY,gBAAgB,MAAM,CAAC,MAAM,iCAAiC,CAAC;QACxG,KAAK,iBAAiB;YACpB,OAAO,UAAU,CAAC;QACpB,KAAK,QAAQ;YACX,OAAO,IAAI,CAAC;IAChB,CAAC;AACH,CAAC;AAED;;qEAEqE;AACrE,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,EAAe,EACf,IAAkC,EAClC,IAAyC;IAEzC,MAAM,IAAI,GAAG,MAAM,aAAa,CAAC,EAAE,EAAE,IAAI,EAAE,sCAAsC,EAAE,CAAC,YAAY,EAAE,IAAI,EAAE,EAAE,CACxG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,CAClC,CAAC;IACF,IAAI,IAAI,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;QACpC,OAAO,CAAC,GAAG,CAAC,mCAAmC,IAAI,CAAC,CAAC,CAAC,4DAA4D,CAAC,CAAC;QACpH,OAAO;IACT,CAAC;IACD,MAAM,IAAI,GAAG,kBAAkB,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAChE,IAAI,IAAI,KAAK,IAAI;QAAE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AACvC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@on-par/factory-cli",
-  "version": "0.9.8-next.7",
+  "version": "0.9.8-next.70",
   "description": "On PAR Dev's Software Factory CLI: takes a GitHub issue through plan, build and check with AI agents, then opens a ready-for-review PR.",
   "keywords": [
     "ai-agents",
@@ -47,8 +47,8 @@
     "@octokit/plugin-retry": "^8.1.1",
     "@octokit/plugin-throttling": "^11.0.5",
     "@octokit/rest": "^22.0.0",
-    "@on-par/factory-core": "0.9.8-next.7",
-    "@on-par/factory-tui": "0.9.8-next.7",
+    "@on-par/factory-core": "0.9.8-next.70",
+    "@on-par/factory-tui": "0.9.8-next.70",
     "commander": "^15.0.0"
   },
   "license": "MIT",