lark-remote 0.4.4 → 0.5.0

package/dist/runner/opencode/acp/runner.js

@@ -22,7 +22,7 @@
 import { ConnectionManager, } from '../../common/jsonrpc/connection-manager.js';
 import { OpencodeAcpTranslator } from './translator.js';
 import { RpcErrorCode, } from '../../common/acp/protocol-types.js';
-import { OPENCODE_APPROVAL_KINDS, buildAcpPermissionOutcome, } from '../../common/acp/protocol-helpers.js';
+import { OPENCODE_APPROVAL_KINDS, buildAcpPermissionOutcome, } from '../../common/acp/acp-approval.js';
 import { getLogger } from '../../../logger/index.js';
 import { BaseAcpRunner } from '../../common/acp/base-acp-runner.js';
 import { OpencodeLogErrorMonitor, resolveOpencodeLogPath } from './error-monitor.js';
@@ -30,7 +30,7 @@ import { OpencodeLogErrorMonitor, resolveOpencodeLogPath } from './error-monitor
 // Runner
 // =============================================================================
 export class OpencodeAcpRunner extends BaseAcpRunner {
-    /** Configured session mode applied via session/set_mode (§P5). */
+    /** Configured session mode applied via session/set_mode. */
     configuredMode;
     /** Current session mode id, parsed from session/new|resume configOptions. */
     currentModeId;
@@ -103,7 +103,7 @@ export class OpencodeAcpRunner extends BaseAcpRunner {
         return new OpencodeAcpTranslator();
     }
     async applyTurnSettings(client, sessionId) {
-        // §P5: apply the configured mode (build/plan). If the session already
+        // apply the configured mode (build/plan). If the session already
         // runs it (from session/new|resume configOptions), skip the wire call;
         // otherwise send session/set_mode and refresh the local view (opencode
         // sends no notification for set_mode).
@@ -160,7 +160,7 @@ export class OpencodeAcpRunner extends BaseAcpRunner {
         };
     }
     /**
-     * Hot-apply a mode change to the live ACP session (§P5).
+     * Hot-apply a mode change to the live ACP session.
      *
      * opencode's session/set_mode sends no notification — the client refreshes
      * the local mode view itself. The local mode is always updated so

package/dist/runner/opencode/acp/translator.js

@@ -24,7 +24,7 @@
  *   prompt other stopReason/error  → result error
  *   session/request_permission     → approval_requested (optionId echo)
  */
-import { deriveAcpAvailableDecisions, truncateWithEllipsis, } from '../../common/acp/protocol-helpers.js';
+import { deriveAcpAvailableDecisions, truncateWithEllipsis, } from '../../common/acp/acp-approval.js';
 import { getLogger } from '../../../logger/index.js';
 import { BaseAcpTranslator } from '../../common/acp/base-translator.js';
 // =============================================================================
@@ -176,7 +176,7 @@ export class OpencodeAcpTranslator extends BaseAcpTranslator {
             kind: 'command',
             command: params.toolCall.title ?? undefined,
             reason: rawInput ? truncateWithEllipsis(stringify(rawInput), 200) : undefined,
-            // §P4: 从服务端 options kind 派生——带 allow_always（或 approve_always）
+            // 从服务端 options kind 派生——带 allow_always（或 approve_always）
             // 才提供「本会话总是允许」（acceptForSession）。
             availableDecisions: deriveAcpAvailableDecisions(params.options ?? []),
         };

package/dist/runner/pi/rpc/runner.d.ts

@@ -30,7 +30,7 @@ export interface PiRpcRunnerOptions {
     thinking?: string;
     /** Tool allowlist. */
     tools?: string[];
-    workspace: string;
+    cwd: string;
     sessionReader: AgentSessionReader;
     /** Path to the pi binary. Defaults to `pi`. */
     binary?: string;

package/dist/runner/pi/rpc/runner.js

@@ -53,7 +53,7 @@ export class PiRpcRunner extends ConnectionBasedRunner {
             idleTtlMs: opts.idleTtlMs,
             logTag: 'pi-rpc-connection-manager',
         });
-        // 协议停止通道（design §3.3）：pi 的 cancel 是 `{type:'abort'}` 通知，已由
+        // 协议停止通道：pi 的 cancel 是 `{type:'abort'}` 通知，已由
         // cancelCurrentTurn 实现；登记后 win32 优雅停止才有通道可用（否则一路树杀）。
         this.manager.stopper = ({ client }) => this.buildCooperativeStop(client);
     }
