@on-par/factory-cli 0.9.14-next.9 → 0.9.14

package/dist/cli/index.js

@@ -62,6 +62,7 @@ import { DeepCheckError, createDeepModelRunner, runIssueCheck } from './ready-ch
 import { childRunSucceeded, formatChildRunSummary, runChildrenInOrder } from './run-children.js';
 import { readRunFlagOverrides, recordDraftPrFlag } from './run-flags.js';
 import { runStalenessGuard } from './staleness.js';
+import { runWorktreeKeep, runWorktreeRelease } from './worktree-keep.js';
 import { gcWorktreeSandbox, reapParkedLane, reapPrlessShip } from './worktree-reap.js';
 const DEFAULT_CONFIG_LOADERS = {
     loadModelsConfig,
@@ -1947,6 +1948,28 @@ export async function cmdWorktreeGc(opts) {
     const report = opts.dryRun ? await run() : await withGitLock(repoRoot, () => withFileLock(paths.gitLock, run));
     console.log(internalOps.formatGcReport(report));
 }
+/** `factory worktree keep <issue>` (#3318): protect the lane worktree from GC while finishing by hand. */
+export async function cmdWorktreeKeep(issueArg, opts) {
+    const issue = parseIssueArg(issueArg);
+    const repoRoot = await getRepoRoot();
+    const paths = getFactoryPaths(repoRoot);
+    const ghRepo = await getGitHubRepo();
+    const branchPrefix = branchPrefixOrExit(opts.branchPrefix);
+    await runWorktreeKeep(issue, { reason: opts.reason }, {
+        keepsFile: paths.worktreeKeeps,
+        worktreePath: (n) => worktreePathFor(repoRoot, ghRepo, n, branchPrefix),
+        withLock: (fn) => withFileLock(paths.gitLock, fn),
+    });
+}
+/** `factory worktree release <issue>` (#3318): drop the issue's keep record. */
+export async function cmdWorktreeRelease(issueArg) {
+    const issue = parseIssueArg(issueArg);
+    const paths = getFactoryPaths(await getRepoRoot());
+    await runWorktreeRelease(issue, {
+        keepsFile: paths.worktreeKeeps,
+        withLock: (fn) => withFileLock(paths.gitLock, fn),
+    });
+}
 /** `factory reset <issue...>` (#1787): wipes an issue's local state; see reset.ts. */
 export async function cmdReset(issues, opts) {
     let nums;
@@ -2207,6 +2230,8 @@ export async function cmdUnpark(issueArg, opts = {}) {
     try {
         const [owner, repo] = (await getGitHubRepo()).split('/');
         result = await runUnpark({
+            keepsFile: getFactoryPaths(await getRepoRoot()).worktreeKeeps,
+            warn: (msg) => console.error(styleText('yellow', `factory: ${msg}`)),
             client: createOctokitQueueClient(getOctokit()),
             owner,
             repo,
@@ -2598,6 +2623,7 @@ export function laneQueueDeps(queue, lane) {
         releaseIssue: (issue, outcome) => queue.release(issue, outcome),
         heartbeat: (issue) => queue.heartbeat(issue),
         countRemaining: async () => (await queue.list(lane)).length,
+        queueChildren: (parent, children) => queue.enqueueAfter(lane, parent, children),
     };
 }
 export { preflightQueuedIssue };
@@ -2764,9 +2790,10 @@ export async function superviseLoop(deps) {
             else {
                 pct = reading.pct;
                 source = reading.source;
+                let detail = reading.detail;
                 if (cycle > 1 || !now) {
                     while (pct >= resumeAt) {
-                        writeLine(`[factory] supervise: trailing usage (${source}) ${Math.round(pct * 100)}% >= resume gate ${Math.round(resumeAt * 100)}% — waiting ${pollMs / 1000}s`);
+                        writeLine(`[factory] supervise: trailing usage (${source}) ${Math.round(pct * 100)}% >= resume gate ${Math.round(resumeAt * 100)}% (${detail}) — waiting ${pollMs / 1000}s`);
                         await sleep(pollMs);
                         reading = await readUsageFn();
                         if (reading === null) {
@@ -2777,6 +2804,7 @@ export async function superviseLoop(deps) {
                         }
                         pct = reading.pct;
                         source = reading.source;
+                        detail = reading.detail;
                     }
                 }
             }
@@ -3135,6 +3163,8 @@ export const PROGRAM_HANDLERS = {
     cmdDaemonLogs,
     cmdSelfUpdateCheck,
     cmdWorktreeGc,
+    cmdWorktreeKeep,
+    cmdWorktreeRelease,
     cmdReset,
     cmdSupervise: runSupervise,
     cmdStop,