peaks-loop 4.0.8 → 4.0.10

package/dist/services/skills/skill-statusline-service.js

@@ -3,6 +3,8 @@ import { resolve } from 'node:path';
 import { findProjectRoot } from '../config/config-safety.js';
 import { decideCompactStatusline } from '../compact-statusline/compact-statusline-service.js';
 import { getSessionIdCanonical } from '../session/session-manager.js';
+import { resolveActiveSkillForCaller } from '../audit/enforcers/active-skill-resolver.js';
+import { readActiveDispatchIndex } from '../dispatch/dispatch-record-writer.js';
 /**
  * Out-of-band Peaks skill status renderer for the Claude Code statusLine.
  *
@@ -47,11 +49,93 @@ export function parseStatusLineStdin(raw) {
         return null;
     }
 }
+/**
+ * Resolve the callerId for the read-side isolation. Order of resolution:
+ *   1. `stdin?.caller_id` (when the harness / IDE adapter forwards it)
+ *   2. `process.env.CLAUDE_CODE_SESSION_ID` (Claude Code's ambient session id;
+ *      used as a coarse callerId surrogate when stdin omits caller_id)
+ *   3. `null` (no callerId — caller falls back to the project-level
+ *      single-file read for back-compat)
+ */
+function resolveCallerId(stdin) {
+    const fromStdin = typeof stdin?.caller_id === 'string' && stdin.caller_id.length > 0
+        ? stdin.caller_id
+        : null;
+    if (fromStdin !== null)
+        return fromStdin;
+    const fromEnv = process.env['CLAUDE_CODE_SESSION_ID'];
+    if (typeof fromEnv === 'string' && fromEnv.length > 0)
+        return fromEnv;
+    return null;
+}
+/**
+ * Read the active-dispatch index for the canonical session, filter to
+ * in-flight entries (status NOT IN { done, failed, cancelled, no-execution,
+ * never-started, unreadable, stale }), and return the most-recent leaf role
+ * plus the total in-flight count. Returns `{ role: null, pendingCount: 0 }`
+ * when no session id resolves, the index is empty, or every entry is terminal.
+ *
+ * READ-ONLY: only reads `.peaks/_sub_agents/<sid>/active-dispatches.json`.
+ * Never mutates the on-disk record.
+ */
+function readActiveLeaf(projectRoot, sessionId) {
+    if (sessionId === null)
+        return null;
+    let index = {};
+    try {
+        index = readActiveDispatchIndex(projectRoot, sessionId);
+    }
+    catch {
+        return null;
+    }
+    const terminalStatuses = new Set([
+        'done',
+        'failed',
+        'cancelled',
+        'no-execution',
+        'never-started',
+        'unreadable',
+        'stale',
+    ]);
+    const inFlight = Object.values(index).filter((e) => !terminalStatuses.has(e.status));
+    if (inFlight.length === 0)
+        return null;
+    // Sort by createdAt descending — the most recently dispatched leaf wins.
+    const sorted = inFlight.slice().sort((a, b) => b.createdAt.localeCompare(a.createdAt));
+    const latest = sorted[0];
+    if (latest === undefined)
+        return null;
+    return { role: latest.role, pendingCount: inFlight.length };
+}
 /**
  * Read the presence file without any side effects. Returns null when the file is
  * absent (idle) and a sentinel object for malformed content (invalid-presence).
+ *
+ * When `callerId` is non-null, delegates to the canonical lease resolver
+ * (presence-lease-service via active-skill-resolver) so the read is
+ * session+caller-isolated. When `callerId` is null, falls back to the
+ * project-level single-file read (back-compat for callers that don't pass
+ * a callerId yet, e.g. legacy CLI invocations).
  */
