mandrel 2.65.0 → 2.67.0

package/.agents/scripts/lib/worktree/canonical-path.js

@@ -0,0 +1,34 @@
+/**
+ * worktree/canonical-path.js — the on-disk identity of a path, for every
+ * worktree identity and containment comparison.
+ */
+
+import fs from 'node:fs';
+import path from 'node:path';
+
+/**
+ * `realpathSync.native` resolves symlinks (macOS `/var` ↔ `/private/var`) and
+ * expands Windows 8.3 short names (`RUNNER~1` ↔ `runneradmin`) — `git
+ * worktree list` reports the long form while `os.tmpdir()` / `process.cwd()`
+ * may carry the short one. A path that no longer exists canonicalises its
+ * nearest existing ancestor and re-appends the rest.
+ *
+ * @param {string} p
+ * @param {{ realpath?: (p: string) => string }} [deps]
+ * @returns {string}
+ */
+export function canonicalPath(p, { realpath = fs.realpathSync.native } = {}) {
+  const resolved = path.resolve(p);
+  const tail = [];
+  let current = resolved;
+  for (;;) {
+    try {
+      return path.join(realpath(current), ...tail);
+    } catch {
+      const parent = path.dirname(current);
+      if (parent === current) return resolved;
+      tail.unshift(path.basename(current));
+      current = parent;
+    }
+  }
+}

package/.agents/scripts/lib/worktree/lifecycle/reap.js

@@ -7,6 +7,7 @@
 import fs from 'node:fs';
 import { rm as fsPromisesRm } from 'node:fs/promises';
 import { fileURLToPath } from 'node:url';
+import { canonicalPath } from '../canonical-path.js';
 import { isInsideWorktree, samePath } from '../inspector.js';
 import { sleepSync } from '../node-modules-strategy.js';
 import { checkMergeReachability } from './merge-reachability.js';
@@ -441,15 +442,25 @@ function runningCodePaths() {
  * The running-code path inside `wtPath`, or `null`. Reaping the tree the
  * running script was loaded from kills the process later, at its first lazy
  * read or dynamic `import()`; refusing only defers the tree to the next sweep.
+ * Shared by every reaper (close, the boot worktree sweep, `/clean-worktrees`).
+ * Both sides are canonicalised first: a short-name or symlinked spelling of
+ * the same tree must still be recognised.
  *
- * @param {object} ctx
+ * @param {{ platform?: string }} ctx
  * @param {string} wtPath
+ * @param {string[]} [extraPaths] Further paths to guard (e.g. `process.cwd()`).
  * @returns {string|null}
  */
-function findRunningCodeInside(ctx, wtPath) {
+export function findRunningCodeInside(ctx, wtPath, extraPaths = []) {
+  const guarded = [...runningCodePaths(), ...extraPaths];
+  const target = canonicalPath(wtPath);
   return (
-    runningCodePaths().find((p) => isInsideWorktree(p, wtPath, ctx.platform)) ??
-    null
+    guarded.find(
+      (p) =>
+        typeof p === 'string' &&
+        p !== '' &&
+        isInsideWorktree(canonicalPath(p), target, ctx.platform),
+    ) ?? null
   );
 }
 

package/.agents/scripts/single-story-close.js

@@ -16,7 +16,11 @@
  *                              [--merge-watch-mode <sync|async>]
  *                              [--rerun-advisory <n>]
  *                              [--override-review-block <reason>]
+ *                              [--worker-tokens <n>]
  *
+ * `--worker-tokens <n>` is the story-worker's host-reported token total,
+ * recorded best-effort in the close result's `telemetry` (absent or invalid →
+ * `null` plus a warning; never a change of status or exit code).
  * `--override-review-block <reason>` is the audited escape past a code-review
  * CRITICAL blocker (instead of a hand-merge with no record).
  * `--merge-watch-mode async` is passed per close by the orchestrator, the only
@@ -35,7 +39,7 @@ import { parseSprintArgsTolerant } from './lib/cli-args.js';
 import { runAsCli } from './lib/cli-utils.js';
 import { formatCliError } from './lib/error-redactor.js';
 import { Logger } from './lib/Logger.js';
-import { emitTerminalFriction } from './lib/observability/runtime-friction.js';
+import { emitCloseTerminalSignals } from './lib/observability/close-telemetry.js';
 import { resolveRunScopedConfig } from './lib/orchestration/run-scoped-config.js';
 import {
   failedTerminalFor,
@@ -91,7 +95,7 @@ async function main() {
     // Mirrors runAsCli's default error line, which this catch pre-empts.
     Logger.error(`[single-story-close] Fatal error: ${formatCliError(err)}`);
     emitTerminalEnvelope(terminal);
-    await emitTerminalFriction({ envelope: terminal });
+    await emitCloseTerminalSignals({ envelope: terminal });
     return exitCodeForTerminal(terminal);
   }
 }
@@ -130,6 +134,10 @@ runAsCli(import.meta.url, main, {
         // forbids that literal outside `phases/auto-merge.js`.
         'Land despite a Story-scope code-review CRITICAL blocker you have reviewed and judged wrong. The reason is mandatory (≥12 chars) and is recorded on the Story, on the PR, and as a `review-block-overridden` friction signal; the terminal envelope reports `gates.codeReview: "overridden"`. Use this instead of merging the PR by hand with the GitHub CLI — a hand-merge bypasses the gate with no record at all.',
       ],
+      [
+        '--worker-tokens <n>',
+        'The story-worker’s host-reported total tokens, recorded in the close result’s `telemetry.workerTokens`. Best-effort: an absent or non-integer value records null with a warning and never changes the status or exit code.',
+      ],
     ],
     notes: [
       'Exit codes:\n  0  landed\n  1  blocked or failed\n  3  pending (resumable — run the envelope’s nextCommand)',