@ai-dossier/sched 0.48.0 → 0.48.1

package/README.md

@@ -1124,6 +1124,8 @@ import {
   TRANSITIONS,           // the transition tables themselves (for previews)
   buildStatusReport,     // machine-readable status incl. blocked/failed sets
                          //   (+ optional `anchorSweep` → `anchors`, #768; null without it)
+                         //   (+ optional `worktreeReader` → `kept-worktree` warnings, #791)
+  keptWorktreeCandidates, buildKeptWorktreeWarnings, defaultKeptWorktreeReader,  // #791
   sweepAnchors, classifyAnchor, membersShippedVerdict, anchorLedgerBlockers,
   shippingEvidence,      // #768 anchor-close predicate (pure; readers injected)
   closeAnchor,           // #768 idempotent comment-then-close, `-R <repo>` explicit
@@ -1327,10 +1329,14 @@ after-the-fact recovery, not a missing-data bug.
   can be manual (`sched pause`) or automatic (dispatch-health, #505/#629 above); `sched
   resume` clears the flag and both dispatch-health streaks.
 
-## Status health warnings (#776)
+## Status health warnings (#776, #791)
 
-`sched status` (and `warnings[]` in `--json`, built by `buildStatusWarnings`) flags state
-nobody came back to, each with its exact remedy:
+`sched status` (and `warnings[]` in `--json`) flags state nobody came back to, each with
+its exact remedy. Most kinds come from `buildStatusWarnings`, pure over state + engine
+lease + clock; `kept-worktree` (below) comes from the separate `buildKeptWorktreeWarnings`,
+since it needs local git/fs reads — it only appears when the caller passes a
+`KeptWorktreeReader` to `buildStatusReport` (the CLI always does; a test harness omits it
+to skip the check entirely):
 
 - **`long-pause`** — paused for more than 24 h (`STATUS_HEALTH_WARNING_AGE_MS`), measured
   from `paused_at`, which `setPaused` stamps on the running → paused edge and clears on
@@ -1344,6 +1350,25 @@ nobody came back to, each with its exact remedy:
   closed issue sets the entry's sticky `stale_closed_at`, journals `stale-closed` once, and
   the recovery rail never respawns it (even after `sched resume`). Report slots are exempt:
   their issue is closed at merge by design. Remedy: `sched stop --issue N`.
+- **`kept-worktree`** (#791) — a `done` batch whose `worktree` or `member_worktree` is
+  still set in the ledger: the `members-closed` stale-blocked reconcile below
+  intentionally leaves it in place (it may hold unpushed operator repair work), and
+  nothing else surfaced it until now. For each kept path, `sched status` reports:
+  whether it still exists on disk; whether it is pool-claimed (the claim is held
+  indefinitely until returned); and, via two local, read-only `git` probes scoped to
+  that worktree's own `HEAD` (`git --no-optional-locks status --porcelain`, `git log
+  HEAD --not --remotes`), whether it has uncommitted or unpushed work. The remedy is the
+  exact `git worktree remove <path>` or `worktree-pool return --path <path>` command,
+  properly shell-quoted — report-only, never executed. `reconcileKeptWorktrees`
+  (`batch-dispatch.ts`, run every tick) separately clears the ledger's `worktree`/
+  `pool_claimed` fields once there is DEFINITIVE evidence the cleanup already
+  happened — the path no longer exists, or the pool itself reports it back as a warm
+  spare — so the warning does not persist after the operator (or the pool) has already
+  dealt with it; it never removes anything itself. A candidate whose path is currently
+  claimed by a different, still in-flight batch is skipped (a returned pool worktree can
+  be re-issued before the done batch's own field clears). Local-git-only, capped at 10
+  probed candidates per run — no network call, so unlike `sched status --anchors` this
+  runs by default.
 
 ## Batch anchors close only on positive evidence (#768)
 
@@ -1380,7 +1405,9 @@ predicate in `anchor-close.ts`) over `blocked`/`done` batches touched within the
   for #686's stale-blocked reconcile (`members-closed`), which survives the mandated
   rebase-merge that makes the ancestry probe structurally dead. It finishes the terminal
   rail inline but never tears the blocked worktree down (it may hold unpushed work);
-  the journal line says the worktree was kept.
+  the journal line says the worktree was kept, and `sched status` then raises a
+  `kept-worktree` warning for it on every run until the ledger field clears — see
+  above and `reconcileKeptWorktrees` (#791).
 
 Everything else is surfaced, never closed: `sched status --anchors` (opt-in; `status`
 makes no GitHub call without it) lists each still-open anchor of a batch no longer in

package/dist/batch-dispatch.d.ts.map

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

package/dist/batch-dispatch.js

@@ -3024,6 +3024,72 @@ function reconcileStaleBlockedBatches(deps, now, result, anchorCtx) {
         }
     }
 }
+/**
+ * #791: once a `done` batch's kept worktree (left in place by the
+ * `members-closed` branch above) is DEFINITIVELY gone — the path no longer
+ * exists on disk, or the pool itself now reports it back as a warm spare —
+ * clear the ledger's `worktree`/`pool_claimed` (and, separately,
+ * `member_worktree`/`member_pool_claimed`) fields so `sched status`'s
+ * `kept-worktree` warning does not persist after the operator's cleanup
+ * already happened. Ledger-only, by construction: this function reads
+ * `fsExists` and `worktree-pool status --json` (both read-only) and never
+ * builds a `git worktree remove` / `worktree-pool return` argv — the actual
+ * removal stays entirely the operator's call, exactly like the warning
+ * itself. Bounded the same way the warning's own candidate scan is: only
+ * `done` batches carrying a kept worktree are considered, which in practice
+ * is a small set.
+ */
+function reconcileKeptWorktrees(deps, now) {
+    const state = deps.store.load();
+    const fsExists = deps.fsExists ?? ((p) => fs.existsSync(p));
+    const candidates = state.batches.filter((b) => b.status === 'done' && (b.worktree !== null || b.member_worktree !== null));
+    if (candidates.length === 0)
+        return;
+    const needsPoolCheck = candidates.some((b) => (b.worktree !== null && b.pool_claimed) ||
+        (b.member_worktree !== null && b.member_pool_claimed));
+    // One pool query per TICK, not per candidate — `worktree-pool status` is a
+    // real subprocess (`npx ...`), and this reconcile is meant to be cheap.
+    const poolStatusJson = needsPoolCheck
+        ? deps.exec(teardown_1.POOL_BIN, [...teardown_1.POOL_ARGS_PREFIX, 'status', '--json'], deps.repoDir)
+        : null;
+    const goneOrReturned = (worktree, poolClaimed) => {
+        if (!fsExists(worktree))
+            return true;
+        if (poolClaimed && poolStatusJson !== null) {
+            return (0, teardown_1.poolEntryFor)(poolStatusJson, worktree) === 'warm';
+        }
+        return false;
+    };
+    for (const batch of candidates) {
+        const clears = {};
+        const clearedFields = [];
+        if (batch.worktree !== null && goneOrReturned(batch.worktree, batch.pool_claimed)) {
+            clears.worktree = null;
+            clears.pool_claimed = false;
+            clearedFields.push('worktree', 'pool_claimed');
+        }
+        if (batch.member_worktree !== null &&
+            goneOrReturned(batch.member_worktree, batch.member_pool_claimed)) {
+            clears.member_worktree = null;
+            clears.member_pool_claimed = false;
+            clearedFields.push('member_worktree', 'member_pool_claimed');
+        }
+        if (clearedFields.length === 0)
+            continue;
+        deps.store.withLock((s) => {
+            const b = (0, state_1.findBatch)(s, batch.id);
+            // Re-check under the lock: another tick, or an operator command, may
+            // have already moved this batch or cleared the fields itself.
+            if (!b || b.status !== 'done')
+                return { state: s, result: undefined };
+            return { state: (0, state_1.patchBatch)(s, batch.id, clears, now, false), result: undefined };
+        });
+        journalEvent(deps, 'kept-worktree-cleared', unit(batch.id), {
+            cleared: clearedFields.join(','),
+            detail: `kept-worktree ledger field(s) cleared on definitive evidence (${clearedFields.join(', ')}) — path gone or pool reports it returned; no removal command was run`,
+        });
+    }
+}
 function anchorTickContext(deps) {
     const reader = (0, groundtruth_1.issueCloseReader)(deps.groundTruth);
     if (reader === undefined || deps.anchorRepo === undefined)
@@ -4140,6 +4206,7 @@ function runBatchTick(deps, config, dispatch) {
     const anchorCtx = anchorTickContext(deps);
     reconcileStaleBlockedBatches(deps, now, result, anchorCtx);
     reconcileAnchorClosure(deps, now, anchorCtx);
+    reconcileKeptWorktrees(deps, now);
     return result;
 }
 //# sourceMappingURL=batch-dispatch.js.map