lark-remote 0.1.5 → 0.1.7

package/dist/runner/resolve-agent-choices.js

@@ -1,6 +1,7 @@
+import { choiceFieldsFor } from './agent-choices-common.js';
 export function resolveAgentChoices(config) {
-    const choices = config.agentChoices;
     const agent = config.defaultAgent;
+    const choices = config.agentChoices;
     if (!choices || !agent) {
         return config;
     }
@@ -9,67 +10,25 @@ export function resolveAgentChoices(config) {
         return config;
     }
     const agentChoices = choices[agent];
-    if (!agentChoices) {
+    const fields = choiceFieldsFor(agent);
+    if (!agentChoices || !fields) {
         return config;
     }
     // Clone to avoid mutation
-    const resolved = JSON.parse(JSON.stringify(config));
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const resolvedAny = resolved;
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const agentChoicesAny = agentChoices;
-    switch (agent) {
-        case 'codex':
-            if (!resolvedAny.agents)
-                resolvedAny.agents = {};
-            if (!resolvedAny.agents.codex)
-                resolvedAny.agents.codex = {};
-            if (!resolvedAny.agents.codex.model && agentChoicesAny.model) {
-                resolvedAny.agents.codex.model = agentChoicesAny.model;
-            }
-            if (!resolvedAny.agents.codex.modelProvider && agentChoicesAny.modelProvider) {
-                resolvedAny.agents.codex.modelProvider = agentChoicesAny.modelProvider;
-            }
-            break;
-        case 'pi':
-            if (!resolvedAny.agents)
-                resolvedAny.agents = {};
-            if (!resolvedAny.agents.pi)
-                resolvedAny.agents.pi = {};
-            if (!resolvedAny.agents.pi.model && agentChoicesAny.model) {
-                resolvedAny.agents.pi.model = agentChoicesAny.model;
-            }
-            if (!resolvedAny.agents.pi.provider && agentChoicesAny.provider) {
-                resolvedAny.agents.pi.provider = agentChoicesAny.provider;
-            }
-            if (!resolvedAny.agents.pi.thinking && agentChoicesAny.thinking) {
-                resolvedAny.agents.pi.thinking = agentChoicesAny.thinking;
-            }
-            break;
-        case 'opencode':
-            if (!resolvedAny.agents)
-                resolvedAny.agents = {};
-            if (!resolvedAny.agents.opencode)
-                resolvedAny.agents.opencode = {};
-            if (!resolvedAny.agents.opencode.modelID && agentChoicesAny.modelID) {
-                resolvedAny.agents.opencode.modelID = agentChoicesAny.modelID;
-            }
-            if (!resolvedAny.agents.opencode.providerID && agentChoicesAny.providerID) {
-                resolvedAny.agents.opencode.providerID = agentChoicesAny.providerID;
-            }
-            break;
-        case 'kimi':
-            if (!resolvedAny.agents)
-                resolvedAny.agents = {};
-            if (!resolvedAny.agents.kimi)
-                resolvedAny.agents.kimi = {};
-            if (!resolvedAny.agents.kimi.model && agentChoicesAny.model) {
-                resolvedAny.agents.kimi.model = agentChoicesAny.model;
-            }
-            if (!resolvedAny.agents.kimi.thinkingEffort && agentChoicesAny.thinkingEffort) {
-                resolvedAny.agents.kimi.thinkingEffort = agentChoicesAny.thinkingEffort;
-            }
-            break;
+    const resolved = structuredClone(config);
+    // agents.codex 在 schema 中必填（带默认值），此处按旧语义补空对象；
+    // 运行时只往 [agent] 槽位写字段，不依赖 codex 默认值。
+    if (!resolved.agents) {
+        resolved.agents = {};
+    }
+    const agents = resolved.agents;
+    const target = (agents[agent] ??= {});
+    const source = agentChoices;
+    for (const { configKey, choicesKey } of fields) {
+        const value = source[choicesKey];
+        if (!target[configKey] && value) {
+            target[configKey] = value;
+        }
     }
     return resolved;
 }

package/dist/runner/sync-agent-choices.js

@@ -1,72 +1,21 @@
+import { choiceFieldsFor } from './agent-choices-common.js';
 export function syncAgentChoices(config, agent) {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const configAny = config;
-    const agents = configAny.agents || {};
-    const agentCfg = agents[agent];
-    // claude reads from top-level config.claude, not agents.claude
-    if (agent !== 'claude' && !agentCfg) {
+    // claude 的配置在顶层 config.claude，不在 agents 下，无需同步
+    const fields = choiceFieldsFor(agent);
+    if (!fields)
         return config;
-    }
-    const updated = JSON.parse(JSON.stringify(config));
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const updatedAny = updated;
-    if (!updatedAny.agentChoices) {
-        updatedAny.agentChoices = {};
-    }
-    switch (agent) {
-        case 'codex':
-            if (agentCfg.model) {
-                if (!updatedAny.agentChoices.codex)
-                    updatedAny.agentChoices.codex = {};
-                updatedAny.agentChoices.codex.model = agentCfg.model;
-            }
-            if (agentCfg.modelProvider) {
-                if (!updatedAny.agentChoices.codex)
-                    updatedAny.agentChoices.codex = {};
-                updatedAny.agentChoices.codex.modelProvider = agentCfg.modelProvider;
-            }
-            break;
-        case 'pi':
-            if (agentCfg.model) {
-                if (!updatedAny.agentChoices.pi)
-                    updatedAny.agentChoices.pi = {};
-                updatedAny.agentChoices.pi.model = agentCfg.model;
-            }
-            if (agentCfg.provider) {
-                if (!updatedAny.agentChoices.pi)
-                    updatedAny.agentChoices.pi = {};
-                updatedAny.agentChoices.pi.provider = agentCfg.provider;
-            }
-            if (agentCfg.thinking) {
-                if (!updatedAny.agentChoices.pi)
-                    updatedAny.agentChoices.pi = {};
-                updatedAny.agentChoices.pi.thinking = agentCfg.thinking;
-            }
-            break;
-        case 'opencode':
-            if (agentCfg.modelID) {
-                if (!updatedAny.agentChoices.opencode)
-                    updatedAny.agentChoices.opencode = {};
-                updatedAny.agentChoices.opencode.modelID = agentCfg.modelID;
-            }
-            if (agentCfg.providerID) {
-                if (!updatedAny.agentChoices.opencode)
-                    updatedAny.agentChoices.opencode = {};
-                updatedAny.agentChoices.opencode.providerID = agentCfg.providerID;
-            }
-            break;
-        case 'kimi':
-            if (agentCfg.model) {
-                if (!updatedAny.agentChoices.kimi)
-                    updatedAny.agentChoices.kimi = {};
-                updatedAny.agentChoices.kimi.model = agentCfg.model;
-            }
-            if (agentCfg.thinkingEffort) {
-                if (!updatedAny.agentChoices.kimi)
-                    updatedAny.agentChoices.kimi = {};
-                updatedAny.agentChoices.kimi.thinkingEffort = agentCfg.thinkingEffort;
-            }
-            break;
+    const agents = config.agents;
+    const agentCfg = agents?.[agent];
+    if (!agentCfg)
+        return config;
+    const updated = structuredClone(config);
+    const choices = (updated.agentChoices ??= {});
+    const agentChoices = (choices[agent] ??= {});
+    const source = agentCfg;
+    for (const { configKey, choicesKey } of fields) {
+        const value = source[configKey];
+        if (value)
+            agentChoices[choicesKey] = value;
     }
     return updated;
 }

package/dist/runner/types.d.ts

@@ -21,6 +21,105 @@ interface SystemCompactEvent {
         preTokens: number;
     };
 }
+export interface ApprovalRequestedEvent {
+    type: 'approval_requested';
+    /** JSON-RPC id of the server request. Wire type is string | integer — keep raw. */
+    requestId: number | string;
+    kind: 'command' | 'file' | 'permissions' | 'question';
+    threadId: string;
+    turnId: string;
+    itemId: string;
+    view: ApprovalView;
+    timestamp?: string;
+}
+export interface ApprovalResolvedEvent {
+    type: 'approval_resolved';
+    requestId: number | string;
+    outcome: 'resolved' | 'expired';
+    timestamp?: string;
+}
+/** Approval card content update (out-of-order item/started arrives late). */
+export interface ApprovalViewUpdatedEvent {
+    type: 'approval_view_updated';
+    requestId: number | string;
+    view: ApprovalView;
+    timestamp?: string;
+}
+/** Approval expired locally (bridge-side timeout) — card should show expired UI. */
+export interface ApprovalExpiredEvent {
+    type: 'approval_expired';
+    requestId: number | string;
+    timestamp?: string;
+}
+/** 审批决策（bridge ApprovalCoordinator → runner.respondApproval 的响应载荷）。 */
+export type ApprovalAction = {
+    action: 'accept';
+} | {
+    action: 'accept_for_session';
+} | {
+    action: 'accept_with_execpolicy_amendment';
+}
+/** Claude：允许当前请求 + 本会话后续所有权限请求自动放行（允许所有）。 */
+ | {
+    action: 'accept_all';
+} | {
+    action: 'decline';
+} | {
+    action: 'cancel';
+}
+/** Claude AskUserQuestion 答案（question → label 或 label[]）。 */
+ | {
+    action: 'answer';
+    answers: Record<string, string | string[]>;
+};
+/** Claude Code AskUserQuestion 的单个选项（control_request input.questions[].options[]）。 */
+export interface ClaudeUserQuestionOption {
+    label: string;
+    description?: string;
+}
+/** Claude Code AskUserQuestion 的单个问题（control_request input.questions[]）。 */
+export interface ClaudeUserQuestion {
+    question: string;
+    header?: string;
+    multiSelect?: boolean;
+    options: ClaudeUserQuestionOption[];
+    /**
+     * 当前已选选项 label（卡片渲染与多选切换用；单选在协调器内即时提交）。
+     * 与 permissions.items.selected 同模式：协调器原地更新后以
+     * approval_view_updated 重新渲染。
+     */
+    selected?: string[];
+}
+export interface ApprovalView {
+    requestId: number | string;
+    kind: 'command' | 'file' | 'permissions' | 'question';
+    reason?: string;
+    command?: string;
+    commandCwd?: string;
+    fileChanges?: Array<{
+        path: string;
+        kind: 'add' | 'update' | 'delete';
+        diff?: string;
+    }>;
+    permissions?: {
+        items: Array<{
+            id: string;
+            label: string;
+            target: {
+                kind: 'network';
+            } | {
+                kind: 'fsRead' | 'fsWrite';
+                path: string;
+            };
+            selected: boolean;
+        }>;
+    };
+    /** Claude AskUserQuestion 问题列表（kind === 'question' 时存在）。 */
+    questions?: ClaudeUserQuestion[];
+    availableDecisions: string[];
+    /** Raw payloads for structured decisions (e.g. acceptWithExecpolicyAmendment). */
+    decisionPayloads?: Record<string, unknown>;
+}
 interface ThinkingContent {
     type: 'thinking';
     thinking: string;
@@ -58,7 +157,7 @@ export interface UserEvent {
 }
 export interface ResultEvent {
     type: 'result';
-    subtype: 'success' | 'error';
+    subtype: 'success' | 'error' | 'interrupted';
     session_id: string;
     timestamp?: string;
     usage?: {
@@ -75,6 +174,9 @@ export interface ResultEvent {
         cache_creation_input_tokens?: number;
         /** Agent-declared total; when present the display uses max(total, sum of parts). */
         total_tokens?: number;
+        /** 当前模型 context window 上限（codex app-server tokenUsage.modelContextWindow
+         *  透传）。仅 app-server 提供；缺省时卡片只显示绝对量、不显示百分比。 */
+        context_limit?: number;
     };
     total_cost_usd?: number;
     errorMessage?: string;
@@ -99,7 +201,50 @@ export interface FileChangeEvent {
     operation: 'create' | 'edit' | 'delete' | 'read';
     timestamp?: string;
 }
-export type AgentEvent = SystemInitEvent | SystemCompactEvent | AssistantEvent | UserEvent | ResultEvent | PlanEvent | FileChangeEvent;
+export interface TurnStartedEvent {
+    type: 'turn_started';
+    threadId: string;
+    turnId: string;
+    operationKind: 'turn' | 'compaction';
+    timestamp?: string;
+}
+export interface TurnDiffEvent {
+    type: 'turn_diff';
+    /**
+     * Thread item id this snapshot belongs to (app-server item-scoped stream).
+     * Each content item (reasoning / agentMessage / commandExecution / plan /
+     * fileChange) is tracked independently, so interleaved items keep their
+     * real chronology and update their own block instead of a shared one.
+     */
+    itemId: string;
+    /** Full accumulated assistant text snapshot for this item (replaces previous). */
+    text?: string;
+    /** Full accumulated reasoning snapshot for this item (replaces previous). */
+    reasoning?: string;
+    /** Full accumulated tool output snapshot for this item (replaces previous). */
+    toolOutput?: string;
+    /** Full accumulated plan text snapshot for this item (replaces previous). */
+    plan?: string;
+    /** Current set of file changes for this item (replaces previous). */
+    fileChanges?: Array<{
+        path: string;
+        kind: 'add' | 'update' | 'delete';
+        diff?: string;
+    }>;
+    /**
+     * Authoritative completion snapshot (item/completed or turn/completed).
+     * The reducer finalizes the block in place: thinking/plan active=false,
+     * tool status ok, completedAt stamped. Never reorders blocks.
+     */
+    complete?: boolean;
+    /** Authoritative tool status at completion (commandExecution item). */
+    toolStatus?: 'ok' | 'error';
+    threadId: string;
+    turnId: string;
+    timestamp?: string;
+}
+export type RunnerLifetime = 'turn' | 'workspace';
+export type AgentEvent = SystemInitEvent | SystemCompactEvent | ApprovalRequestedEvent | ApprovalResolvedEvent | ApprovalViewUpdatedEvent | ApprovalExpiredEvent | AssistantEvent | UserEvent | ResultEvent | PlanEvent | FileChangeEvent | TurnStartedEvent | TurnDiffEvent;
 export interface SpawnOptions {
     cwd: string;
     sessionId?: string;
@@ -117,6 +262,8 @@ export interface SpawnOptions {
  */
 export interface Runner {
     readonly isRunning: boolean;
+    readonly lifetime?: RunnerLifetime;
+    dispose?(): Promise<void>;
     run(message: string, opts: SpawnOptions): AsyncGenerator<AgentEvent>;
     /**
      * Stop the running process. SIGTERM → grace → SIGKILL on the per-workspace
@@ -158,6 +305,8 @@ export interface AgentSessionUsage {
     contextLimit?: number;
     /** Claude auto-compact 次数（数 compact_boundary 事件）；codex/opencode 无此概念，留 undefined。 */
     compactCount?: number;
+    /** 压缩前上下文水位（codex compact 后从会话 jsonl 读取，仅会话以压缩收尾时有值）。 */
+    compactPreContextLength?: number;
     /** 从缓存读取的 token 数（节省的费用）。 */
     cacheReadTokens?: number;
     /** 新建缓存的 token 数。 */
@@ -236,6 +385,8 @@ export interface AgentRunner extends Runner {
     readonly sessionReader: AgentSessionReader;
     /** Return current status info for /status display. */
     getStatusInfo(): AgentStatusInfo;
+    /** Whether this runner provides live usage data (vs. file-based). */
+    getUsageAuthority?(): 'live' | 'jsonl';
 }
 /** Agent self-describing status info for /status display. */
 export interface AgentStatusInfo {

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

@@ -2,7 +2,6 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { scanJsonlLines } from '../common/jsonl.js';
 import { extractContentBlocks } from '../common/content-blocks.js';
-import { truncate } from '../../card/card-shared.js';
 import { getLogger } from '../../logger/index.js';
 // ─── Claude content block mapping (shared with sessions.ts) ─
 /** Claude-specific field-name mapping for content block extraction. */
@@ -224,7 +223,7 @@ export class SessionIndex {
                     path: p,
                     fingerprint: currentFp,
                     mtimeMs: Number(st.mtimeMs),
-                    summary: truncate(parsed.summary, 60, { normalizeWhitespace: true }),
+                    summary: parsed.summary.replace(/\s+/g, ' ').trim(),
                     cwdSet: parsed.cwdSet,
                 };
                 this.updateEntry(p, updated);
@@ -302,7 +301,7 @@ export class SessionIndex {
                         path: fullPath,
                         fingerprint: fpAfter,
                         mtimeMs: Number(fileStat.mtimeMs),
-                        summary: truncate(parsed.summary, 60, { normalizeWhitespace: true }),
+                        summary: parsed.summary.replace(/\s+/g, ' ').trim(),
                         cwdSet: parsed.cwdSet,
                     };
                     this.updateEntry(fullPath, newEntry);

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

@@ -1,3 +1,4 @@
+import { paginate } from '../common/pagination.js';
 import { listClaudeSessions, getNewestSession, readSessionContent, isClaudeSessionActive, } from '../../session/claude/sessions.js';
 /**
  * Adapter that exposes Claude Code's session-reading functions through the
@@ -22,12 +23,8 @@ export class ClaudeSessionReader {
         // 先拿全集（不传 limit → listClaudeSessions 不切片），total 用全集长度，
         // 再由 reader 按 [offset, offset+limit) 切片。
         const all = listClaudeSessions(cwd, this.readerOpts());
-        const offset = Math.max(0, opts?.offset ?? 0);
-        const limit = opts?.limit;
-        return {
-            sessions: limit === undefined ? all.slice(offset) : all.slice(offset, offset + limit),
-            total: all.length,
-        };
+        const { items, total } = paginate(all, opts ?? {});
+        return { sessions: items, total };
     }
     getNewestSession(cwd) {
         const session = getNewestSession(cwd, this.readerOpts());

package/dist/session/claude/sessions.js

@@ -3,9 +3,9 @@ import path from 'node:path';
 import os from 'node:os';
 import { findJsonlLine, readLastJsonlLine, scanJsonlLines, readJsonlLinesFromOffset, } from '../common/jsonl.js';
 import { STALE_MS } from '../common/constants.js';
+import { capEvents } from '../common/pagination.js';
 import { extractContentBlocks } from '../common/content-blocks.js';
 import { UsageAccumulator } from '../common/usage-accumulator.js';
-import { truncate } from '../../card/card-shared.js';
 import { SessionIndex, extractText, isTaskNotificationText, CLAUDE_MAPPING, } from './session-index.js';
 /**
  * Directory Claude Code uses to store session transcripts for a given cwd.
@@ -262,7 +262,7 @@ function scalarScan(filePath) {
                 lastPostTokens = cm.postTokens;
             }
         }
-        // --- last user message offset (was findLastUserIndex) ---
+        // --- last user message offset ---
         // Record the byte offset where the tail should start: the beginning of
         // the NEXT line after this user message. We compute it as this line's
         // start offset + its byte length + 1 (the trailing '\n').
@@ -382,12 +382,7 @@ function extractEventsFromTail(tailLines, maxEvents) {
             events.push({ type: role, content: `(${role} event)`, timestamp });
         }
     }
-    if (maxEvents !== undefined) {
-        if (maxEvents <= 0)
-            return [];
-        return events.slice(-maxEvents);
-    }
-    return events;
+    return capEvents(events, maxEvents);
 }
 export function readSessionContent(sessionId, cwd, opts = {}) {
     const { maxEvents } = opts;
@@ -447,11 +442,9 @@ export function readSessionContent(sessionId, cwd, opts = {}) {
     // show.
     const tailLines = readJsonlLinesFromOffset(filePath, scan.tailOffset >= 0 ? scan.tailOffset : 0);
     const events = extractEventsFromTail(tailLines, maxEvents);
-    // Use aiTitle if available, otherwise fallback to last user message (truncated to 200 chars)
-    const displayTitle = scan.aiTitle ??
-        (scan.lastUserMessage
-            ? truncate(scan.lastUserMessage, 200, { normalizeWhitespace: true })
-            : undefined);
+    // Use aiTitle if available, otherwise fallback to last user message.
+    // Truncation is deferred to the consumer (router card building).
+    const displayTitle = scan.aiTitle ?? scan.lastUserMessage ?? undefined;
     return {
         events,
         usage,

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

@@ -11,8 +11,7 @@
  * ```
  *
  * Note: This handles the **rollout file format** (historical logging), NOT the
- * `codex exec --json` stdout format. Those are two different JSONL formats
- * (see design doc appendix B vs C).
+ * `codex exec --json` stdout format（已随 exec 模式移除）。
  */
 import type { AgentSessionContentEvent, SessionContent, AgentSessionUsage } from '../../runner/index.js';
 interface CodexRolloutEntry {
@@ -83,6 +82,7 @@ export declare function readCodexSessionContent(sessionId: string, opts?: {
 export declare function isCodexSessionActive(sessionId: string, opts?: {
     codexHome?: string;
     activeThresholdMs?: number;
+    cwd?: string;
 }): boolean;
 /** Clear the session index cache. Exposed for tests. */
 export declare function clearSessionIndexCache(): void;

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

@@ -11,12 +11,13 @@
  * ```
  *
  * Note: This handles the **rollout file format** (historical logging), NOT the
- * `codex exec --json` stdout format. Those are two different JSONL formats
- * (see design doc appendix B vs C).
+ * `codex exec --json` stdout format（已随 exec 模式移除）。
  */
 import fs from 'node:fs';
 import path from 'node:path';
 import { readJsonlLines, findJsonlLine } from '../common/jsonl.js';
+import { STALE_MS } from '../common/constants.js';
+import { paginate, capEvents } from '../common/pagination.js';
 import { getLogger } from '../../logger/index.js';
 import { isRecord, stringValue } from '../../common/guards.js';
 import { resolveCodexHome } from '../../config/codex-config.js';
@@ -58,6 +59,18 @@ export function readCodexRollout(filePath) {
         // Run card's "累计" display. Codex emits this alongside last_token_usage.
         let lastTotalUsage;
         let previousTotals;
+        // Compaction 统计：codex 的 compact turn 在会话文件里写顶层 `compacted`
+        // 事件（含摘要），压缩前后的上下文水位由相邻 token_count 表达。压缩收尾的
+        // token_count 增量是 input/cached/output 全 0、只有 total_tokens 有值
+        // （窗口被摘要+replacement history 占据），现有 zero-filter 会跳过它，
+        // 因此这里必须单独捕获，不能复用 lastRawUsage。
+        // 单位口径（review P3-9）：前后两侧统一用 total_tokens —— 压缩前取最近一次
+        // 非零 token_count 的 total_tokens（input+output，即该 turn 在窗口内的全部
+        // token），压缩后取收尾事件的 total_tokens（压缩后窗口）。不得一边 input
+        // 一边 total，否则「压缩前 X → 压缩后 Y」两边单位不一致。
+        let compactCount = 0;
+        let compactPreContextLength;
+        let compactPostContextLength;
         for (const line of lines) {
             const trimmed = line.trim();
             if (!trimmed)
@@ -101,6 +114,27 @@ export function readCodexRollout(filePath) {
                             const ctxWindow = info?.model_context_window;
                             lastContextLimit = typeof ctxWindow === 'number' ? ctxWindow : undefined;
                         }
+                        // 压缩后的水位：压缩收尾 token_count 全 0（raw 不满足上面 zero-filter），
+                        // 但 total_tokens 表达真实窗口；之后若出现普通 turn（input>0），
+                        // 水位回归该 turn，post-compact 值失效。
+                        if (compactCount > 0 && raw) {
+                            if (raw.total_tokens &&
+                                !raw.input_tokens &&
+                                !raw.cached_input_tokens &&
+                                !raw.output_tokens) {
+                                compactPostContextLength = raw.total_tokens;
+                            }
+                            else if (raw.input_tokens > 0) {
+                                compactPostContextLength = undefined;
+                            }
+                        }
+                    }
+                }
+                else if (parsed.type === 'compacted') {
+                    // 顶层 compacted 事件：压缩次数 +1，压缩前水位取最近一次非零 token_count。
+                    compactCount++;
+                    if (lastRawUsage?.total_tokens !== undefined) {
+                        compactPreContextLength = lastRawUsage.total_tokens;
                     }
                 }
                 else if (parsed.type === 'response_item' && parsed.payload) {
@@ -170,6 +204,16 @@ export function readCodexRollout(filePath) {
                 usage.cumulativeCacheReadTokens = cumCached;
                 usage.cumulativeCacheCreationTokens = 0; // Codex 不报告 cache creation
             }
+            // 压缩统计：会话内出现过 compacted 事件就计数（供 /resume 与 Compact 卡
+            // 展示）；仅当会话以压缩收尾时（post-compact 水位存在），contextLength
+            // 覆盖为压缩后水位并暴露压缩前水位——后续还有普通 turn 时水位回归该 turn。
+            if (compactCount > 0) {
+                usage.compactCount = compactCount;
+                if (compactPostContextLength !== undefined) {
+                    usage.contextLength = compactPostContextLength;
+                    usage.compactPreContextLength = compactPreContextLength;
+                }
+            }
         }
         return {
             threadId: sessionId,
@@ -200,8 +244,6 @@ export function readCodexRollout(filePath) {
  */
 export function listCodexRollouts(opts = {}) {
     const codexHome = resolveCodexHome(opts.codexHome);
-    const limit = opts.limit ?? 20;
-    const offset = Math.max(0, opts.offset ?? 0);
     const filterCwd = opts.cwd;
     // Full index: every rollout file's session_meta + mtime, no early break.
     const index = getSessionIndex(codexHome);
@@ -220,8 +262,7 @@ export function listCodexRollouts(opts = {}) {
     // Same-mtime ties use filePath as a deterministic secondary key so index
     // rebuilds / walk order changes never reorder the page.
     matched.sort((a, b) => b.mtimeMs - a.mtimeMs || a.filePath.localeCompare(b.filePath));
-    const total = matched.length;
-    const page = matched.slice(offset, offset + limit);
+    const { items: page, total } = paginate(matched, { limit: opts.limit, offset: opts.offset });
     // Full-parse only the page being returned (summary/usage).
     const entries = [];
     for (const item of page) {
@@ -274,22 +315,14 @@ export function readCodexSessionContent(sessionId, opts = {}) {
     }
     // Apply maxEvents cap: keep the LAST N events (most recent).
     // See function docstring for rationale.
-    // P2-7: maxEvents <= 0 returns [] — guards the `slice(-0) === slice(0)`
-    // full-array trap (no caller passes 0 today, but the contract must hold).
-    const events = opts.maxEvents !== undefined && opts.maxEvents > 0 && rollout.events.length > opts.maxEvents
-        ? rollout.events.slice(-opts.maxEvents)
-        : opts.maxEvents !== undefined && opts.maxEvents <= 0
-            ? []
-            : rollout.events;
+    const events = capEvents(rollout.events, opts.maxEvents);
     return {
         events,
         // displayTitle = LAST real user message (matches the
         // "最近输入" label). recap is undefined: codex has no
         // compact-summary concept, so never fake one from a user
         // message (was: firstUserMessage = injected project rules).
-        displayTitle: rollout.lastRealUserMessage
-            ? rollout.lastRealUserMessage.slice(0, 50)
-            : undefined,
+        displayTitle: rollout.lastRealUserMessage || undefined,
         recap: undefined,
         usage: rollout.usage,
     };
@@ -304,7 +337,9 @@ export function readCodexSessionContent(sessionId, opts = {}) {
  */
 export function isCodexSessionActive(sessionId, opts = {}) {
     const codexHome = resolveCodexHome(opts.codexHome);
-    const threshold = opts.activeThresholdMs ?? 10 * 60 * 1000; // 10 minutes default
+    // 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
     let index = getSessionIndex(codexHome);
     let entry = index.get(sessionId);
@@ -323,6 +358,11 @@ export function isCodexSessionActive(sessionId, opts = {}) {
     if (entry.isSubagent) {
         return false;
     }
+    // Cwd guard: when a cwd is provided, the session's working directory must
+    // match (align with claude/pi/opencode which validate cwd).
+    if (opts.cwd && entry.cwd !== opts.cwd) {
+        return false;
+    }
     // Re-stat to get fresh mtime (index may be up to INDEX_TTL_MS stale)
     try {
         const stat = fs.statSync(entry.filePath);

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

@@ -16,6 +16,6 @@ export declare class CodexSessionReader implements AgentSessionReader {
     readSessionContent(sessionId: string, cwd: string, opts?: {
         maxEvents?: number;
     }): SessionContent;
-    isSessionActive(sessionId: string, _cwd: string): boolean;
+    isSessionActive(sessionId: string, cwd: string): boolean;
 }
 export {};

package/dist/session/codex/sessions.js

@@ -34,8 +34,8 @@ export class CodexSessionReader {
             cwd,
         });
     }
-    isSessionActive(sessionId, _cwd) {
-        return isCodexSessionActive(sessionId, { codexHome: this.codexHome });
+    isSessionActive(sessionId, cwd) {
+        return isCodexSessionActive(sessionId, { codexHome: this.codexHome, cwd });
     }
 }
 //# sourceMappingURL=sessions.js.map