-function readPresenceReadOnly(projectRoot) {
+function readPresenceReadOnly(projectRoot, callerId) {
+    if (callerId !== null) {
+        try {
+            const resolution = resolveActiveSkillForCaller(projectRoot, { legacyPresence: true, callerId });
+            if (resolution.source === 'none' || resolution.skill === null) {
+                return { presence: null, invalid: false };
+            }
+            return {
+                presence: {
+                    skill: resolution.skill,
+                    ...(resolution.mode !== null ? { mode: resolution.mode } : {}),
+                },
+                invalid: false,
+            };
+        }
+        catch {
+            return { presence: null, invalid: true };
+        }
+    }
     const presencePath = resolve(projectRoot, PRESENCE_FILE);
     // Back-compat: prefer the new canonical path; fall back to the legacy
     // `.peaks/.active-skill.json` for one minor release.
@@ -91,14 +175,16 @@ export function buildStatusLineModel(stdin, nowMs) {
     // fallbacks). It replaces the active skill content when kind != 'none'.
     const compact = readCompactState(projectRoot, nowMs);
     if (projectRoot === null) {
-        return { state: 'idle', projectRoot: null, presence: null, ageMs: null, compact };
+        return { state: 'idle', projectRoot: null, presence: null, ageMs: null, compact, activeLeaf: null };
     }
-    const { presence, invalid } = readPresenceReadOnly(projectRoot);
+    // callerId resolves the read-side isolation; back-compat is `null`.
+    const callerId = resolveCallerId(stdin);
+    const { presence, invalid } = readPresenceReadOnly(projectRoot, callerId);
     if (invalid) {
-        return { state: 'invalid-presence', projectRoot, presence: null, ageMs: null, compact };
+        return { state: 'invalid-presence', projectRoot, presence: null, ageMs: null, compact, activeLeaf: null };
     }
     if (presence === null) {
-        return { state: 'idle', projectRoot, presence: null, ageMs: null, compact };
+        return { state: 'idle', projectRoot, presence: null, ageMs: null, compact, activeLeaf: null };
     }
     // Session binding: when the presence was stamped with a Claude session id and
     // the live session (from stdin) is a different one, the recorded skill belongs
@@ -107,12 +193,24 @@ export function buildStatusLineModel(stdin, nowMs) {
     // fall back to the time-based behavior below for backward compatibility.
     const liveSessionId = typeof stdin?.session_id === 'string' && stdin.session_id.length > 0 ? stdin.session_id : null;
     if (presence.claudeSessionId && liveSessionId && presence.claudeSessionId !== liveSessionId) {
-        return { state: 'idle', projectRoot, presence: null, ageMs: null, compact };
+        return { state: 'idle', projectRoot, presence: null, ageMs: null, compact, activeLeaf: null };
     }
     const setAtMs = presence.setAt ? Date.parse(presence.setAt) : Number.NaN;
     const ageMs = Number.isNaN(setAtMs) ? null : nowMs - setAtMs;
     const state = ageMs !== null && ageMs > STALE_THRESHOLD_MS ? 'stale' : 'active';
-    return { state, projectRoot, presence, ageMs, compact };
+    // Active leaf resolution: read-only query against the per-session
+    // active-dispatches index. Filter to in-flight entries; pick the most
+    // recent by createdAt. The renderer uses this to surface the in-flight
+    // bee skill (e.g. `peaks-rd`) alongside the orchestrator (e.g. `peaks-code`).
+    let activeLeaf = null;
+    try {
+        const sessionId = getSessionIdCanonical(projectRoot);
+        activeLeaf = readActiveLeaf(projectRoot, sessionId);
+    }
+    catch {
+        activeLeaf = null;
+    }
+    return { state, projectRoot, presence, ageMs, compact, activeLeaf };
 }
 /**
  * Read-only compact state resolver. Resolves the canonical session id for the

package/dist/services/vm/vm-lease.js

@@ -20,6 +20,7 @@
  */
 import { randomBytes } from 'node:crypto';
 import { posix as path } from 'node:path';
+import { normalizePath } from '../../shared/path-utils.js';
 export const VM_HYPERVISORS = Object.freeze([
     'kvm', 'hyperkit', 'hyperv'
 ]);
@@ -128,7 +129,7 @@ export function deserializeVmLease(raw) {
 function joinPath(...segments) {
     if (segments.length === 0)
         return '';
-    const normalized = segments.map((s) => s.replace(/\\/g, '/'));
+    const normalized = segments.map((s) => normalizePath(s));
     let acc = normalized[0];
     for (let i = 1; i < normalized.length; i++) {
         acc = path.join(acc, normalized[i]);

package/dist/services/workflow/workflow-autonomous-resume-helpers.js

@@ -20,6 +20,7 @@ import { isAbsolute, relative, resolve } from 'node:path';
 // `.peaks/_runtime/<sessionId>/<role>/...` string is no longer
 // pre-built.
 import { getSessionDir } from '../session/getSessionDir.js';
+import { normalizePath } from '../../shared/path-utils.js';
 const MAX_RESUME_ARTIFACT_BYTES = 256_000;
 // Slice 2026-06-29-change-id-root-removal: return the bare role-relative
 // sub-paths instead of `.peaks/_runtime/change/<id>/<role>/...` strings.
@@ -65,7 +66,7 @@ function normalizeRoleRelativePath(artifact, _sessionId) {
     // the path separators and strips any leading `/`; the `sessionId`
     // argument is preserved on the signature for backward call-site
     // compatibility but is no longer embedded in the path.
-    return artifact.replace(/\\/g, '/').replace(/^\/+/, '');
+    return normalizePath(artifact).replace(/^\/+/, '');
 }
 function readResumeArtifact(artifactWorkspacePath, sessionId, artifact) {
     // Slice 2026-06-29-change-id-root-removal: on-disk home now lives under
@@ -73,7 +74,7 @@ function readResumeArtifact(artifactWorkspacePath, sessionId, artifact) {
     // sub-path (e.g. `rd/swarm/checkpoints/checkpoint-1.json`) is
     // strictly a sub-root drill, not a top-level dir derivation.
     const sessionScopeRoot = getSessionDir(artifactWorkspacePath, sessionId);
-    const normalizedArtifact = artifact.replace(/\\/g, '/').replace(/^\/+/, '');
+    const normalizedArtifact = normalizePath(artifact).replace(/^\/+/, '');
     const artifactPath = resolve(sessionScopeRoot, normalizedArtifact);
     try {
         const artifactWorkspaceRealPath = realpathSync(artifactWorkspacePath);

package/dist/services/workspace/workspace-service.js

@@ -3,6 +3,7 @@ import { existsSync, lstatSync, readdirSync } from 'node:fs';
 import { join } from 'node:path';
 import { isDirectory } from 'peaks-loop-shared/fs';
 import { getSessionId, setCurrentSessionBinding, setSessionMeta } from '../session/session-manager.js';
+import { normalizePath } from '../../shared/path-utils.js';
 /**
  * Slice 2026-06-29-change-id-root-removal: list the immediate children of
  * `.peaks/` so the legacy sibling-dir guard can enumerate date-stamped
@@ -418,7 +419,7 @@ export function isWriterCreatedSiblingShape(siblingDir) {
             continue;
         }
         if (stat.isFile()) {
-            const rel = node.rel.replace(/\\/g, '/');
+            const rel = normalizePath(node.rel);
             const matches = WRITER_ALLOWED_RELATIVE_PATTERNS.some((re) => re.test(rel));
             if (!matches) {
                 return false;

package/dist/services/worktree/worktree-lease.js

@@ -26,6 +26,7 @@
  */
 import { randomBytes } from 'node:crypto';
 import { posix as path } from 'node:path';
+import { normalizePath } from '../../shared/path-utils.js';
 /**
  * Per-role default TTL. Sub-agent dispatch duration varies by role:
  * - rd (long planning + impl) → 30 min
@@ -233,7 +234,7 @@ export function deserializeLease(raw) {
 function joinPath(...segments) {
     if (segments.length === 0)
         return '';
-    const normalized = segments.map((s) => s.replace(/\\/g, '/'));
+    const normalized = segments.map((s) => normalizePath(s));
     let acc = normalized[0];
     for (let i = 1; i < normalized.length; i++) {
         acc = path.join(acc, normalized[i]);

package/dist/shared/path-safety.js

@@ -10,11 +10,9 @@
  * check without bringing in the change-id axis.
  */
 import { posix } from 'node:path';
-function normalizeForwardSlashes(input) {
-    return input.replace(/\\/g, '/');
-}
+import { normalizePath } from './path-utils.js';
 function hasUnsafePathShape(input) {
-    const normalized = normalizeForwardSlashes(input);
+    const normalized = normalizePath(input);
     if (input.includes('\\'))
         return true;
     if (!normalized || normalized === '.' || normalized === '..')
@@ -36,7 +34,7 @@ export function isUnsafeArtifactPath(path) {
     return isUnsafePathInput(path);
 }
 function normalizeArtifactPath(input) {
-    const normalized = posix.normalize(normalizeForwardSlashes(input));
+    const normalized = posix.normalize(normalizePath(input));
     return normalized.replace(/\/$/, '');
 }
 export { normalizeArtifactPath as _normalizeArtifactPath };

package/dist/shared/path-utils.d.ts

@@ -11,3 +11,51 @@ export declare function isWindowsAbsolutePath(path: string): boolean;
 export declare function resolveInputPath(path: string): string;
 export declare function stableRealPath(path: string): string;
 export declare function stablePath(path: string): string;
+/**
+ * Build the comparison key for a `projectRoot` value. Two paths that
+ * denote the same physical directory MUST produce the same key, and two
+ * paths that denote different directories MUST NOT.
+ *
+ * Composed from the existing `path-utils.ts` primitives; no new
+ * dependency. Three normalizations, in order:
+ *
+ *   1. **Symlink resolution** via `stableRealPath` — collapses macOS
+ *      `/var/folders/...` vs `/private/var/folders/...` (`/var` is a
+ *      symlink to `/private/var`). Falls back to `resolveInputPath`
+ *      when the path does not exist, so this never throws for callers
+ *      that pass a not-yet-created root (or a stale binding whose
+ *      directory has since been deleted).
+ *   2. **Separator folding** via `normalizePath` — collapses the
+ *      Windows `C:\Users\...` (written by `peaks workspace init`) vs
+ *      `C:/Users/...` (passed by a Git Bash caller) split that was the
+ *      original `PEAKS_SESSION_NOT_BOUND` trigger.
+ *   3. **Case folding, Windows only** — NTFS is case-insensitive, so
+ *      `C:\Foo` and `c:/foo` are the same directory. This step is
+ *      guarded on `isWindows` because POSIX filesystems are
+ *      case-SENSITIVE: folding case on Linux would make the genuinely
+ *      distinct `/tmp/Foo` and `/tmp/foo` compare equal.
+ *
+ * Note on step 3: `realpathSync` alone is NOT sufficient for the
+ * Windows case split. Verified empirically on Node 22 / win32 —
+ * `realpathSync('c:\\...\\foo')` echoes the caller's casing, while only
+ * `realpathSync.native` case-folds. We do not switch to `.native`
+ * because it also rewrites 8.3 short names (`SMALLM~1` → `smallMark`),
+ * which would change the on-disk form of every existing binding.
+ * Explicit `toLowerCase()` is the narrower, more predictable fix.
+ *
+ * This is a compare key ONLY — never persist it. The value written to
+ * disk stays the real path (see `writeSessionFile`).
+ *
+ * Lifted from `src/services/session/session-manager.ts` in slice
+ * `2026-08-04-rid-002-bridge-canonicalize` so both `session-manager.ts`
+ * and `session-binding-bridge.ts` share a single canonicalization
+ * authority.
+ */
+export declare function projectRootCompareKey(p: string): string;
+/**
+ * Compare two `projectRoot` values under the canonicalization rules
+ * documented on `projectRootCompareKey`. Returns true iff both paths
+ * canonicalize to the same key — covers symlink resolution, separator
+ * folding, and (Windows only) case folding.
+ */
+export declare function projectRootsMatch(a: string, b: string): boolean;

package/dist/shared/path-utils.js

@@ -1,7 +1,7 @@
 import { existsSync, realpathSync } from 'node:fs';
 import { isAbsolute, parse, relative, resolve, sep } from 'node:path';
 import { tmpdir } from 'node:os';
-import { platform } from './platform.js';
+import { isWindows, platform } from './platform.js';
 export const SEP = sep;
 const localPathConverters = {
     win32: (p) => p.replace(/\//g, '\\'),
@@ -54,3 +54,67 @@ export function stablePath(path) {
     const realExistingPath = existsSync(currentPath) ? stableRealPath(currentPath) : parsedPath.root;
     return resolve(realExistingPath, ...missingSegments);
 }
+/**
+ * Build the comparison key for a `projectRoot` value. Two paths that
+ * denote the same physical directory MUST produce the same key, and two
+ * paths that denote different directories MUST NOT.
+ *
+ * Composed from the existing `path-utils.ts` primitives; no new
+ * dependency. Three normalizations, in order:
+ *
+ *   1. **Symlink resolution** via `stableRealPath` — collapses macOS
+ *      `/var/folders/...` vs `/private/var/folders/...` (`/var` is a
+ *      symlink to `/private/var`). Falls back to `resolveInputPath`
+ *      when the path does not exist, so this never throws for callers
+ *      that pass a not-yet-created root (or a stale binding whose
+ *      directory has since been deleted).
+ *   2. **Separator folding** via `normalizePath` — collapses the
+ *      Windows `C:\Users\...` (written by `peaks workspace init`) vs
+ *      `C:/Users/...` (passed by a Git Bash caller) split that was the
+ *      original `PEAKS_SESSION_NOT_BOUND` trigger.
+ *   3. **Case folding, Windows only** — NTFS is case-insensitive, so
+ *      `C:\Foo` and `c:/foo` are the same directory. This step is
+ *      guarded on `isWindows` because POSIX filesystems are
+ *      case-SENSITIVE: folding case on Linux would make the genuinely
+ *      distinct `/tmp/Foo` and `/tmp/foo` compare equal.
+ *
+ * Note on step 3: `realpathSync` alone is NOT sufficient for the
+ * Windows case split. Verified empirically on Node 22 / win32 —
+ * `realpathSync('c:\\...\\foo')` echoes the caller's casing, while only
+ * `realpathSync.native` case-folds. We do not switch to `.native`
+ * because it also rewrites 8.3 short names (`SMALLM~1` → `smallMark`),
+ * which would change the on-disk form of every existing binding.
+ * Explicit `toLowerCase()` is the narrower, more predictable fix.
+ *
+ * This is a compare key ONLY — never persist it. The value written to
+ * disk stays the real path (see `writeSessionFile`).
+ *
+ * Lifted from `src/services/session/session-manager.ts` in slice
+ * `2026-08-04-rid-002-bridge-canonicalize` so both `session-manager.ts`
+ * and `session-binding-bridge.ts` share a single canonicalization
+ * authority.
+ */
+export function projectRootCompareKey(p) {
+    let canonical;
+    try {
+        canonical = stableRealPath(p);
+    }
+    catch {
+        // Path does not exist (yet). Fall back to the resolved absolute
+        // form so a binding written before its directory exists — and a
+        // binding whose directory was later deleted — still compares by
+        // separator + case rather than throwing.
+        canonical = resolveInputPath(p);
+    }
+    const separatorFolded = normalizePath(canonical);
+    return isWindows ? separatorFolded.toLowerCase() : separatorFolded;
+}
+/**
+ * Compare two `projectRoot` values under the canonicalization rules
+ * documented on `projectRootCompareKey`. Returns true iff both paths
+ * canonicalize to the same key — covers symlink resolution, separator
+ * folding, and (Windows only) case folding.
+ */
+export function projectRootsMatch(a, b) {
+    return projectRootCompareKey(a) === projectRootCompareKey(b);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "peaks-loop",
-  "version": "4.0.8",
+  "version": "4.0.10",
   "description": "Loop Engineering CLI — workflow primitive / loop guards / evaluators / slice orchestration",
   "author": "SquabbyZ",
   "keywords": [
@@ -98,9 +98,9 @@
     "headroom-ai": "0.22.4",
     "yaml": "^2.9.0",
     "zod": "^3.25.76",
-    "peaks-loop-mut": "0.1.14",
-    "peaks-loop-shared-channel": "0.0.18",
-    "peaks-loop-shared": "0.0.39"
+    "peaks-loop-shared": "0.0.41",
+    "peaks-loop-shared-channel": "0.0.19",
+    "peaks-loop-mut": "0.1.15"
   },
   "peerDependencies": {
     "@alibaba-group/open-code-review": "1.3.1"
@@ -142,6 +142,7 @@
     "test:dev:cli": "vitest run tests/unit",
     "test:unit": "vitest run tests/unit",
     "test:integration": "vitest run tests/integration",
+    "test:capability-guard": "vitest run --config vitest.config.integration.ts tests/integration/capability-guard",
     "test:cli": "vitest run tests/unit",
     "test:workflow": "vitest run tests/unit",
     "test:audit:silent-warning": "node ./scripts/lint/silent-warning-detector.mjs",