@on-par/factory-cli 0.9.14-next.4 → 0.9.14-next.40

package/dist/cli/worktree-keep.js

@@ -0,0 +1,47 @@
+// packages/cli/src/cli/worktree-keep.ts — `factory worktree keep|release` and the re-queue release (#3318)
+import { existsSync } from 'node:fs';
+import { findWorktreeKeep, removeWorktreeKeep, upsertWorktreeKeep } from '@on-par/factory-core/internal';
+import { CliExitError } from './index.js';
+const direct = (fn) => fn();
+/** Writes a keep record for the issue's lane worktree so GC and the park-time reap leave it alone. */
+export async function runWorktreeKeep(issue, opts, deps) {
+    const { pathExists = existsSync, now = () => new Date(), out = console.log, withLock = direct } = deps;
+    const reason = opts.reason ?? 'manual';
+    if (reason.trim() === '')
+        throw new CliExitError('factory worktree keep: --reason must not be empty', 2);
+    const path = await deps.worktreePath(issue);
+    if (!pathExists(path)) {
+        throw new CliExitError(`factory worktree keep: #${issue} has no lane worktree (looked for ${path})`, 2);
+    }
+    await withLock(async () => upsertWorktreeKeep(deps.keepsFile, { issue, path, reason: reason.trim(), since: now().toISOString() }));
+    out(`kept ${path} for #${issue} (${reason.trim()}) — worktree gc leaves it until the issue closes or 'factory worktree release ${issue}'`);
+}
+/** Drops the issue's keep record; true when one existed. Never creates the keeps file. */
+export async function runWorktreeRelease(issue, deps) {
+    const { out = console.log, withLock = direct } = deps;
+    const had = await withLock(async () => {
+        const found = findWorktreeKeep(deps.keepsFile, issue);
+        if (found)
+            removeWorktreeKeep(deps.keepsFile, issue);
+        return found;
+    });
+    if (had) {
+        out(`released the keep record for #${issue} (${had.reason}) — the next worktree gc treats ${had.path} normally`);
+    }
+    else {
+        out(`#${issue} had no keep record — nothing to release`);
+    }
+    return had !== undefined;
+}
+/** Best-effort: the factory owns the worktree again once the lane re-queues the issue. Never throws. */
+export function releaseKeepOnRequeue(keepsFile, issue, warn) {
+    if (keepsFile === undefined)
+        return;
+    try {
+        removeWorktreeKeep(keepsFile, issue);
+    }
+    catch (err) {
+        warn?.(`could not drop the keep record for #${issue}: ${err instanceof Error ? err.message : String(err)}`);
+    }
+}
+//# sourceMappingURL=worktree-keep.js.map

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

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

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