@@ -139,7 +139,7 @@ export class PiRpcRunner extends ConnectionBasedRunner {
         this.promptSettled = false;
         const response = await client.request({ type: 'prompt', message });
         if (!response.success) {
-            // CC-08: pi 返回 success:false（无效模型/provider 错误/忙）时立即失败，
+            // pi 返回 success:false（无效模型/provider 错误/忙）时立即失败，
             // 不能当成成功 ACK 继续等 agent_settled（否则最长 turn idle timeout）。
             throw new Error(`pi prompt failed: ${response.error ?? 'unknown error'}`);
         }

package/dist/runner/pi/rpc/translator.d.ts

@@ -25,7 +25,6 @@ export declare class PiRpcTranslator {
     private currentContentIndex;
     private sessionId;
     private operationKind;
-    private currentTurnId;
     private accInput;
     private accOutput;
     private accCacheRead;
@@ -33,7 +32,7 @@ export declare class PiRpcTranslator {
     private accReasoning;
     private lastTotalTokens;
     private hasUsage;
-    /** toolcall_start bookkeeping：占位不发事件，end 时补发完整 tool_use（C3.4）。 */
+    /** toolcall_start bookkeeping：占位不发事件，end 时补发完整 tool_use。 */
     private pendingToolCall;
     /** Provider failure (stopReason="error") on the final assistant message. */
     private lastAssistantStopReason;

package/dist/runner/pi/rpc/translator.js

@@ -15,7 +15,6 @@ export class PiRpcTranslator {
     currentContentIndex = -1;
     sessionId = '';
     operationKind = 'turn';
-    currentTurnId = '';
     // ccusage-aligned usage accumulation (per-message, summed across the turn).
     accInput = 0;
     accOutput = 0;
@@ -24,7 +23,7 @@ export class PiRpcTranslator {
     accReasoning = 0;
     lastTotalTokens;
     hasUsage = false;
-    /** toolcall_start bookkeeping：占位不发事件，end 时补发完整 tool_use（C3.4）。 */
+    /** toolcall_start bookkeeping：占位不发事件，end 时补发完整 tool_use。 */
     pendingToolCall = false;
     /** Provider failure (stopReason="error") on the final assistant message. */
     lastAssistantStopReason;
@@ -99,7 +98,7 @@ export class PiRpcTranslator {
                 return [];
             }
             case 'compaction_start': {
-                // 信息保真 C3.4：压缩过程用户可见（info 通知），不再静默。
+                // 信息保真 压缩过程用户可见（info 通知），不再静默。
                 const c = evt;
                 return [
                     {
@@ -126,7 +125,7 @@ export class PiRpcTranslator {
             }
             default:
                 // turn_start/turn_end, agent_start/agent_end, tool_execution_*, and
-                // unknown types are ignored. (compaction_start/end 自 C3.4 起映射为
+                // unknown types are ignored. (compaction_start/end 映射为
                 // notice 事件，不再静默。)
                 return [];
         }
@@ -134,7 +133,6 @@ export class PiRpcTranslator {
     /** Self-produced turn_started (no wire equivalent). */
     produceTurnStarted(sessionId, turnId) {
         this.sessionId = sessionId;
-        this.currentTurnId = turnId;
         return {
             type: 'turn_started',
             threadId: sessionId,
@@ -271,7 +269,7 @@ export class PiRpcTranslator {
                 }
                 break;
             case 'toolcall_start':
-                // 信息保真 C3.4：不再 push 空壳 tool_use（空 id/name 会被渲染成
+                // 信息保真 不再 push 空壳 tool_use（空 id/name 会被渲染成
                 // 无意义工具块）。只保留 bookkeeping，toolcall_end 补发完整事件。
                 this.pendingToolCall = true;
                 break;

package/dist/runner/registry.d.ts

@@ -1,7 +1,7 @@
 import type { AgentKind, Runner } from './index.js';
 /**
  * Registry of agent factories, keyed by `AgentKind`. `index.ts` registers one
- * factory per available agent at startup; `Bridge.getRunner(workspace)` looks
+ * factory per available agent at startup; `Bridge.getRunner(cwd)` looks
  * up `config.defaultAgent` here to pick the concrete runner.
  *
  * Singleton caching: the factory MAY cache its instance internally. All
@@ -17,7 +17,7 @@ export declare class AgentRegistry {
     private readonly displayNames;
     /** Container for runtime config updates (pi provider dynamic reload). */
     private configContainer?;
-    register(kind: AgentKind, factory: (workspace: string) => Runner): void;
+    register(kind: AgentKind, factory: (cwd: string) => Runner): void;
     /**
      * 注册 agent 的显示名。应在 register(kind, factory) 后调用。
      * 用于 agentDisplayName 等全局查询，实现单点真相。
@@ -50,5 +50,5 @@ export declare class AgentRegistry {
     getConfigContainer(): {
         current: unknown;
     } | undefined;
-    get(kind: AgentKind, workspace: string): Runner;
+    get(kind: AgentKind, cwd: string): Runner;
 }

package/dist/runner/registry.js

@@ -5,7 +5,7 @@
 let globalRegistry;
 /**
  * Registry of agent factories, keyed by `AgentKind`. `index.ts` registers one
- * factory per available agent at startup; `Bridge.getRunner(workspace)` looks
+ * factory per available agent at startup; `Bridge.getRunner(cwd)` looks
  * up `config.defaultAgent` here to pick the concrete runner.
  *
  * Singleton caching: the factory MAY cache its instance internally. All
@@ -64,12 +64,12 @@ export class AgentRegistry {
     getConfigContainer() {
         return this.configContainer;
     }
-    get(kind, workspace) {
+    get(kind, cwd) {
         const factory = this.factories.get(kind);
         if (!factory) {
             throw new Error(`agent not registered: ${kind}`);
         }
-        return factory(workspace);
+        return factory(cwd);
     }
 }
 //# sourceMappingURL=registry.js.map

package/dist/runner/types.d.ts

@@ -395,7 +395,7 @@ export interface Runner {
     killOrphan(): void;
     registerExitHandlers(): void;
     /**
-     * Remove the runner from the process-level exit dispatcher (P1-1). Called by
+     * Remove the runner from the process-level exit dispatcher. Called by
      * the bridge when the (cwd, kind) cache slot is evicted so the instance is
      * not retained by the singleton dispatcher. Optional so test stubs that only
      * satisfy `registerExitHandlers` remain structurally valid.

package/dist/session/claude/session-index.d.ts

@@ -5,11 +5,22 @@ export interface SessionIndexEntry {
     fingerprint: string;
     mtimeMs: number;
     summary: string;
+    /**
+     * cwd 判等键集合（PathKit.pathKey 归一形态，win32/darwin 大小写+分隔符
+     * 不敏感）：索引的 byCwd 倒排与 cwdSet.has 查询都按这个形态比对。注意与
+     * {@link parseSessionJsonl} 返回的 raw cwdSet 区分——后者保持 JSONL 原样，
+     * 归一只发生在索引边界（见 normalizeCwdSet）。
+     */
     cwdSet: Set<string>;
 }
 export interface SessionIndexOptions {
     /** Minimum interval between refresh scans (ms). Default 5000. */
     refreshIntervalMs?: number;
+    /**
+     * 平台注入（测试用）；默认当前宿主。cwd 判等键（pathKey）按它取归一口径，
+     * win32 语义（大小写 + `\`/`/` 分隔符不敏感）可在任意宿主上单测。
+     */
+    platform?: NodeJS.Platform;
 }
 /** Claude-specific field-name mapping for content block extraction. */
 export declare const CLAUDE_MAPPING: ContentBlockMapping;
@@ -36,7 +47,7 @@ export interface ParsedSession {
 /**
  * Unified parser: single streaming scan of a JSONL file producing both
  * the complete set of cwd values AND the first real user message summary.
- * Replaces the split readCwdFromJsonl (first-cwd) + jsonlContainsCwd (any-cwd).
+ * Replaces the split readCwdFromJsonl (first-cwd) + fileContainsCwd (any-cwd).
  */
 export declare function parseSessionJsonl(filePath: string): ParsedSession;
 /**
@@ -57,6 +68,7 @@ export declare function buildFingerprint(filePath: string): string;
 export declare class SessionIndex {
     private readonly projectsDir;
     private readonly refreshIntervalMs;
+    private readonly platform;
     private readonly byPath;
     private readonly bySessionId;
     private readonly byCwd;

package/dist/session/claude/session-index.js

@@ -3,6 +3,8 @@ import path from 'node:path';
 import { scanJsonlLines } from '../common/jsonl.js';
 import { sortByRecencyDesc } from '../common/recency.js';
 import { extractContentBlocks } from '../common/content-blocks.js';
+import { pathKey } from '../../platform/path.js';
+import { currentPlatform } from '../../platform/select.js';
 import { getLogger } from '../../logger/index.js';
 // ─── Claude content block mapping (shared with sessions.ts) ─
 /** Claude-specific field-name mapping for content block extraction. */
@@ -42,7 +44,7 @@ export function extractText(content) {
 /**
  * Unified parser: single streaming scan of a JSONL file producing both
  * the complete set of cwd values AND the first real user message summary.
- * Replaces the split readCwdFromJsonl (first-cwd) + jsonlContainsCwd (any-cwd).
+ * Replaces the split readCwdFromJsonl (first-cwd) + fileContainsCwd (any-cwd).
  */
 export function parseSessionJsonl(filePath) {
     const cwdSet = new Set();
@@ -115,6 +117,17 @@ export function buildFingerprint(filePath) {
     return parts.join('|');
 }
 // ─── SessionIndex ───────────────────────────────────────────
+/**
+ * raw cwd → pathKey 判等键。只允许在「解析结果进入索引」的边界调用：
+ * JSONL 里的 cwd 形态（大小写/分隔符/尾斜杠）由写方决定，与查询侧
+ * pathKey(cwd) 不保证逐字符一致（win32 尤甚），索引键控必须两侧同口径归一。
+ */
+function normalizeCwdSet(raw, platform) {
+    const out = new Set();
+    for (const cwd of raw)
+        out.add(pathKey(cwd, { platform }));
+    return out;
+}
 /**
  * In-memory session index with three query views:
  *   byPath:      path → entry
@@ -127,6 +140,7 @@ export function buildFingerprint(filePath) {
 export class SessionIndex {
     projectsDir;
     refreshIntervalMs;
+    platform;
     byPath = new Map();
     bySessionId = new Map();
     byCwd = new Map();
@@ -139,6 +153,7 @@ export class SessionIndex {
     constructor(projectsDir, opts = {}) {
         this.projectsDir = projectsDir;
         this.refreshIntervalMs = opts.refreshIntervalMs ?? 5000;
+        this.platform = opts.platform ?? currentPlatform;
     }
     /** Whether a full scan has ever completed successfully (readdir succeeded). */
     get isBuilt() {
@@ -162,7 +177,7 @@ export class SessionIndex {
     }
     // ── Query: listByCwd ────────────────────────────────────
     listByCwd(cwd, opts = {}) {
-        const paths = this.byCwd.get(cwd);
+        const paths = this.byCwd.get(pathKey(cwd, { platform: this.platform }));
         if (!paths || paths.size === 0)
             return [];
         // Gather entries, deduplicate by sessionId (keep mtime newest)
@@ -211,7 +226,7 @@ export class SessionIndex {
             }
             if (currentFp === entry.fingerprint) {
                 // Fingerprint matches → trust index
-                if (entry.cwdSet.has(cwd))
+                if (entry.cwdSet.has(pathKey(cwd, { platform: this.platform })))
                     return entry;
                 continue;
             }
@@ -226,11 +241,11 @@ export class SessionIndex {
                     fingerprint: currentFp,
                     mtimeMs: Number(st.mtimeMs),
                     summary: parsed.summary.replace(/\s+/g, ' ').trim(),
-                    cwdSet: parsed.cwdSet,
+                    cwdSet: normalizeCwdSet(parsed.cwdSet, this.platform),
                 };
                 this.updateEntry(p, updated);
                 // Re-check cwd after update
-                if (updated.cwdSet.has(cwd))
+                if (updated.cwdSet.has(pathKey(cwd, { platform: this.platform })))
                     return updated;
             }
             catch {
@@ -304,7 +319,7 @@ export class SessionIndex {
                         fingerprint: fpAfter,
                         mtimeMs: Number(fileStat.mtimeMs),
                         summary: parsed.summary.replace(/\s+/g, ' ').trim(),
-                        cwdSet: parsed.cwdSet,
+                        cwdSet: normalizeCwdSet(parsed.cwdSet, this.platform),
                     };
                     this.updateEntry(fullPath, newEntry);
                 }

package/dist/session/claude/session-reader.d.ts

@@ -8,7 +8,7 @@ import type { AgentSession, AgentSessionReader, SessionContent } from '../../run
  * injects a reader configured with its test `projectsDir`; production code
  * uses the default (`~/.claude/projects/`).
  *
- * All methods are thin wrappers around `claude-sessions.ts` exports — zero
+ * All methods are thin wrappers around `sessions.ts` exports — zero
  * behavior change. Router and bridge reach session data exclusively through
  * this reader (via `SessionReaderRegistry`); the underlying functions remain
  * exported for tests and the reader itself.

package/dist/session/claude/session-reader.js

@@ -9,7 +9,7 @@ import { listClaudeSessions, getNewestSession, readSessionContent, isClaudeSessi
  * injects a reader configured with its test `projectsDir`; production code
  * uses the default (`~/.claude/projects/`).
  *
- * All methods are thin wrappers around `claude-sessions.ts` exports — zero
+ * All methods are thin wrappers around `sessions.ts` exports — zero
  * behavior change. Router and bridge reach session data exclusively through
  * this reader (via `SessionReaderRegistry`); the underlying functions remain
  * exported for tests and the reader itself.

package/dist/session/claude/sessions.js

@@ -30,7 +30,7 @@ function projectDirForCwd(cwd, projectsDir) {
  * to actually belong to the requested cwd. A relocated session contains
  * MULTIPLE cwd values (pre- and post-relocate) — accept when ANY `cwd` field
  * matches. Early-stops on the first match (findJsonlLine), keeping the
- * P2-2 single-pass parse-count anchors intact on the fallback path.
+ * single-pass parse-count anchors intact on the fallback path.
  * Regression 2026-08-04 EnterWorktree relocate.
  */
 function fileContainsCwd(filePath, cwd) {
@@ -109,8 +109,8 @@ function ensureSessionIndex(projectsDir) {
  * the project directory doesn't exist or no jsonl has a matching cwd field.
  */
 export function listClaudeSessions(cwd, opts = {}) {
-    // 不传 limit = 返回全集不切片；仅显式传值才 slice（契约迁移 plan §2.1，
-    // reader 拿全集算 total 后再自己按 offset/limit 切片）。
+    // 不传 limit = 返回全集不切片；仅显式传值才 slice
+    // reader 拿全集算 total 后再自己按 offset/limit 切片。
     const limit = opts.limit;
     const projectsDir = opts.projectsDir ?? defaultProjectsDir();
     const index = ensureSessionIndex(projectsDir);
@@ -218,7 +218,7 @@ export function isClaudeSessionActive(sessionId, cwd, opts = {}) {
     }
 }
 /**
- * P2-2 + P2-5 first-pass scan: stream the file once via `scanJsonlLines`
+ * first-pass scan: stream the file once via `scanJsonlLines`
  * (no `string[]` materialized), parse each line exactly once, and collect
  * all metadata needed by readSessionContent (usage, tailOffset, aiTitle,
  * recap, lastUserMessage). Does NOT retain parsed objects — the events tail
@@ -320,7 +320,7 @@ function scalarScan(filePath) {
     const l = acc.last;
     // contextLength = current context-window occupancy. Prefer compact_boundary
     // postTokens (the precise post-compact size); otherwise fall back to the
-    // last turn's input + cacheRead + cacheCreation (review P2-8 unified
+    // last turn's input + cacheRead + cacheCreation (unified
     // contract — excludes output/reasoning, which are generated, not part of
     // the input window). Take the max so a pre-compact turn larger than the
     // post-compact size is not under-reported.
@@ -353,12 +353,12 @@ function scalarScan(filePath) {
     };
 }
 /**
- * P2-2 + P2-5 second-pass tail mapper: expand one parsed tail line into
+ * second-pass tail mapper: expand one parsed tail line into
  * content-block events. Re-parses only tail lines (scanTailEvents does the
  * offset re-read + line filtering), so both raw line-string memory and
- * parsed-object memory are O(tail), not O(whole file) — P3-1 + P2-5.
+ * parsed-object memory are O(tail), not O(whole file) —.
  *
- * `maxEvents` capping (review P2-7 — unified "last N events" contract across
+ * `maxEvents` capping (unified "last N events" contract across
  * all readers) is applied by scanTailEvents.
  */
 function mapClaudeTailLine(obj) {
@@ -411,7 +411,7 @@ export function readSessionContent(sessionId, cwd, opts = {}) {
             return { events: [] };
         }
     }
-    // P2-2 + P3-1 + P2-5: First pass STREAMS the file once via
+    // First pass STREAMS the file once via
     // `scanJsonlLines` (no `string[]` materialized), parsing each line once to
     // collect scalars (usage, tailOffset, aiTitle, recap, lastUserMessage)
     // while retaining NO parsed objects and NO whole-file line array. The
@@ -425,7 +425,7 @@ export function readSessionContent(sessionId, cwd, opts = {}) {
     // full-file scan + tail re-parse of the usually-short post-user lines).
     // When the session has NO user message, tailOffset stays -1 and the tail
     // IS the whole file → scan(N) + tail(N) = 2.0× — the known asymptotic
-    // upper bound of the body's two-phase design (still better than pre-P2-2's
+    // upper bound of the body's two-phase design (still better than pre-'s
     // ~3×). Total parse count adds the index-miss fallback guard's fixed
     // early-stop overhead (~2 parses, independent of line count).
     const scan = scalarScan(filePath);

package/dist/session/codex/rollout-reader.d.ts

@@ -53,10 +53,10 @@ export declare function readCodexRollout(filePath: string): CodexRolloutEntry |
  * Returns `{ entries, total }`: `total` is the size of the full cwd-matched
  * set before pagination; `entries` are the newest `limit` entries by mtime.
  *
- * A global order over the full set is established first (plan §1.4: no early
+ * A global order over the full set is established first (no early
  * termination before ordering) using the lightweight session index — full
  * walk + first-line session_meta parse + stat mtime, 5s TTL cache. Only the
- * returned page is fully parsed for summary/usage (plan §2.2).
+ * returned page is fully parsed for summary/usage.
  */
 export declare function listCodexRollouts(opts?: ListCodexRolloutsOptions): {
     entries: CodexRolloutEntry[];
@@ -65,7 +65,7 @@ export declare function listCodexRollouts(opts?: ListCodexRolloutsOptions): {
 /**
  * Read the full content of a specific session by its threadId.
  *
- * P2-4: Uses session index for O(1) file lookup instead of walking the
+ * Uses session index for O(1) file lookup instead of walking the
  * entire directory tree and fully parsing every file. Only the matching
  * file is fully parsed.
  *
@@ -94,7 +94,7 @@ export declare function readCodexSessionSummary(sessionId: string, opts?: {
 /**
  * Check if a session is still active (recently updated).
  *
- * P2-4: Uses session index for direct file lookup, then checks mtime
+ * Uses session index for direct file lookup, then checks mtime
  * via statSync — no full rollout parse required. This reduces the
  * cost from "walk entire directory + full-parse every file" to a single
  * statSync call for the matching file.

package/dist/session/codex/rollout-reader.js

@@ -148,7 +148,7 @@ function scanCodexRollout(filePath, includeEvents) {
     // token_count 增量是 input/cached/output 全 0、只有 total_tokens 有值
     // （窗口被摘要+replacement history 占据），现有 zero-filter 会跳过它，
     // 因此这里必须单独捕获，不能复用 lastRawUsage。
-    // 单位口径（review P3-9）：前后两侧统一用 total_tokens —— 压缩前取最近一次
+    // 单位口径：前后两侧统一用 total_tokens —— 压缩前取最近一次
     // 非零 token_count 的 total_tokens（input+output，即该 turn 在窗口内的全部
     // token），压缩后取收尾事件的 total_tokens（压缩后窗口）。不得一边 input
     // 一边 total，否则「压缩前 X → 压缩后 Y」两边单位不一致。
@@ -279,7 +279,7 @@ function scanCodexRollout(filePath, includeEvents) {
  * (display-only, never added to total).
  * contextLength = input_tokens (= (input_tokens-cached) + cached + 0),
  * i.e. input + cacheRead + cacheCreation — the unified context-window
- * occupancy contract across all five readers (review P2-8, excludes
+ * occupancy contract across all five readers (excludes
  * output/reasoning).
  */
 function buildUsageFromScan(scan) {
@@ -325,10 +325,10 @@ function buildUsageFromScan(scan) {
  * Returns `{ entries, total }`: `total` is the size of the full cwd-matched
  * set before pagination; `entries` are the newest `limit` entries by mtime.
  *
- * A global order over the full set is established first (plan §1.4: no early
+ * A global order over the full set is established first (no early
  * termination before ordering) using the lightweight session index — full
  * walk + first-line session_meta parse + stat mtime, 5s TTL cache. Only the
- * returned page is fully parsed for summary/usage (plan §2.2).
+ * returned page is fully parsed for summary/usage.
  */
 export function listCodexRollouts(opts = {}) {
     const codexHome = resolveCodexHome(opts.codexHome);
@@ -338,7 +338,7 @@ export function listCodexRollouts(opts = {}) {
     const matched = [];
     for (const entry of index.values()) {
         // Subagent thread rollouts are part of a thread tree, not standalone
-        // sessions: exclude them explicitly (plan §2.1) so a pure-subagent
+        // sessions: exclude them explicitly so a pure-subagent
         // session (main file missing) never pollutes the list or total.
         if (entry.isSubagent)
             continue;
@@ -361,15 +361,15 @@ export function listCodexRollouts(opts = {}) {
     return { entries, total };
 }
 /**
- * W2.6 单源：三处（readCodexSessionContent / readCodexSessionSummary /
+ * 单源：三处（readCodexSessionContent / readCodexSessionSummary /
  * isCodexSessionActive）共用的「索引查找 + miss 强制刷新重查」。
  * cwd 守卫与 subagent 过滤语义各异，留在调用方。
  */
 function resolveRolloutEntry(sessionId, codexHome) {
-    // P2-4: Use session index for direct file lookup
+    // Use session index for direct file lookup
     let index = getSessionIndex(codexHome);
     let entry = index.get(sessionId);
-    // P3-2: On miss, the index may be stale (a rollout file created after the
+    // On miss, the index may be stale (a rollout file created after the
     // cache was built but within the 5s TTL). Force a refresh and recheck so a
     // brand-new session is found without waiting for TTL expiry.
     if (!entry) {
@@ -381,7 +381,7 @@ function resolveRolloutEntry(sessionId, codexHome) {
 /**
  * Read the full content of a specific session by its threadId.
  *
- * P2-4: Uses session index for O(1) file lookup instead of walking the
+ * Uses session index for O(1) file lookup instead of walking the
  * entire directory tree and fully parsing every file. Only the matching
  * file is fully parsed.
  *
@@ -399,9 +399,9 @@ export function readCodexSessionContent(sessionId, opts = {}) {
     }
     // Cwd guard: when a cwd is provided, the session's working directory must
     // match. Without this, /resume <id> finds sessions by global ID lookup and
-    // allows resuming a session from workspace B while the user is in workspace A.
+    // allows resuming a session from cwd B while the user is in cwd A.
     // Codex has no relocation (no EnterWorktree equivalent), so a simple equality
-    // check suffices — unlike claude which needs jsonlContainsCwd to handle
+    // check suffices — unlike claude which needs fileContainsCwd to handle
     // relocated sessions with multiple cwd values.
     if (opts.cwd && !samePath(entry.cwd, opts.cwd)) {
         return { events: [] };
@@ -457,7 +457,7 @@ export function readCodexSessionSummary(sessionId, opts = {}) {
 /**
  * Check if a session is still active (recently updated).
  *
- * P2-4: Uses session index for direct file lookup, then checks mtime
+ * Uses session index for direct file lookup, then checks mtime
  * via statSync — no full rollout parse required. This reduces the
  * cost from "walk entire directory + full-parse every file" to a single
  * statSync call for the matching file.
@@ -467,14 +467,14 @@ export function isCodexSessionActive(sessionId, opts = {}) {
     // Unify with the other readers' 1-hour stale window (claude/pi/opencode/kimi
     // all use STALE_MS). Previously codex used a divergent 10-minute default.
     const threshold = opts.activeThresholdMs ?? STALE_MS;
-    // P2-4: Use session index for direct file lookup + mtime check
+    // Use session index for direct file lookup + mtime check
     const entry = resolveRolloutEntry(sessionId, codexHome);
     if (!entry) {
         return false;
     }
     // Subagent thread rollouts are never "active sessions": their mtime
     // reflects thread-tree activity, not the parent session's liveness
-    // (plan §2.1). A pure-subagent session must report inactive.
+    // A pure-subagent session must report inactive.
     if (entry.isSubagent) {
         return false;
     }

package/dist/session/common/two-pass.js

@@ -1,6 +1,6 @@
 /**
- * Two-pass scan skeleton shared by the claude / pi session readers (P2-2 +
- * P2-5/P2-6 lineage): pass 1 STREAMS the whole file once via `scanJsonlLines`
+ * Two-pass scan skeleton shared by the claude / pi session readers (
+ * lineage): pass 1 STREAMS the whole file once via `scanJsonlLines`
  * (no `string[]` materialized), parsing each line exactly once to collect
  * scalars (usage, tail offset, title) while retaining NO parsed objects; pass
  * 2 re-reads ONLY the tail from the recorded offset and re-parses it for

package/dist/session/common/usage-accumulator.d.ts

@@ -55,13 +55,13 @@ export declare class UsageAccumulator {
      */
     bumpCompact(): void;
 }
-/** P2-8 统一契约：上下文窗口占用 = 末轮 input + cacheRead + cacheCreation（不含 output/reasoning）。 */
+/** 统一契约：上下文窗口占用 = 末轮 input + cacheRead + cacheCreation（不含 output/reasoning）。 */
 export declare function contextWindowOccupancy(l: {
     input: number;
     cacheRead: number;
     cacheCreation: number;
 }): number;
-/** P2-8 统一契约：session 全量累计字段组装（4 个 reader 共用：claude/dsh/kimi/pi；
+/** 统一契约：session 全量累计字段组装（4 个 reader 共用：claude/dsh/kimi/pi；
  * codex 走 last_token_usage 口径、opencode 保留自己的条件赋值，原为逐字段复制的 4 连拷贝）。 */
 export declare function cumulativeUsageFields(t: {
     input: number;

package/dist/session/common/usage-accumulator.js

@@ -69,11 +69,11 @@ export class UsageAccumulator {
         this._compactCount++;
     }
 }
-/** P2-8 统一契约：上下文窗口占用 = 末轮 input + cacheRead + cacheCreation（不含 output/reasoning）。 */
+/** 统一契约：上下文窗口占用 = 末轮 input + cacheRead + cacheCreation（不含 output/reasoning）。 */
 export function contextWindowOccupancy(l) {
     return l.input + l.cacheRead + l.cacheCreation;
 }
-/** P2-8 统一契约：session 全量累计字段组装（4 个 reader 共用：claude/dsh/kimi/pi；
+/** 统一契约：session 全量累计字段组装（4 个 reader 共用：claude/dsh/kimi/pi；
  * codex 走 last_token_usage 口径、opencode 保留自己的条件赋值，原为逐字段复制的 4 连拷贝）。 */
 export function cumulativeUsageFields(t) {
     return {

package/dist/session/dsh/sessions.d.ts

@@ -36,7 +36,7 @@ export declare class DshSessionReader implements AgentSessionReader {
         total: number;
     };
     getNewestSession(cwd: string): AgentSession | null;
-    readSessionContent(sessionId: string, cwd: string, opts?: {
+    readSessionContent(sessionId: string, _cwd: string, opts?: {
         maxEvents?: number;
     }): SessionContent;
     isSessionActive(sessionId: string, cwd: string): boolean;