@on-par/factory-cli 0.9.8-next.52 → 0.9.8-next.54

package/dist/cli/worktree-reap.d.ts

@@ -0,0 +1,28 @@
+import type { FactoryConfig, getFactoryPaths } from '@on-par/factory-core';
+import { type WorktreeSandbox, type reapCleanShipWorktree, type reapLaneWorktree } from '@on-par/factory-core/internal';
+import type { CliDeps } from './index.js';
+type Paths = ReturnType<typeof getFactoryPaths>;
+/** What the reaps read from index.ts's per-invocation state, passed in so they stay cycle-free. */
+export interface ReapRuntime {
+    configLoaders: Required<Pick<CliDeps, 'loadFactoryConfigForRepo' | 'loadRepoConfig'>>;
+    worktreePathFor: (repoRoot: string, ghRepo: string, issue: number, prefix?: string) => string;
+}
+/** 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 declare function gcWorktreeSandbox(sandboxCfg: FactoryConfig['sandbox'] | undefined, repoRoot: string): WorktreeSandbox | undefined;
+/** 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. */
+declare function reapUnderLock<R>(rt: ReapRuntime, [issue, repoRoot, ghRepo, paths, prefixOverride]: [number, string, string, Paths, string | undefined], failure: string, reap: (worktreePath: string, opts: Parameters<typeof reapLaneWorktree>[2]) => Promise<R>): Promise<{
+    worktreePath: string;
+    result: R;
+} | 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 declare function reapParkedLane(rt: ReapRuntime, reap: typeof reapLaneWorktree, args: Parameters<typeof reapUnderLock>[1]): Promise<void>;
+/** 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 declare function reapPrlessShip(rt: ReapRuntime, reap: typeof reapCleanShipWorktree, args: Parameters<typeof reapUnderLock>[1]): Promise<void>;
+export {};
+//# sourceMappingURL=worktree-reap.d.ts.map

package/dist/cli/worktree-reap.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"worktree-reap.d.ts","sourceRoot":"","sources":["../../src/cli/worktree-reap.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAa,aAAa,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEtF,OAAO,EACL,KAAK,eAAe,EAGpB,KAAK,qBAAqB,EAC1B,KAAK,gBAAgB,EAItB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAE1C,KAAK,KAAK,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC;AAEhD,mGAAmG;AACnG,MAAM,WAAW,WAAW;IAC1B,aAAa,EAAE,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,0BAA0B,GAAG,gBAAgB,CAAC,CAAC,CAAC;IACtF,eAAe,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;CAC/F;AAED;2FAC2F;AAC3F,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,aAAa,CAAC,SAAS,CAAC,GAAG,SAAS,EAChD,QAAQ,EAAE,MAAM,GACf,eAAe,GAAG,SAAS,CAI7B;AAED;uGACuG;AACvG,iBAAe,aAAa,CAAC,CAAC,EAC5B,EAAE,EAAE,WAAW,EACf,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC,EACrG,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,CAAC,OAAO,gBAAgB,CAAC,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GACvF,OAAO,CAAC;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,CAAC,CAAA;CAAE,GAAG,SAAS,CAAC,CAgB1D;AAED;;mCAEmC;AACnC,wBAAsB,cAAc,CAClC,EAAE,EAAE,WAAW,EACf,IAAI,EAAE,OAAO,gBAAgB,EAC7B,IAAI,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC,CAAC,CAAC,GACxC,OAAO,CAAC,IAAI,CAAC,CAIf;AAED;;qEAEqE;AACrE,wBAAsB,cAAc,CAClC,EAAE,EAAE,WAAW,EACf,IAAI,EAAE,OAAO,qBAAqB,EAClC,IAAI,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC,CAAC,CAAC,GACxC,OAAO,CAAC,IAAI,CAAC,CASf"}

package/dist/cli/worktree-reap.js

@@ -0,0 +1,44 @@
+// 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) {
+    try {
+        const factoryConfig = rt.configLoaders.loadFactoryConfigForRepo(paths.config);
+        const branchPrefix = prefixOverride ?? resolveEffectiveConfig(rt.configLoaders.loadRepoConfig(repoRoot)).branchPrefix;
+        const worktreePath = rt.worktreePathFor(repoRoot, ghRepo, issue, branchPrefix);
+        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(worktreePath, { issue, branchPrefix, log, sandbox })));
+        return { worktreePath, result };
+    }
+    catch (err) {
+        logEvent(paths.events, 'warn', issue, `${failure}: ${err?.message ?? String(err)}`);
+        return 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));
+}
+/** 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?.result.outcome === 'removed') {
+        console.log(`🧹 Removed worktree ${done.worktreePath}${done.result.branchDeleted ? ` and branch ${done.result.branch}` : ''} — no PR was opened and nothing was committed`);
+    }
+}
+//# 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":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@on-par/factory-cli",
-  "version": "0.9.8-next.52",
+  "version": "0.9.8-next.54",
   "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.52",
-    "@on-par/factory-tui": "0.9.8-next.52",
+    "@on-par/factory-core": "0.9.8-next.54",
+    "@on-par/factory-tui": "0.9.8-next.54",
     "commander": "^15.0.0"
   },
   "license": "MIT",