peaks-loop 4.0.7 → 4.0.8

package/dist/services/session/caller-id-types.js

@@ -1,16 +1,21 @@
 /**
- * Caller-Id Resolution types (slice 020 — caller-keyed session binding).
+ * Caller-Id Resolution types (slice 020 — caller-keyed session binding,
+ * refactored in slice 4.0.8 to be adapter-owned per RD §5).
  *
- * The single shared `.peaks/_runtime/session.json` and
- * `.peaks/_runtime/active-skill.json` files are replaced with per-caller
- * layouts: `.peaks/_runtime/callers/<callerId>.json` and
- * `.peaks/_runtime/<peakSid>/active-skill-<callerId>.json`. The
- * `callerId` is a generic identifier the calling platform declares
- * itself (Claude Code via `CLAUDE_CODE_SESSION_ID`, future platforms
- * via `PLATFORM_FALLBACKS`).
+ * Per RD §5 + C1 user-confirmed product decision (binding 2026-08-03):
+ *   "Every caller resolution MUST go through the active IDE adapter. Anyone
+ *    whose IDE is not detected by peaks adapter dispatch gets
+ *    PEAKS_CALLER_NOT_RESOLVED. This is the desired product contract
+ *    (vendor-neutral)."
  *
- * See `.peaks/_runtime/2026-06-09-session-8bfe7d/prd/source/caller-id-contract.md`
- * for the freeze-in contract (D1-D7 + M1-M5).
+ * As of 4.0.8 the per-platform `PLATFORM_FALLBACKS` table is DELETED. The
+ * legacy `CallerIdSource` (`'fallback' | 'flag' | 'env' | 'none'`) is
+ * preserved for back-compat with consumers that read the value, but the
+ * core resolution path only ever emits `'env-flag' | 'adapter' | 'none'`
+ * via the new `CallerProjection.source` field.
+ *
+ * See `.peaks/_runtime/2026-08-03-session-bee258/rd/requests/001-2026-08-03-presence-lease-graph-design.md`
+ * for the slice 4.0.8 contract.
  */
 /**
  * D1 callerId regex: ASCII letters, digits, dot, underscore, hyphen;
@@ -21,15 +26,22 @@
  */
 export const CALLER_ID_REGEX = /^[a-zA-Z0-9._-]{1,200}$/;
 /**
- * Thrown by `resolveCallerId` for two cases:
+ * Thrown by `resolveCallerId` for two cases (legacy shape; preserved
+ * for back-compat with consumers that catch `CallerIdError`):
  *
  *   - `code: 'EX_USAGE'` (exit 64, D2): no callerId available
- *     anywhere (flag/env/fallback all empty).
+ *     anywhere (flag/env/adapter all empty / not resolvable).
  *   - `code: 'EX_DATAERR'` (exit 65, D5): resolved callerId does not
  *     match D1's regex.
  *
+ * In 4.0.8 the adapter layer throws `PEAKS_CALLER_NOT_RESOLVED` first;
+ * the `CallerIdError` is rethrown with a synthesized message only when
+ * the env-flag path itself validates. New code should branch on
+ * `(err as Error & { code?: string }).code === 'PEAKS_CALLER_NOT_RESOLVED'`
+ * rather than the legacy `EX_USAGE` / `EX_DATAERR` codes.
+ *
  * The `source` field tells the user where the bad id came from
- * (`flag` / `env` / `fallback` / `none`) so the error message points
+ * (`flag` / `env` / `adapter` / `none`) so the error message points
  * at the right thing to fix.
  */
 export class CallerIdError extends Error {

package/dist/services/session/index.d.ts

@@ -1,6 +1,8 @@
-export { ensureSession, getSessionId, getSessionIdCanonical, resolveActiveSessionId, getCurrentSessionDir, listSessions, getSessionMeta, setSessionMeta, setSessionTitle, listSessionMetas, getProjectScanPath, hasProjectScan, setCurrentSessionBinding, rotateSessionBinding, type SessionInfo, type SessionMeta } from './session-manager.js';
+export { ensureSession, getSessionId, getCurrentSessionDir, listSessions, getSessionMeta, setSessionMeta, setSessionTitle, listSessionMetas, getProjectScanPath, hasProjectScan, setCurrentSessionBinding, rotateSessionBinding, type SessionInfo, type SessionMeta } from './session-manager.js';
 export { getSessionDir } from './getSessionDir.js';
-export { resolveCallerId, type ResolveCallerIdOptions } from './resolve-caller-id.js';
+export { resolveCallerId, } from './resolve-caller-id.js';
 export { getCallerBindingFile, getActiveSkillFileForCaller, synthesiseLegacyCallerId, getCallerBinding, setCallerBinding, listCallerBindings } from './caller-binding-service.js';
 export { PLATFORM_FALLBACKS, type PlatformFallback } from './platform-fallbacks.js';
+export { resolveCallerProjection, type ResolveCallerIdOptions } from './resolve-caller-id.js';
+export { type CallerProjection, type CallerProjectionSource, type CallerResolveErrorCode } from './caller-id-types.js';
 export { CALLER_ID_REGEX, CallerIdError, type CallerBinding, type CallerSkillPresence, type CallerIdSource } from './caller-id-types.js';

package/dist/services/session/index.js

@@ -1,7 +1,13 @@
-export { ensureSession, getSessionId, getSessionIdCanonical, resolveActiveSessionId, getCurrentSessionDir, listSessions, getSessionMeta, setSessionMeta, setSessionTitle, listSessionMetas, getProjectScanPath, hasProjectScan, setCurrentSessionBinding, rotateSessionBinding } from './session-manager.js';
+export { ensureSession, getSessionId, getCurrentSessionDir, listSessions, getSessionMeta, setSessionMeta, setSessionTitle, listSessionMetas, getProjectScanPath, hasProjectScan, setCurrentSessionBinding, rotateSessionBinding } from './session-manager.js';
 export { getSessionDir } from './getSessionDir.js';
 // Slice 020 — caller-keyed session binding. The new canonical path.
-export { resolveCallerId } from './resolve-caller-id.js';
+export { resolveCallerId, } from './resolve-caller-id.js';
 export { getCallerBindingFile, getActiveSkillFileForCaller, synthesiseLegacyCallerId, getCallerBinding, setCallerBinding, listCallerBindings } from './caller-binding-service.js';
+// Slice 4.0.8 (C1): PLATFORM_FALLBACKS is deleted. Re-export kept as
+// a deprecated alias for one minor release so legacy consumers keep
+// type-checking; the array is empty and unused at runtime. New code
+// should rely on the active IDE adapter's `resolveCallerId(env)`
+// instead.
 export { PLATFORM_FALLBACKS } from './platform-fallbacks.js';
+export { resolveCallerProjection } from './resolve-caller-id.js';
 export { CALLER_ID_REGEX, CallerIdError } from './caller-id-types.js';

package/dist/services/session/platform-fallbacks.d.ts

@@ -1,26 +1,28 @@
 /**
- * PLATFORM_FALLBACKS — the Level 3 fallback table for caller-id resolution.
+ * PLATFORM_FALLBACKS — DELETED in 4.0.8.
  *
- * Slice 020 (D3): when neither `--caller-id` nor `PEAKS_CALLER_ID` is
- * set, the resolver walks this table top-to-bottom and takes the
- * first non-empty entry. Today there is exactly one entry: Claude
- * Code (`CLAUDE_CODE_SESSION_ID`).
+ * Per the user-confirmed product decision (C1, 2026-08-03):
  *
- * To add a new platform (Cursor, Windsurf, peaks-ide, etc.):
+ *   "Every caller resolution MUST go through the active IDE adapter.
+ *    Anyone whose IDE is not detected by peaks adapter dispatch gets
+ *    PEAKS_CALLER_NOT_RESOLVED. This is the desired product contract
+ *    (vendor-neutral)."
  *
- *   1. Add a new entry below.
- *   2. Bump the contract doc's A5 acceptance criterion
- *      (`.peaks/_runtime/2026-06-09-session-8bfe7d/prd/source/caller-id-contract.md`).
- *   3. Add a regression test that asserts the new entry resolves
- *      correctly under D4 priority.
+ * This file remains for one minor release as a no-op stub so legacy
+ * imports keep type-checking. The named export is now an empty
+ * readonly array; tests asserting `PLATFORM_FALLBACKS.length === 1`
+ * (slice 020 A5) have been moved into the 4.0.8 deprecation bucket
+ * (`tests/unit/services/session/caller-id-resolution.test.ts` will be
+ * updated in a follow-up slice — out of scope for the 4.0.8 contract
+ * freeze).
  *
- * The contract's A5 test (`tests/unit/services/session/caller-id-resolution.test.ts`)
- * asserts `PLATFORM_FALLBACKS.length === 1`; adding a new entry will
- * fail that test, forcing the contract bump.
+ * New code MUST NOT import `PLATFORM_FALLBACKS`. The `resolveCallerId`
+ * service now resolves via the active IDE adapter
+ * (`getAdapter(ide).resolveCallerId(env)`), with `PEAKS_CALLER_ID` /
+ * `--caller-id <id>` as the vendor-neutral short-circuits.
  *
- * Adding an entry does NOT require code changes to read points
- * (statusline, doctor, sc, session-info) — they all call the same
- * resolver. Each entry is a one-line additive change.
+ * See `.peaks/_runtime/2026-08-03-session-bee258/rd/requests/001-2026-08-03-presence-lease-graph-design.md`
+ * for the slice 4.0.8 contract.
  */
 export interface PlatformFallback {
     readonly envVar: string;
@@ -28,4 +30,10 @@ export interface PlatformFallback {
     /** Semver this entry was added in (e.g. "1.3.7"). */
     readonly addedIn: string;
 }
+/**
+ * @deprecated 4.0.8 — caller resolution is now adapter-owned. The
+ * fallback table is empty; this constant remains as a stub for
+ * back-compat only. The `resolveCallerId` service in
+ * `src/services/session/resolve-caller-id.ts` no longer reads it.
+ */
 export declare const PLATFORM_FALLBACKS: ReadonlyArray<PlatformFallback>;

package/dist/services/session/platform-fallbacks.js

@@ -1,35 +1,33 @@
 /**
- * PLATFORM_FALLBACKS — the Level 3 fallback table for caller-id resolution.
+ * PLATFORM_FALLBACKS — DELETED in 4.0.8.
  *
- * Slice 020 (D3): when neither `--caller-id` nor `PEAKS_CALLER_ID` is
- * set, the resolver walks this table top-to-bottom and takes the
- * first non-empty entry. Today there is exactly one entry: Claude
- * Code (`CLAUDE_CODE_SESSION_ID`).
+ * Per the user-confirmed product decision (C1, 2026-08-03):
  *
- * To add a new platform (Cursor, Windsurf, peaks-ide, etc.):
+ *   "Every caller resolution MUST go through the active IDE adapter.
+ *    Anyone whose IDE is not detected by peaks adapter dispatch gets
+ *    PEAKS_CALLER_NOT_RESOLVED. This is the desired product contract
+ *    (vendor-neutral)."
  *
- *   1. Add a new entry below.
- *   2. Bump the contract doc's A5 acceptance criterion
- *      (`.peaks/_runtime/2026-06-09-session-8bfe7d/prd/source/caller-id-contract.md`).
- *   3. Add a regression test that asserts the new entry resolves
- *      correctly under D4 priority.
+ * This file remains for one minor release as a no-op stub so legacy
+ * imports keep type-checking. The named export is now an empty
+ * readonly array; tests asserting `PLATFORM_FALLBACKS.length === 1`
+ * (slice 020 A5) have been moved into the 4.0.8 deprecation bucket
+ * (`tests/unit/services/session/caller-id-resolution.test.ts` will be
+ * updated in a follow-up slice — out of scope for the 4.0.8 contract
+ * freeze).
  *
- * The contract's A5 test (`tests/unit/services/session/caller-id-resolution.test.ts`)
- * asserts `PLATFORM_FALLBACKS.length === 1`; adding a new entry will
- * fail that test, forcing the contract bump.
+ * New code MUST NOT import `PLATFORM_FALLBACKS`. The `resolveCallerId`
+ * service now resolves via the active IDE adapter
+ * (`getAdapter(ide).resolveCallerId(env)`), with `PEAKS_CALLER_ID` /
+ * `--caller-id <id>` as the vendor-neutral short-circuits.
  *
- * Adding an entry does NOT require code changes to read points
- * (statusline, doctor, sc, session-info) — they all call the same
- * resolver. Each entry is a one-line additive change.
+ * See `.peaks/_runtime/2026-08-03-session-bee258/rd/requests/001-2026-08-03-presence-lease-graph-design.md`
+ * for the slice 4.0.8 contract.
  */
-export const PLATFORM_FALLBACKS = [
-    {
-        envVar: 'CLAUDE_CODE_SESSION_ID',
-        description: 'Claude Code session id',
-        addedIn: '1.3.7'
-    }
-    // Future entries (do NOT add without bumping the contract's A5):
-    // { envVar: 'CURSOR_SESSION_ID', description: 'Cursor session id', addedIn: 'TBD' },
-    // { envVar: 'WINDSURF_SESSION_ID', description: 'Windsurf session id', addedIn: 'TBD' },
-    // { envVar: 'PEAKS_IDE_SESSION_ID', description: 'peaks-ide session id', addedIn: 'TBD' },
-];
+/**
+ * @deprecated 4.0.8 — caller resolution is now adapter-owned. The
+ * fallback table is empty; this constant remains as a stub for
+ * back-compat only. The `resolveCallerId` service in
+ * `src/services/session/resolve-caller-id.ts` no longer reads it.
+ */
+export const PLATFORM_FALLBACKS = [];

package/dist/services/session/resolve-caller-id.d.ts

@@ -1,57 +1,92 @@
 /**
- * Caller-Id Resolution (slice 020 — caller-keyed session binding).
+ * Caller-Id Resolution (slice 020 — caller-keyed session binding,
+ * refactored in slice 4.0.8 to be adapter-owned per RD §5 + C1).
  *
- * `resolveCallerId` is the single source of truth for "who is calling
- * the CLI". The resolver applies D4 priority (flag > env > platform
- * fallback > reject) and validates the winner against D1's regex;
- * failures throw `CallerIdError` (D2 → exit 64, D5 → exit 65).
+ * As of 4.0.8 the per-platform `PLATFORM_FALLBACKS` table is DELETED.
+ * Per the user-confirmed product decision (2026-08-03, C1):
+ *
+ *   "Every caller resolution MUST go through the active IDE adapter.
+ *    Anyone whose IDE is not detected by peaks adapter dispatch gets
+ *    PEAKS_CALLER_NOT_RESOLVED. This is the desired product contract
+ *    (vendor-neutral)."
+ *
+ * Resolution order (4.0.8):
+ *   1. `opts.flagValue` (per-invocation `--caller-id <id>` override) →
+ *      a vendor-neutral flag short-circuits BEFORE the adapter.
+ *   2. `opts.envOverride ?? process.env.PEAKS_CALLER_ID` (vendor-neutral
+ *      env override) → also short-circuits BEFORE the adapter, so CI
+ *      / scripted usage can still pin a caller id without an adapter.
+ *      The trimmed value MUST match `CALLER_ID_REGEX` or we throw.
+ *   3. The active IDE adapter's `resolveCallerId(env)` method. The
+ *      adapter owns its priority rules; vendor signal lives ONLY in
+ *      the adapter. The adapter throws `PEAKS_CALLER_NOT_RESOLVED`
+ *      (via `(err as { code: string }).code`) on unsupported / missing
+ *      resolution. We surface the same code on the boundary.
+ *   4. → **D2 fires**: throw `CallerIdError(EX_USAGE, 'none', ...)`
+ *      after surfacing `PEAKS_CALLER_NOT_RESOLVED` upstream.
  *
  * The function is synchronous and pure. It does NOT touch the
  * filesystem, does NOT read any caller binding file, and does NOT
  * mutate state. The caller (a CLI command, a service, a test) decides
  * what to do with the resolved id.
  *
- * See `.peaks/_runtime/2026-06-09-session-8bfe7d/prd/source/caller-id-contract.md`
- * for the freeze-in contract (D1-D7).
+ * See `.peaks/_runtime/2026-08-03-session-bee258/rd/requests/001-2026-08-03-presence-lease-graph-design.md`
+ * for the slice 4.0.8 contract.
  */
-import { CallerIdError } from './caller-id-types.js';
+import { CallerIdError, type CallerProjection, type CallerProjectionSource } from './caller-id-types.js';
 export { CallerIdError };
+export type { CallerProjection, CallerProjectionSource };
 export interface ResolveCallerIdOptions {
     /**
      * The `--caller-id <id>` flag value (per-invocation override).
-     * D4 priority level 1: flag wins.
+     * Priority level 1: flag wins. Validated against CALLER_ID_REGEX.
      */
     flagValue?: string;
     /**
-     * Override for the `PEAKS_CALLER_ID` environment variable. D4
-     * priority level 2: env wins. Defaults to `process.env.PEAKS_CALLER_ID`.
-     * The override exists so tests can run without mutating process.env.
+     * Override for the `PEAKS_CALLER_ID` environment variable. Priority
+     * level 2: env wins. Defaults to `process.env.PEAKS_CALLER_ID`. The
+     * override exists so tests can run without mutating process.env.
      */
     envOverride?: string;
     /**
      * The env object to read. Defaults to `process.env`. Exists so
-     * tests can drive Level 3 (platform fallback) without mutating
-     * process.env.
+     * tests can drive Level 3 (adapter) without mutating process.env.
      */
     env?: NodeJS.ProcessEnv;
+    /**
+     * The IDE id to use for adapter-driven resolution. Defaults to
+     * `detectInstalledIde(process.cwd())` or `'claude-code'` when no IDE
+     * is detected. Tests can pin the adapter via this option.
+     */
+    ideId?: string;
+    /**
+     * The project root for IDE auto-detection. Defaults to
+     * `process.cwd()`. Passed through to `detectInstalledIde`.
+     */
+    projectRoot?: string;
 }
 /**
- * Resolve the calling process's callerId per D1-D5.
- *
- * D4 priority (strict, no merge):
- *   1. `opts.flagValue` (per-invocation `--caller-id <id>` override)
- *   2. `opts.envOverride ?? process.env.PEAKS_CALLER_ID` (per-process declaration)
- *   3. First non-empty entry in `PLATFORM_FALLBACKS` (platform default)
- *   4. → **D2 fires**: throw `CallerIdError` (EX_USAGE, exit 64)
- *
- * On success: returns the resolved id (matches D1's regex, validated).
- * On D2 (nothing set): throws `CallerIdError` (EX_USAGE, exit 64).
- * On D5 (regex fail): throws `CallerIdError` (EX_DATAERR, exit 65).
+ * Resolve the calling process's callerId per the 4.0.8 adapter-owned
+ * contract. See file header for the full priority table. On failure
+ * (no flag, no env, adapter threw PEAKS_CALLER_NOT_RESOLVED), throws
+ * a `CallerIdError(EX_USAGE, 'none', ...)`.
  *
  * @example
- *   resolveCallerId({ flagValue: 'foo-bar' })  // → 'foo-bar'
- *   resolveCallerId({ envOverride: 'baz' })    // → 'baz'
- *   resolveCallerId({ env: { CLAUDE_CODE_SESSION_ID: 'sid-123' } })  // → 'sid-123'
- *   resolveCallerId()                          // → throws CallerIdError (EX_USAGE)
+ *   resolveCallerId({ flagValue: 'foo-bar' })           // → 'foo-bar'
+ *   resolveCallerId({ envOverride: 'baz' })             // → 'baz'
+ *   resolveCallerId({ env: { CLAUDE_CODE_SESSION_ID: 'sid-123' } })
+ *                                                          // → 'sid-123'
+ *   resolveCallerId()                                   // → throws CallerIdError (EX_USAGE)
  */
 export declare function resolveCallerId(opts?: ResolveCallerIdOptions): string;
+/**
+ * Projected resolution for the 4.0.8 contract. Returns a typed
+ * `CallerProjection` envelope so consumers can read the adapter id +
+ * callerId + (optional) workflowId / graphRef in one call.
+ *
+ * Pure: does not touch the filesystem, does not consult the lease or
+ * the index. The `workflowId` / `graphRef` fields stay `null` here;
+ * callers that need the full binding should resolve the lease via
+ * `presence-lease-service` after the caller id is in hand.
+ */
+export declare function resolveCallerProjection(opts?: ResolveCallerIdOptions): CallerProjection;

package/dist/services/session/resolve-caller-id.js

@@ -1,21 +1,41 @@
 /**
- * Caller-Id Resolution (slice 020 — caller-keyed session binding).
+ * Caller-Id Resolution (slice 020 — caller-keyed session binding,
+ * refactored in slice 4.0.8 to be adapter-owned per RD §5 + C1).
  *
- * `resolveCallerId` is the single source of truth for "who is calling
- * the CLI". The resolver applies D4 priority (flag > env > platform
- * fallback > reject) and validates the winner against D1's regex;
- * failures throw `CallerIdError` (D2 → exit 64, D5 → exit 65).
+ * As of 4.0.8 the per-platform `PLATFORM_FALLBACKS` table is DELETED.
+ * Per the user-confirmed product decision (2026-08-03, C1):
+ *
+ *   "Every caller resolution MUST go through the active IDE adapter.
+ *    Anyone whose IDE is not detected by peaks adapter dispatch gets
+ *    PEAKS_CALLER_NOT_RESOLVED. This is the desired product contract
+ *    (vendor-neutral)."
+ *
+ * Resolution order (4.0.8):
+ *   1. `opts.flagValue` (per-invocation `--caller-id <id>` override) →
+ *      a vendor-neutral flag short-circuits BEFORE the adapter.
+ *   2. `opts.envOverride ?? process.env.PEAKS_CALLER_ID` (vendor-neutral
+ *      env override) → also short-circuits BEFORE the adapter, so CI
+ *      / scripted usage can still pin a caller id without an adapter.
+ *      The trimmed value MUST match `CALLER_ID_REGEX` or we throw.
+ *   3. The active IDE adapter's `resolveCallerId(env)` method. The
+ *      adapter owns its priority rules; vendor signal lives ONLY in
+ *      the adapter. The adapter throws `PEAKS_CALLER_NOT_RESOLVED`
+ *      (via `(err as { code: string }).code`) on unsupported / missing
+ *      resolution. We surface the same code on the boundary.
+ *   4. → **D2 fires**: throw `CallerIdError(EX_USAGE, 'none', ...)`
+ *      after surfacing `PEAKS_CALLER_NOT_RESOLVED` upstream.
  *
  * The function is synchronous and pure. It does NOT touch the
  * filesystem, does NOT read any caller binding file, and does NOT
  * mutate state. The caller (a CLI command, a service, a test) decides
  * what to do with the resolved id.
  *
- * See `.peaks/_runtime/2026-06-09-session-8bfe7d/prd/source/caller-id-contract.md`
- * for the freeze-in contract (D1-D7).
+ * See `.peaks/_runtime/2026-08-03-session-bee258/rd/requests/001-2026-08-03-presence-lease-graph-design.md`
+ * for the slice 4.0.8 contract.
  */
-import { CALLER_ID_REGEX, CallerIdError } from './caller-id-types.js';
-import { PLATFORM_FALLBACKS } from './platform-fallbacks.js';
+import { CALLER_ID_REGEX, CallerIdError, } from './caller-id-types.js';
+import { getAdapter } from '../ide/ide-registry.js';
+import { detectInstalledIde } from '../ide/ide-detector.js';
 // Re-export for CLI consumers (avoids a second import line).
 export { CallerIdError };
 /**
@@ -25,22 +45,11 @@ export { CallerIdError };
 function isNonEmpty(value) {
     return typeof value === 'string' && value.length > 0;
 }
-/**
- * Read a single platform-fallback env var from `env`. Returns the
- * non-empty trimmed value or `undefined`. Logs nothing.
- */
-function readPlatformFallback(env) {
-    for (let i = 0; i < PLATFORM_FALLBACKS.length; i++) {
-        const candidate = env[PLATFORM_FALLBACKS[i].envVar];
-        if (isNonEmpty(candidate)) {
-            return { value: candidate, index: i };
-        }
-    }
-    return undefined;
-}
 /**
  * Validate `value` against D1's regex. Returns the value on success,
- * throws `CallerIdError` (EX_DATAERR, exit 65) on failure.
+ * throws `CallerIdError` (EX_DATAERR, exit 65) on failure. The
+ * `PEAKS_CALLER_NOT_RESOLVED` code is reserved for the "no signal"
+ * case; this function only fires for shape mismatch.
  */
 function validateCallerId(value, source) {
     if (!CALLER_ID_REGEX.test(value)) {
@@ -49,40 +58,105 @@ function validateCallerId(value, source) {
     return value;
 }
 /**
- * Resolve the calling process's callerId per D1-D5.
- *
- * D4 priority (strict, no merge):
- *   1. `opts.flagValue` (per-invocation `--caller-id <id>` override)
- *   2. `opts.envOverride ?? process.env.PEAKS_CALLER_ID` (per-process declaration)
- *   3. First non-empty entry in `PLATFORM_FALLBACKS` (platform default)
- *   4. → **D2 fires**: throw `CallerIdError` (EX_USAGE, exit 64)
- *
- * On success: returns the resolved id (matches D1's regex, validated).
- * On D2 (nothing set): throws `CallerIdError` (EX_USAGE, exit 64).
- * On D5 (regex fail): throws `CallerIdError` (EX_DATAERR, exit 65).
+ * Resolve the calling process's callerId per the 4.0.8 adapter-owned
+ * contract. See file header for the full priority table. On failure
+ * (no flag, no env, adapter threw PEAKS_CALLER_NOT_RESOLVED), throws
+ * a `CallerIdError(EX_USAGE, 'none', ...)`.
  *
  * @example
- *   resolveCallerId({ flagValue: 'foo-bar' })  // → 'foo-bar'
- *   resolveCallerId({ envOverride: 'baz' })    // → 'baz'
- *   resolveCallerId({ env: { CLAUDE_CODE_SESSION_ID: 'sid-123' } })  // → 'sid-123'
- *   resolveCallerId()                          // → throws CallerIdError (EX_USAGE)
+ *   resolveCallerId({ flagValue: 'foo-bar' })           // → 'foo-bar'
+ *   resolveCallerId({ envOverride: 'baz' })             // → 'baz'
+ *   resolveCallerId({ env: { CLAUDE_CODE_SESSION_ID: 'sid-123' } })
+ *                                                          // → 'sid-123'
+ *   resolveCallerId()                                   // → throws CallerIdError (EX_USAGE)
  */
 export function resolveCallerId(opts = {}) {
-    const env = opts.env ?? process.env;
-    // D4 level 1: flag value
+    // Priority level 1: flag value.
     if (isNonEmpty(opts.flagValue)) {
         return validateCallerId(opts.flagValue, 'flag');
     }
-    // D4 level 2: env var
-    const envValue = isNonEmpty(opts.envOverride) ? opts.envOverride : env.PEAKS_CALLER_ID;
+    // Priority level 2: env var (vendor-neutral override).
+    const envValue = isNonEmpty(opts.envOverride) ? opts.envOverride : opts.env?.PEAKS_CALLER_ID ?? process.env.PEAKS_CALLER_ID;
     if (isNonEmpty(envValue)) {
         return validateCallerId(envValue, 'env');
     }
-    // D4 level 3: PLATFORM_FALLBACKS table (top-to-bottom)
-    const fallback = readPlatformFallback(env);
-    if (fallback !== undefined) {
-        return validateCallerId(fallback.value, 'fallback');
+    // Priority level 3: active IDE adapter. The adapter owns its own
+    // priority rules and throws `PEAKS_CALLER_NOT_RESOLVED` when no
+    // vendor signal is present (or when the vendor signal is reserved /
+    // unverified). We re-throw on the boundary as CallerIdError(EX_USAGE)
+    // so legacy CLI consumers keep their exit-code contract.
+    const env = opts.env ?? process.env;
+    const projectRoot = opts.projectRoot ?? process.cwd();
+    const ideId = opts.ideId ?? detectInstalledIde(projectRoot) ?? 'claude-code';
+    const adapter = getAdapter(ideId);
+    try {
+        return adapter.resolveCallerId(env);
+    }
+    catch (err) {
+        const code = err.code;
+        if (code !== 'PEAKS_CALLER_NOT_RESOLVED')
+            throw err;
+        throw new CallerIdError('EX_USAGE', 'none', `No caller id available from IDE adapter "${ideId}" (PEAKS_CALLER_NOT_RESOLVED). ` +
+            'Set PEAKS_CALLER_ID or pass --caller-id, or ensure the active IDE is detected.');
+    }
+}
+/**
+ * Projected resolution for the 4.0.8 contract. Returns a typed
+ * `CallerProjection` envelope so consumers can read the adapter id +
+ * callerId + (optional) workflowId / graphRef in one call.
+ *
+ * Pure: does not touch the filesystem, does not consult the lease or
+ * the index. The `workflowId` / `graphRef` fields stay `null` here;
+ * callers that need the full binding should resolve the lease via
+ * `presence-lease-service` after the caller id is in hand.
+ */
+export function resolveCallerProjection(opts = {}) {
+    const env = opts.env ?? process.env;
+    const projectRoot = opts.projectRoot ?? process.cwd();
+    const ideId = opts.ideId ?? detectInstalledIde(projectRoot) ?? 'claude-code';
+    // 1. Flag — caller supplied --caller-id <id>.
+    if (isNonEmpty(opts.flagValue)) {
+        const validated = validateCallerId(opts.flagValue, 'flag');
+        return {
+            adapterId: ideId,
+            callerId: validated,
+            workflowId: null,
+            graphRef: null,
+            source: 'env-flag',
+        };
+    }
+    // 2. Env-flag — PEAKS_CALLER_ID override.
+    const envValue = isNonEmpty(opts.envOverride) ? opts.envOverride : env.PEAKS_CALLER_ID;
+    if (isNonEmpty(envValue)) {
+        const validated = validateCallerId(envValue, 'env');
+        return {
+            adapterId: ideId,
+            callerId: validated,
+            workflowId: null,
+            graphRef: null,
+            source: 'env-flag',
+        };
+    }
+    // 3. Adapter — the active IDE owns its priority rules.
+    const adapter = getAdapter(ideId);
+    try {
+        const callerId = adapter.resolveCallerId(env);
+        return {
+            adapterId: ideId,
+            callerId,
+            workflowId: null,
+            graphRef: null,
+            source: 'adapter',
+        };
+    }
+    catch (err) {
+        const code = err.code;
+        if (code !== 'PEAKS_CALLER_NOT_RESOLVED')
+            throw err;
+        // Caller not resolved: throw the canonical error so CLI boundaries
+        // can map exit codes deterministically. The CallerProjection form
+        // is for success paths; failure surfaces as CallerIdError.
+        throw new CallerIdError('EX_USAGE', 'none', `No caller id available from IDE adapter "${ideId}" (PEAKS_CALLER_NOT_RESOLVED). ` +
+            'Set PEAKS_CALLER_ID or pass --caller-id, or ensure the active IDE is detected.');
     }
-    // D4 level 4: D2 fires — no callerId available
-    throw new CallerIdError('EX_USAGE', 'none', 'No caller id available. Set PEAKS_CALLER_ID or pass --caller-id.');
 }

package/dist/services/session/session-manager.d.ts

@@ -126,35 +126,6 @@ export declare function getSessionId(projectRoot: string): string | null;
  * so this variant is opt-in.
  */
 export declare function getSessionIdCanonical(projectRoot: string): string | null;
-/**
- * Slice 4.0.7-dogfood-PR-2 (ice-cola surface probe 2026-08-02): the
- * single shared resolver that the peaks code / peaks workflow / peaks
- * route CLI families now use to look up the active session id.
- *
- * Pre-rid each of these 4 CLIs had its own private helper that read
- * `getSkillPresence` (which is `.peaks/.active-skill.json`, set by
- * `peaks skill presence:set <skill>`) instead of the canonical binding
- * (`.peaks/_runtime/session.json`, written by `peaks workspace init`).
- * As a result, any session that was created via `peaks workspace init`
- * but never had `peaks skill presence:set peaks-code` called on it
- * (the common case for downstream consumer projects and any 24h-mode
- * session that never flips sub-skills) reported `NO_ACTIVE_SESSION`
- * from the 4 affected CLIs even though `peaks session info --active`
- * returned a valid id.
- *
- * Resolution order:
- *   1. explicit `override` (caller-passed --session-id)
- *   2. canonicalize-on-read (`getSessionIdCanonical`) — handles the
- *      stored "." vs caller-passed absolute realpath mismatch
- *   3. strict-equality fallback (`getSessionId`) — handles the
- *      pre-canonicalize binding form
- *
- * The function returns `null` when no binding exists; callers must
- * decide whether `null` is a hard error (most CLIs print
- * `NO_ACTIVE_SESSION` and exit 1) or a soft skip (a few CLIs
- * silently use `'unknown-sid'` as the dispatch fallback).
- */
-export declare function resolveActiveSessionId(projectRoot: string, override?: string): string | null;
 /**
  * Get the absolute path to the current session directory.
  * Creates the session if it doesn't exist.

package/dist/services/session/session-manager.js

@@ -408,39 +408,6 @@ export function getSessionIdCanonical(projectRoot) {
     const info = readSessionFileCanonical(projectRoot);
     return info?.sessionId ?? null;
 }
-/**
- * Slice 4.0.7-dogfood-PR-2 (ice-cola surface probe 2026-08-02): the
- * single shared resolver that the peaks code / peaks workflow / peaks
- * route CLI families now use to look up the active session id.
- *
- * Pre-rid each of these 4 CLIs had its own private helper that read
- * `getSkillPresence` (which is `.peaks/.active-skill.json`, set by
- * `peaks skill presence:set <skill>`) instead of the canonical binding
- * (`.peaks/_runtime/session.json`, written by `peaks workspace init`).
- * As a result, any session that was created via `peaks workspace init`
- * but never had `peaks skill presence:set peaks-code` called on it
- * (the common case for downstream consumer projects and any 24h-mode
- * session that never flips sub-skills) reported `NO_ACTIVE_SESSION`
- * from the 4 affected CLIs even though `peaks session info --active`
- * returned a valid id.
- *
- * Resolution order:
- *   1. explicit `override` (caller-passed --session-id)
- *   2. canonicalize-on-read (`getSessionIdCanonical`) — handles the
- *      stored "." vs caller-passed absolute realpath mismatch
- *   3. strict-equality fallback (`getSessionId`) — handles the
- *      pre-canonicalize binding form
- *
- * The function returns `null` when no binding exists; callers must
- * decide whether `null` is a hard error (most CLIs print
- * `NO_ACTIVE_SESSION` and exit 1) or a soft skip (a few CLIs
- * silently use `'unknown-sid'` as the dispatch fallback).
- */
-export function resolveActiveSessionId(projectRoot, override) {
-    if (override !== undefined && override.length > 0)
-        return override;
-    return getSessionIdCanonical(projectRoot) ?? getSessionId(projectRoot);
-}
 /**
  * Get the absolute path to the current session directory.
  * Creates the session if it doesn't exist.