peaks-loop 4.0.11 → 4.0.13

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

@@ -2,7 +2,15 @@ import { existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from '
 import { dirname, join, resolve } from 'node:path';
 import { findProjectRoot } from '../config/config-safety.js';
 import { ensureMemoryBootstrap } from '../memory/project-memory-service.js';
-import { getSessionMeta } from '../session/session-manager.js';
+import { getSessionId, getSessionMeta } from '../session/session-manager.js';
+// Slice 4.0.8 compat shim: the canonical write path lives in
+// `presence-lease-service.ts`. The legacy shim dynamically imports
+// it inside `setSkillPresence` so the cold path of the legacy
+// `getSkillPresence` / `checkStalePresence` / `clearStalePresenceOnRotation`
+// read paths stays cheap. The static imports below are reserved for
+// the migration window and are referenced through the dynamic
+// `leaseMod.*` accessor at runtime.
+import { listPresenceLeases } from './presence-lease-service.js';
 // Re-export the 4.0.8 compat surface so legacy callers
 // (`presence-service` consumers in `code-mode-gate-commands.ts`,
 // `mode-enforcement.ts`, `code-job-shape-commands.ts`, etc.) keep
@@ -37,14 +45,13 @@ function getCurrentOuterSessionId() {
         return claude;
     return undefined;
 }
-// As of slice 2026-06-05-peaks-runtime-layer the orchestrator's
-// active-skill marker lives under `.peaks/_runtime/active-skill.json`.
-// The legacy `.peaks/.active-skill.json` path is preserved as a
-// read-only fallback for one minor release so older CLI versions (or
-// trees that have not been migrated by `peaks workspace reconcile`)
-// keep working without a forced re-init.
-const PRESENCE_FILE = join('.peaks', '_runtime', 'active-skill.json');
-const PRESENCE_FILE_LEGACY = '.peaks/.active-skill.json';
+// Slice 4.0.11 statusline-sid-scoped-lease C: the deprecated
+// project-level single-slot presence files
+// `.peaks/_runtime/active-skill.json` and `.peaks/.active-skill.json`
+// are REMOVED from this module. The canonical sid-scoped lease
+// projection (`.peaks/_runtime/<sid>/leases/presence-*.json`) is the
+// only source of truth. The legacy constants `PRESENCE_FILE` and
+// `PRESENCE_FILE_LEGACY` are deleted; readers use `listPresenceLeases`.
 const SESSION_FILE = join('.peaks', '_runtime', 'session.json');
 const SESSION_FILE_LEGACY = '.peaks/.session.json';
 function resolveProjectRoot(override) {
@@ -52,36 +59,6 @@ function resolveProjectRoot(override) {
         return resolve(override);
     return findProjectRoot(process.cwd()) ?? process.cwd();
 }
-function resolvePresencePath(projectRootOverride) {
-    return resolve(resolveProjectRoot(projectRootOverride), PRESENCE_FILE);
-}
-/**
- * Back-compat read for the active-skill marker. Prefers the new
- * canonical `.peaks/_runtime/active-skill.json`; falls back to the
- * legacy `.peaks/.active-skill.json` for one minor release.
- *
- * Returns the parsed SkillPresence object, or null when neither
- * file is present / valid. The legacy file is never written by
- * current code — only the new path receives writes.
- */
-function readSkillPresenceBackCompat(projectRootOverride) {
-    const presencePath = resolvePresencePath(projectRootOverride);
-    const legacyPath = resolve(resolveProjectRoot(projectRootOverride), PRESENCE_FILE_LEGACY);
-    const pathToRead = existsSync(presencePath) ? presencePath : legacyPath;
-    if (!existsSync(pathToRead))
-        return null;
-    try {
-        const raw = readFileSync(pathToRead, 'utf8');
-        const parsed = JSON.parse(raw);
-        if (typeof parsed?.skill !== 'string' || parsed.skill.length === 0) {
-            return null;
-        }
-        return { presence: parsed, path: pathToRead };
-    }
-    catch { // TODO(g2): legacy silent catch — grace: 1 minor release (v2.14.0)
-        return null;
-    }
-}
 /**
  * Resolve the active peaks session id from
  * `.peaks/_runtime/session.json` (legacy: `.peaks/.session.json`).
@@ -112,6 +89,43 @@ export function getCurrentSessionId(projectRootOverride) {
         return null;
     }
 }
+/**
+ * Slice 4.0.11 statusline-sid-scoped-lease C: read the canonical
+ * sid-scoped lease projection and project the freshest in-flight
+ * lease into the legacy `SkillPresence` shape that the public
+ * `getSkillPresence` / `checkStalePresence` /
+ * `clearStalePresenceOnRotation` consumers expect. The projection
+ * is lossy (the lease does not carry `outerSessionId`; `setAt`
+ * maps to `startedAt`; `lastHeartbeat` is reused as `lastHeartbeat`).
+ *
+ * Returns `null` when the bound session has no in-flight leases
+ * (`running` or `preparing`); terminalized leases are ignored so
+ * the read does not resurrect a stale skill on a fresh session.
+ */
+function readSkillPresenceFromLease(projectRootOverride) {
+    const projectRoot = resolveProjectRoot(projectRootOverride);
+    const sessionId = getSessionId(projectRoot);
+    if (sessionId === null)
+        return null;
+    const leases = listPresenceLeases(projectRoot, sessionId);
+    const inFlight = leases.filter((l) => l.status === 'running' || l.status === 'preparing');
+    if (inFlight.length === 0)
+        return null;
+    inFlight.sort((a, b) => b.lastHeartbeat.localeCompare(a.lastHeartbeat));
+    const lease = inFlight[0];
+    if (lease === undefined)
+        return null;
+    // The lease carries `callerId` (the adapter / harness session id),
+    // not the legacy `outerSessionId` field. Project it for back-compat
+    // with `clearStalePresenceOnRotation`'s outer-mismatch check.
+    return {
+        skill: lease.skill,
+        sessionId,
+        outerSessionId: lease.callerId,
+        setAt: lease.startedAt,
+        lastHeartbeat: lease.lastHeartbeat
+    };
+}
 /**
  * Look up the outer-session-id that was bound to the *current* peaks
  * session, i.e. the one written to the per-session
@@ -160,23 +174,14 @@ function getBoundOuterSessionId(projectRootOverride) {
  * legacy `.peaks/.active-skill.json` for one minor release.
  */
 function getPreviousOuterSessionId(projectRootOverride) {
-    const result = readSkillPresenceBackCompat(projectRootOverride);
+    const result = readSkillPresenceFromLease(projectRootOverride);
     if (result === null)
         return undefined;
-    const parsed = result.presence;
-    if (typeof parsed.outerSessionId === 'string' && parsed.outerSessionId.length > 0) {
-        return parsed.outerSessionId;
-    }
-    // Legacy field name. Honour it on the read side so v1.2.x
-    // presence files do not show as a false mismatch.
-    if (typeof parsed.claudeSessionId === 'string' && parsed.claudeSessionId.length > 0) {
-        return parsed.claudeSessionId;
+    if (typeof result.outerSessionId === 'string' && result.outerSessionId.length > 0) {
+        return result.outerSessionId;
     }
     return undefined;
 }
-export function exportSkillPresence(projectRootOverride) {
-    return resolvePresencePath(projectRootOverride);
-}
 // ============================================================================
 // Slice 020 — caller-keyed active-skill marker (D6).
 // ============================================================================
@@ -336,12 +341,12 @@ export function setSkillPresence(skill, mode, gate, projectRootOverride) {
             catch { /* fall through to legacy write */ }
         })();
     }
-    const presencePath = resolvePresencePath(projectRootOverride);
-    const presenceDir = dirname(presencePath);
-    if (!existsSync(presenceDir)) {
-        mkdirSync(presenceDir, { recursive: true });
-    }
-    writeFileSync(presencePath, JSON.stringify(presence, null, 2), 'utf8');
+    // Slice 4.0.11 statusline-sid-scoped-lease A: the canonical write
+    // path is now exclusively `presence-lease-service.setPresenceLease`.
+    // The legacy single-slot marker file write was removed in this
+    // slice: every `setSkillPresence` call flows through the sid-scoped
+    // lease + presence-index machinery above. The legacy
+    // `active-skill.json` file is NOT recreated here.
     // Skill-activation side effect: ensure `.peaks/memory/` and a full-shape
     // empty `index.json` exist for the project. This is the user-facing fix
     // for "stock projects never get a memory directory or index". Every peaks
@@ -354,26 +359,17 @@ export function setSkillPresence(skill, mode, gate, projectRootOverride) {
     return presence;
 }
 export function getSkillPresence(projectRootOverride) {
-    const result = readSkillPresenceBackCompat(projectRootOverride);
-    if (result === null)
-        return null;
-    const { presence, path: presencePath } = result;
-    if (typeof presence.sessionId === 'string' && presence.sessionId.length > 0) {
-        const currentSessionId = getCurrentSessionId(projectRootOverride);
-        if (currentSessionId && presence.sessionId !== currentSessionId) {
-            try {
-                unlinkSync(presencePath);
-            }
-            catch { // TODO(g2): legacy silent catch — grace: 1 minor release (v2.14.0)
-                // best effort
-            }
-            return null;
-        }
-    }
-    return presence;
+    // Slice 4.0.11 statusline-sid-scoped-lease C: read from the
+    // canonical sid-scoped lease projection. The legacy
+    // `unlinkSync(presencePath)` purge on session-mismatch is
+    // removed: the lease projection is keyed off the bound session
+    // id, so a mismatch cannot happen — `listPresenceLeases`
+    // already filters by the session-id resolved from the workspace
+    // binding.
+    return readSkillPresenceFromLease(projectRootOverride);
 }
 export function checkStalePresence(opts) {
-    const result = readSkillPresenceBackCompat(opts?.projectRootOverride);
+    const result = readSkillPresenceFromLease(opts?.projectRootOverride);
     // `opts?.currentOuter === undefined` is the omitted-key case. A
     // falsy string `''` is an explicit "no signal" (used by tests to
     // simulate a CLI run with no harness env vars).
@@ -389,7 +385,7 @@ export function checkStalePresence(opts) {
             recordedOuterSessionId: undefined
         };
     }
-    const recorded = result.presence.outerSessionId;
+    const recorded = result.outerSessionId;
     // Suppress false-positives when NEITHER side recorded an outer
     // session id (legacy project, no harness signal). Two unknowns
     // are not a swap — they are "no signal available yet".
@@ -399,7 +395,7 @@ export function checkStalePresence(opts) {
         return {
             stale: false,
             reason: null,
-            presence: result.presence,
+            presence: result,
             currentOuterSessionId: current,
             recordedOuterSessionId: recorded
         };
@@ -408,7 +404,7 @@ export function checkStalePresence(opts) {
         return {
             stale: false,
             reason: null,
-            presence: result.presence,
+            presence: result,
             currentOuterSessionId: current,
             recordedOuterSessionId: recorded
         };
@@ -416,7 +412,7 @@ export function checkStalePresence(opts) {
     return {
         stale: true,
         reason: 'outer-session-mismatch',
-        presence: result.presence,
+        presence: result,
         currentOuterSessionId: current,
         recordedOuterSessionId: recorded
     };
@@ -444,11 +440,11 @@ export function checkStalePresence(opts) {
  * decide what the "rotated-out" id was.
  */
 export function clearStalePresenceOnRotation(opts) {
-    const result = readSkillPresenceBackCompat(opts.projectRootOverride);
+    const result = readSkillPresenceFromLease(opts.projectRootOverride);
     if (result === null) {
         return { cleared: false, reason: 'no-presence' };
     }
-    const recorded = result.presence.outerSessionId;
+    const recorded = result.outerSessionId;
     const current = opts.currentOuterSessionId;
     // If the recorded outer id matches the new (current) outer id,
     // this presence is NOT stale — the user just reconnected from
@@ -483,24 +479,25 @@ export function clearStalePresenceOnRotation(opts) {
     };
 }
 export function touchSkillHeartbeat(projectRootOverride) {
-    const result = readSkillPresenceBackCompat(projectRootOverride);
-    if (result === null)
+    // Slice 4.0.11 statusline-sid-scoped-lease C: read from the
+    // canonical sid-scoped lease projection. The legacy
+    // unlink-on-session-mismatch purge is removed: the lease is
+    // keyed off the bound session id, so the mismatch path cannot
+    // fire (a lease under session A is never returned when the bound
+    // session is B).
+    const presence = readSkillPresenceFromLease(projectRootOverride);
+    if (presence === null)
         return null;
-    const { presence, path: presencePath } = result;
-    if (typeof presence.sessionId === 'string' && presence.sessionId.length > 0) {
-        const currentSessionId = getCurrentSessionId(projectRootOverride);
-        if (currentSessionId && presence.sessionId !== currentSessionId) {
-            try {
-                unlinkSync(presencePath);
-            }
-            catch { // TODO(g2): legacy silent catch — grace: 1 minor release (v2.14.0)
-                // best effort
-            }
-            return null;
-        }
-    }
+    // Slice 4.0.11 statusline-sid-scoped-lease A: the legacy write to
+    // the single-slot marker file was removed. Heartbeat refresh now
+    // lives exclusively in `presence-lease-service.setPresenceLease`
+    // (the canonical sid-scoped lease). This function remains as a
+    // read-only back-compat shim for the 4-B / 4-C sub-slices; callers
+    // still receive the in-memory `presence` (with the new
+    // `lastHeartbeat` stamped) but the legacy `active-skill.json` file
+    // is no longer touched. The canonical lease / presence-index
+    // entries are the source of truth for heartbeat freshness.
     presence.lastHeartbeat = new Date().toISOString();
-    writeFileSync(presencePath, JSON.stringify(presence, null, 2), 'utf8');
     return presence;
 }
 export function clearSkillPresence(projectRootOverride) {
@@ -518,12 +515,25 @@ export function clearSkillPresence(projectRootOverride) {
     // `.peaks/.active-skill.json` so a stale marker from a prior CLI
     // version cannot resurrect after a fresh `clear`. The canonical
     // lease + index entries are NOT touched by this shim — they
-    // remain under the workflow's terminalize lock until
-    // `terminalizeWorkflow` or the next workflow init reclaims them.
-    const presencePath = resolvePresencePath(projectRootOverride);
-    const legacyPath = resolve(resolveProjectRoot(projectRootOverride), PRESENCE_FILE_LEGACY);
+    // Slice 4.0.11 statusline-sid-scoped-lease C: the deprecated
+    // single-slot presence files (`.peaks/_runtime/active-skill.json`
+    // and `.peaks/.active-skill.json`) are removed. The canonical
+    // sid-scoped lease projection (under
+    // `.peaks/_runtime/<sid>/leases/`) is untouched here — workflow
+    // leases route through `terminalizeWorkflow`, NOT this shim.
+    //
+    // This shim remains as a best-effort stale-file cleanup for
+    // projects that still carry the deprecated single-slot file from
+    // a pre-4.0.11 CLI version. After one minor release the legacy
+    // paths are gone and the loop is a no-op. Returns true when a
+    // stale file was actually removed.
+    const projectRoot = resolveProjectRoot(projectRootOverride);
+    const candidates = [
+        resolve(projectRoot, '.peaks', '_runtime', 'active-skill.json'),
+        resolve(projectRoot, '.peaks', '.active-skill.json')
+    ];
     let cleared = false;
-    for (const p of [presencePath, legacyPath]) {
+    for (const p of candidates) {
         if (!existsSync(p))
             continue;
         try {

package/dist/services/skills/skill-statusline-renderer.d.ts

@@ -1,4 +1,7 @@
 import type { StatusLineModel } from './skill-statusline-service.js';
+import { computeRootSuffix as computeRootSuffixImpl } from './skill-statusline-sid-suffix.js';
+export { formatShortSid } from './skill-statusline-sid-suffix.js';
+export declare const computeRootSuffix: typeof computeRootSuffixImpl;
 /**
  * Pure formatting layer for the Peaks statusLine. Takes the read-only status
  * model and produces the single line Claude Code paints at the bottom of the
@@ -76,4 +79,3 @@ export declare function applyMarquee(s: string, nowMs: number, capability: Statu
  * states all keep the marquee.
  */
 export declare function renderStatusLine(model: StatusLineModel, options?: StatusLineRenderOptions, env?: NodeJS.ProcessEnv): string;
-export {};

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

@@ -1,4 +1,12 @@
 import { basename } from 'node:path';
+import { computeRootSuffix as computeRootSuffixImpl, } from './skill-statusline-sid-suffix.js';
+// Re-export so existing test imports
+// (`import { formatShortSid, computeRootSuffix } from '.../skill-statusline-renderer'`)
+// keep working byte-identically after the helper extraction in slice
+// 2026-08-05-statusline-sid-only-marker-and-multi-binary-drift-guard
+// repair cycle.
+export { formatShortSid } from './skill-statusline-sid-suffix.js';
+export const computeRootSuffix = computeRootSuffixImpl;
 /**
  * Internal: the brand prefix is plain ASCII so a tiny terminal without
  * monospaced UTF-8 still sees a recognizable string. The mountain glyphs
@@ -186,6 +194,14 @@ function rootLabel(projectRoot) {
         return '';
     return basename(projectRoot);
 }
+/**
+ * `formatShortSid` + `computeRootSuffix` were extracted to
+ * `./skill-statusline-sid-suffix.ts` in the slice
+ * 2026-08-05-statusline-sid-only-marker-and-multi-binary-drift-guard
+ * repair cycle so the renderer file stays under the Karpathy
+ * 800-line cap. Both helpers are re-exported above for back-compat
+ * with existing test imports.
+ */
 /**
  * Build the "middle" of the status line — everything between the brand
  * prefix and the project root label. Kept separate so the token layout
@@ -568,7 +584,27 @@ export function renderStatusLine(model, options, env) {
     const noColor = env !== undefined ? isNoColor(env) : false;
     const palette = paletteFor(capability, noColor);
     const root = rootLabel(model.projectRoot);
-    const rootSuffix = root ? `${palette.trailSeparator}${root}` : '';
+    // short-sid suffix (slices
+    //   - 2026-08-05-statusline-empty-render-and-short-sid-suffix (active only)
+    //   - 2026-08-05-statusline-sid-only-marker (idle + stale also)
+    // ):
+    // the project root cell carries ` [shortSid]` after `peaks-loop` whenever
+    // a canonical session id resolves. Per-state matrix:
+    //
+    //   active             → append sid when sessionId !== null          (AC5/PB1)
+    //   idle               → append sid when sessionId !== null          (AC1)
+    //   stale              → append sid when sessionId !== null          (AC2)
+    //   invalid-presence   → NEVER append sid (G2 — read-error signal must
+    //                        stay loud; showing sid would mask the warning)
+    //                                                                         (AC4)
+    //
+    // Compact state with presence is still rendered with the active sid logic
+    // (the active branch already covered this in the prior slice). Compact state
+    // without presence is the same as the underlying idle / invalid-presence /
+    // stale branch; the helper inherits that. Pure ASCII (no narrow space /
+    // smart quotes), so Windows PowerShell + Git Bash + zsh render byte-
+    // identical (AC7 of the prior slice + AC10 of this slice).
+    const rootSuffix = computeRootSuffix(model, root, palette);
     const brand = brandText(capability, noColor);
     // Breathing pulse: key off a single wall-clock read at the start of
     // render so the output is deterministic for a given invocation. The

package/dist/services/skills/skill-statusline-service.d.ts

@@ -27,6 +27,20 @@ export type StatusLineModel = {
     ageMs: number | null;
     compact: CompactStatuslineState;
     activeLeaf: StatusLineActiveLeaf | null;
+    /**
+     * Slice 2026-08-05-statusline-sid-only-marker: the canonical session
+     * id resolved for the project root (`getSessionIdCanonical`), or
+     * `null` when no project root is bound or no `.peaks/_runtime/<sid>/`
+     * session is on disk. The renderer reads this to append ` [shortSid]`
+     * to the project name cell for idle / stale states (G1); invalid-
+     * presence still suppresses the suffix (G2).
+     *
+     * Carry-forward for AC1/AC2/AC3: the value is `null` whenever
+     * `projectRoot === null` — the renderer relies on this to skip the
+     * suffix without re-running `getSessionIdCanonical` against a non-
+     * existent root.
+     */
+    sessionId: string | null;
 };
 export declare function parseStatusLineStdin(raw: string): StatusLineStdin | null;
 export declare function buildStatusLineModel(stdin: StatusLineStdin | null, nowMs: number): StatusLineModel;