@@ -17,7 +17,7 @@ declare function reapUnderLock<R>(rt: ReapRuntime, [issue, repoRoot, ghRepo, pat
     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 —
+ *  gates, the keep record included, 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>;
 /** The one run-output line for a PR-less ship's reap: where the worktree is and why it was kept

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

@@ -1 +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,sBAAsB,EAE3B,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,GAAG,SAAS,CAAC;IAAC,MAAM,EAAE,CAAC,GAAG,SAAS,CAAA;CAAE,CAAC,CAkBtE;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,CAef;AAED;qFACqF;AACrF,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,sBAAsB,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAkBlH;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,CAUf"}
+{"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,sBAAsB,EAC3B,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,GAAG,SAAS,CAAC;IAAC,MAAM,EAAE,CAAC,GAAG,SAAS,CAAA;CAAE,CAAC,CAoBtE;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;qFACqF;AACrF,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,sBAAsB,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAsBlH;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

@@ -1,6 +1,6 @@
 // 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 { findWorktreeKeep, logEvent, resolveEffectiveConfig, withFileLock, withGitLock, worktreeSandboxFor, } from '@on-par/factory-core/internal';
+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) {
@@ -20,7 +20,7 @@ async function reapUnderLock(rt, [issue, repoRoot, ghRepo, paths, prefixOverride
         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 })));
+        const result = await withGitLock(repoRoot, () => withFileLock(paths.gitLock, () => reap(resolved, { issue, branchPrefix, log, sandbox, keepsFile: paths.worktreeKeeps })));
         return { worktreePath, result };
     }
     catch (err) {
@@ -29,15 +29,9 @@ async function reapUnderLock(rt, [issue, repoRoot, ghRepo, paths, prefixOverride
     }
 }
 /** 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 —
+ *  gates, the keep record included, 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) {
-    const [issue, , , paths] = args;
-    const keep = findWorktreeKeep(paths.worktreeKeeps, issue, (type, msg) => logEvent(paths.events, type, issue, msg));
-    if (keep) {
-        logEvent(paths.events, 'worktree-gc', issue, `kept ${keep.path} — kept (${keep.reason}); not reaping the parked lane's worktree or branch`);
-        return;
-    }
     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
@@ -52,6 +46,10 @@ export function formatShipReapLine(worktreePath, result) {
             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-untracked':
+            return `📌 Kept worktree ${worktreePath}${withBranch} — it has untracked files`;
+        case 'kept-record':
+            return `📌 Kept worktree ${worktreePath}${withBranch} — it has a keep record`;
         case 'kept-committed':
             return `📌 Kept worktree ${worktreePath}${withBranch} — it has commits beyond the base`;
         case 'kept-branch-mismatch':
@@ -67,10 +65,10 @@ export function formatShipReapLine(worktreePath, result) {
  *  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`);
+    // No path means the config load failed, so ship never resolved (or created) a worktree here;
+    // the failure is already logged as a warn event by reapUnderLock.
+    if (done.worktreePath === undefined)
         return;
-    }
     const line = formatShipReapLine(done.worktreePath, done.result);
     if (line !== null)
         console.log(line);

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

@@ -1 +1 @@
-{"version":3,"file":"worktree-reap.js","sourceRoot":"","sources":["../../src/cli/worktree-reap.ts"],"names":[],"mappings":"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"}
+{"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.14-next.4",
+  "version": "0.9.14-next.40",
   "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",
@@ -48,9 +48,9 @@
     "@octokit/plugin-retry": "^8.1.1",
     "@octokit/plugin-throttling": "^11.0.5",
     "@octokit/rest": "^22.0.0",
-    "@on-par/factory-config": "0.9.14-next.4",
-    "@on-par/factory-core": "0.9.14-next.4",
-    "@on-par/factory-tui": "0.9.14-next.4",
+    "@on-par/factory-config": "0.9.14-next.40",
+    "@on-par/factory-core": "0.9.14-next.40",
+    "@on-par/factory-tui": "0.9.14-next.40",
     "commander": "^15.0.0",
     "zod": "^4.6.5"
   },

package/schemas/cost.schema.json

@@ -29,6 +29,9 @@
           "outputTokens": {
             "type": "number"
           },
+          "rawInputTokens": {
+            "type": ["number", "null"]
+          },
           "cacheReadTokens": {
             "type": ["number", "null"]
           },
@@ -46,6 +49,7 @@
           "model",
           "inputTokens",
           "outputTokens",
+          "rawInputTokens",
           "cacheReadTokens",
           "cacheCreationTokens",
           "cost"
@@ -70,6 +74,15 @@
           "outputTokens": {
             "type": "number"
           },
+          "rawInputTokens": {
+            "type": "number"
+          },
+          "cacheReadTokens": {
+            "type": "number"
+          },
+          "cacheCreationTokens": {
+            "type": "number"
+          },
           "cost": {
             "type": ["number", "null"]
           },
@@ -85,6 +98,9 @@
           "tasks",
           "inputTokens",
           "outputTokens",
+          "rawInputTokens",
+          "cacheReadTokens",
+          "cacheCreationTokens",
           "cost",
           "unpricedCount",
           "cachedRateMissingCount"
@@ -103,9 +119,31 @@
         },
         "cachedRateMissingCount": {
           "type": "number"
+        },
+        "tokens": {
+          "type": "object",
+          "properties": {
+            "input": {
+              "type": "number"
+            },
+            "output": {
+              "type": "number"
+            },
+            "rawInput": {
+              "type": "number"
+            },
+            "cacheRead": {
+              "type": "number"
+            },
+            "cacheCreation": {
+              "type": "number"
+            }
+          },
+          "required": ["input", "output", "rawInput", "cacheRead", "cacheCreation"],
+          "additionalProperties": false
         }
       },
-      "required": ["cost", "unpricedCount", "cachedRateMissingCount"],
+      "required": ["cost", "unpricedCount", "cachedRateMissingCount", "tokens"],
       "additionalProperties": false
     }
   },

package/schemas/daemon-status.schema.json

@@ -37,8 +37,51 @@
         "required": ["slug", "checkoutPath", "state"],
         "additionalProperties": false
       }
+    },
+    "load": {
+      "type": "object",
+      "properties": {
+        "activeRuns": {
+          "anyOf": [
+            {
+              "type": "integer",
+              "minimum": 0,
+              "maximum": 9007199254740991
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "maxSlots": {
+          "anyOf": [
+            {
+              "type": "integer",
+              "exclusiveMinimum": 0,
+              "maximum": 9007199254740991
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "queueDepth": {
+          "anyOf": [
+            {
+              "type": "integer",
+              "minimum": 0,
+              "maximum": 9007199254740991
+            },
+            {
+              "type": "null"
+            }
+          ]
+        }
+      },
+      "required": ["activeRuns", "maxSlots", "queueDepth"],
+      "additionalProperties": false
     }
   },
-  "required": ["schemaVersion", "running", "pid", "uptimeSec", "plistInstalled", "repos"],
+  "required": ["schemaVersion", "running", "pid", "uptimeSec", "plistInstalled", "repos", "load"],
   "additionalProperties": false
 }

package/schemas/logs-line.schema.json

@@ -76,6 +76,16 @@
       "properties": {},
       "additionalProperties": {}
     },
+    "park": {
+      "type": "object",
+      "properties": {},
+      "additionalProperties": {}
+    },
+    "providerCapped": {
+      "type": "object",
+      "properties": {},
+      "additionalProperties": {}
+    },
     "stewardTriggered": {
       "type": "object",
       "properties": {},