lark-remote 0.1.6 → 0.1.8

package/dist/runner/question-common.js

@@ -0,0 +1,42 @@
+/**
+ * AskUserQuestion 公共工厂与映射（agent 无关）。
+ *
+ * 接入约定（types.ts UserQuestion 注释的落点）：
+ * - 各 runner 用 makeQuestionApprovalEvent 构造标准 question 审批事件，
+ *   避免四处手拼事件形状（claude/codex/kimi/pi 共用）；
+ * - 用户答案经 ApprovalCoordinator 以 {问题文本: 值} 回传 runner 后，
+ *   用 mapAnswersByIndex 按问题顺序展开，再做协议级编码
+ *   （Codex 问题 id、Kimi q{i}、Pi 单题取值）。
+ */
+/**
+ * 构造标准 question approval_requested 事件。
+ * availableDecisions 恒为空数组：提问只能作答或跳过（decline/cancel 是
+ * coordinator 的通用安全兜底），不允许 accept/decline 按钮混入提问卡。
+ */
+export function makeQuestionApprovalEvent(requestId, questions, threadId, opts) {
+    const view = {
+        requestId,
+        kind: 'question',
+        questions,
+        availableDecisions: [],
+    };
+    return {
+        type: 'approval_requested',
+        requestId,
+        kind: 'question',
+        threadId,
+        turnId: '',
+        itemId: '',
+        view,
+        ...(opts?.timeoutMs !== undefined ? { timeoutMs: opts.timeoutMs } : {}),
+        timestamp: new Date().toISOString(),
+    };
+}
+/**
+ * 按问题顺序把 coordinator 回传的 {问题文本: 值} 展开成索引对齐数组。
+ * 未作答的问题对应 undefined，由各 runner 决定协议编码（跳过/空 answers）。
+ */
+export function mapAnswersByIndex(questions, answers) {
+    return questions.map((q) => answers[q.question]);
+}
+//# sourceMappingURL=question-common.js.map

package/dist/runner/registry.d.ts

@@ -1,13 +1,12 @@
-import type { AgentKind, AgentRunner } from './index.js';
+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
  * up `config.defaultAgent` here to pick the concrete runner.
  *
- * Singleton caching: the factory MAY cache its instance internally. All
- * current agents (claude, codex, opencode, pi, kimi) are spawn-per-message,
- * so per-workspace instantiation has no cost; each factory returns a fresh
- * runner per call.
+ * Singleton caching: the factory MAY cache its instance internally. Most
+ * current agents (claude, opencode, pi, kimi) are spawn-per-message; codex is
+ * workspace-lifetime (app-server). Each factory returns a runner per call.
  *
  * Dynamic config reload: factory can read latest config via registry's
  * configContainer, enabling runtime config changes to take effect.
@@ -17,7 +16,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) => AgentRunner): void;
+    register(kind: AgentKind, factory: (workspace: string) => Runner): void;
     /**
      * 注册 agent 的显示名。应在 register(kind, factory) 后调用。
      * 用于 agentDisplayName 等全局查询，实现单点真相。
@@ -31,7 +30,7 @@ export declare class AgentRegistry {
      * 设置全局 registry 实例，供 agentDisplayName 等全局函数使用。
      * 在 index.ts 初始化所有 agents 后调用。
      */
-    static setGlobalInstance(reg: AgentRegistry): void;
+    static setGlobalInstance(reg: AgentRegistry | undefined): void;
     /**
      * 获取全局 registry 实例。
      */
@@ -50,5 +49,5 @@ export declare class AgentRegistry {
     getConfigContainer(): {
         current: unknown;
     } | undefined;
-    get(kind: AgentKind, workspace: string): AgentRunner;
+    get(kind: AgentKind, workspace: string): Runner;
 }

package/dist/runner/registry.js

@@ -8,10 +8,9 @@ let globalRegistry;
  * factory per available agent at startup; `Bridge.getRunner(workspace)` looks
  * up `config.defaultAgent` here to pick the concrete runner.
  *
- * Singleton caching: the factory MAY cache its instance internally. All
- * current agents (claude, codex, opencode, pi, kimi) are spawn-per-message,
- * so per-workspace instantiation has no cost; each factory returns a fresh
- * runner per call.
+ * Singleton caching: the factory MAY cache its instance internally. Most
+ * current agents (claude, opencode, pi, kimi) are spawn-per-message; codex is
+ * workspace-lifetime (app-server). Each factory returns a runner per call.
  *
  * Dynamic config reload: factory can read latest config via registry's
  * configContainer, enabling runtime config changes to take effect.

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

@@ -25,11 +25,18 @@ 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';
+    kind: 'command' | 'file' | 'permissions' | 'question' | 'tool';
     threadId: string;
     turnId: string;
     itemId: string;
     view: ApprovalView;
+    /**
+     * Per-request 审批超时覆盖（毫秒）。由 runner 在翻译时填入
+     * （Codex autoResolutionMs），coordinator 优先使用；
+     * 缺省回落 run 级默认超时。放在事件上而非桥按 agentKind 分支，
+     * 保证公共层无 agent 分支。
+     */
+    timeoutMs?: number;
     timestamp?: string;
 }
 export interface ApprovalResolvedEvent {
@@ -51,28 +58,101 @@ export interface ApprovalExpiredEvent {
     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';
+}
+/**
+ * AskUserQuestion 答案（question → label 或 label[]）。
+ * notes：Codex user_note 补充说明（question → 文本），runner 编码为
+ * "user_note: <text>" 条目；其他 agent 忽略该字段。
+ */
+ | {
+    action: 'answer';
+    answers: Record<string, string | string[]>;
+    notes?: Record<string, string>;
+};
+/** AskUserQuestion 公共契约（Agent 无关）的单个选项。 */
+export interface UserQuestionOption {
+    label: string;
+    description?: string;
+}
+/**
+ * AskUserQuestion 公共契约（Agent 无关）的单个问题。
+ *
+ * 接入约定（新 agent 接入 AskUserQuestion 时在这里扩展，禁止在 coordinator /
+ * renderer / router 里写 agent 分支）：
+ * 1. 各 agent runner 把协议提问翻译为 `ApprovalView{ kind:'question', questions }`；
+ * 2. 用户回答经 ApprovalCoordinator 收集，以 `ApprovalAction{action:'answer',
+ *    answers:{问题文本: string|string[]}}` 回传 runner；
+ * 3. runner 侧把文本 key 答案翻译回自己协议的 shape（Claude 直接用文本 key；
+ *    Codex 需按问题 id 映射）。
+ */
+export interface UserQuestion {
+    /** Agent 侧问题唯一标识（Codex request_user_input 的 id 预留；Claude 无此字段）。 */
+    id?: string;
+    question: string;
+    header?: string;
+    multiSelect?: boolean;
+    options: UserQuestionOption[];
+    /** 是否允许自定义答案（Codex isOther 预留；当前单选渲染层恒提供 Other 输入）。 */
+    isOther?: boolean;
+    /** 敏感输入（Codex isSecret 预留）。 */
+    isSecret?: boolean;
+    /** 自由文本题的输入框占位提示（渲染层自由文本题 input）。 */
+    placeholder?: string;
+    /**
+     * 是否渲染「补充说明（可选）」输入（Codex user_note；数据驱动无 agent 分支）。
+     * note 是选项之外的附加文本，随答案提交，不单独构成答案。
+     */
+    allowNote?: boolean;
+    /** 当前已填写的补充说明（卡片回显；coordinator answerNote 回流）。 */
+    note?: string;
+    /**
+     * 当前已选选项 label（卡片渲染与多选切换用；单选在协调器内即时提交）。
+     * 与 permissions.items.selected 同模式：协调器原地更新后以
+     * approval_view_updated 重新渲染。
+     */
+    selected?: string[];
+}
 export interface ApprovalView {
     requestId: number | string;
-    kind: 'command' | 'file' | 'permissions';
+    kind: 'command' | 'file' | 'permissions' | 'question' | 'tool';
     reason?: string;
-    threadShort: string;
-    turnShort: string;
-    workspace: string;
+    /**
+     * 提问卡顶部概要行（数据驱动，无 agent 分支）：Kimi elicitation form 的
+     * 题面只在 form 级 message 里合并出现，逐字段 title 可能只是短 header，
+     * 概要行用于展示完整题干。
+     */
+    intro?: string;
     command?: string;
     commandCwd?: string;
+    /**
+     * 被审批的工具名（kind === 'tool' 时展示，如 ExitPlanMode）。非命令工具的
+     * 权限请求（plan 退出/通知型工具）input 无 command 语义，用工具名 + reason
+     * 表达审批内容，避免落入 command 槽位显示无意义 `{}`。
+     */
+    toolName?: string;
+    /** 原始 input 的 JSON 字符串（kind === 'tool' 且 input 非空时展示）。 */
+    toolInput?: string;
     fileChanges?: Array<{
         path: string;
         kind: 'add' | 'update' | 'delete';
         diff?: string;
     }>;
-    network?: {
-        host: string;
-        protocol: string;
-    };
     permissions?: {
-        networkEnabled?: boolean;
-        fileSystemRead?: string[];
-        fileSystemWrite?: string[];
         items: Array<{
             id: string;
             label: string;
@@ -85,10 +165,11 @@ export interface ApprovalView {
             selected: boolean;
         }>;
     };
+    /** Claude AskUserQuestion 问题列表（kind === 'question' 时存在）。 */
+    questions?: UserQuestion[];
     availableDecisions: string[];
     /** Raw payloads for structured decisions (e.g. acceptWithExecpolicyAmendment). */
     decisionPayloads?: Record<string, unknown>;
-    pendingTotal: number;
 }
 interface ThinkingContent {
     type: 'thinking';
@@ -253,12 +334,14 @@ export interface Runner {
      */
     unregisterExitHandlers?(): void;
 }
-export type AgentKind = 'claude' | 'codex' | 'opencode' | 'pi' | 'kimi';
+export type AgentKind = 'claude' | 'codex' | 'opencode' | 'pi' | 'kimi' | 'dsh';
 /** Unified session descriptor returned by every AgentSessionReader. */
 export interface AgentSession {
     sessionId: string;
     summary: string;
     mtime: number;
+    /** DSH：session 创建时固定的 preset；其他 agent 无此概念（undefined）。 */
+    agentPreset?: string;
 }
 /** A single renderable event from session history. */
 export interface AgentSessionContentEvent {

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.
@@ -154,7 +154,7 @@ function isSessionActive(filePath, mtimeMs, now = Date.now()) {
         // Explicit terminal markers — regardless of mtime. Claude CLI 2.x uses
         // `last-prompt` / `mode` (no `result` event) to mark turn end, so a
         // 24-minute-old session with a last-prompt tail is already done
-        // (regression 2026-06-21: c5e929a7 falsely reported as active).
+        // (regression 2026-06-21: previously falsely reported as active).
         const TERMINAL_TYPES = new Set(['result', 'last-prompt', 'mode', 'permission-mode']);
         if (typeof obj.type === 'string' && TERMINAL_TYPES.has(obj.type))
             return false;
@@ -224,7 +224,16 @@ export function isClaudeSessionActive(sessionId, cwd, opts = {}) {
  */
 function scalarScan(filePath) {
     const acc = new UsageAccumulator();
-    const seenMessageIds = new Set();
+    // Per-message-id best usage record (per-field max). A streaming assistant
+    // message spans multiple jsonl lines sharing the same message id; some
+    // backends (third-party gateways, e.g. DeepSeek) write all-zero usage on
+    // the early placeholder lines (empty thinking block) and the real usage
+    // only on the final line carrying stop_reason. First-occurrence-wins dedup
+    // would pin the zero record and discard the real one (regression
+    // 2026-08-19: auto-resume card per-run stats all 0). Per-field max
+    // reconstructs the full usage regardless of line order — on the official
+    // API every line repeats identical usage, so max is a no-op there.
+    const usageByMessageId = new Map();
     let lastPostTokens = 0;
     let tailOffset = -1;
     let lastAiTitle;
@@ -244,13 +253,13 @@ function scalarScan(filePath) {
             const usage = msg?.usage;
             if (usage) {
                 const msgId = msg?.id;
-                if (msgId && !seenMessageIds.has(msgId)) {
-                    seenMessageIds.add(msgId);
-                    acc.add({
-                        input: usage.input_tokens ?? 0,
-                        output: usage.output_tokens ?? 0,
-                        cacheRead: usage.cache_read_input_tokens ?? 0,
-                        cacheCreation: usage.cache_creation_input_tokens ?? 0,
+                if (msgId) {
+                    const prev = usageByMessageId.get(msgId);
+                    usageByMessageId.set(msgId, {
+                        input: Math.max(prev?.input ?? 0, usage.input_tokens ?? 0),
+                        output: Math.max(prev?.output ?? 0, usage.output_tokens ?? 0),
+                        cacheRead: Math.max(prev?.cacheRead ?? 0, usage.cache_read_input_tokens ?? 0),
+                        cacheCreation: Math.max(prev?.cacheCreation ?? 0, usage.cache_creation_input_tokens ?? 0),
                     });
                 }
             }
@@ -262,7 +271,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').
@@ -305,6 +314,12 @@ function scalarScan(filePath) {
             }
         }
     });
+    // Feed one best record per message id, in first-appearance order (Map
+    // preserves insertion order), so acc.last is the LAST message's full usage
+    // and totals sum each API response exactly once.
+    for (const record of usageByMessageId.values()) {
+        acc.add(record);
+    }
     // Build usage result (same logic as old aggregateSessionUsage)
     const t = acc.totals;
     const l = acc.last;
@@ -319,14 +334,19 @@ function scalarScan(filePath) {
     if (contextLength === 0 || lastWindow > contextLength) {
         contextLength = lastWindow;
     }
+    // 非累计字段 = 末轮（本 run）scope，累计字段 = session 总和（所有 run）。
+    // 对齐 codex reader 语义（§9.21：`last_token_usage`=单 turn 增量、
+    // `total_token_usage`=session 累计）——否则 jsonl 兜底路径会把 session 累计
+    // 当成"本 run"显示，与卡片"本 run ≤ 累计"不变量冲突（累计反而更小）。
+    const lastTotal = l ? l.input + l.output + l.cacheRead + l.cacheCreation : 0;
     const usage = {
-        inputTokens: t.input,
-        outputTokens: t.output,
+        inputTokens: l ? l.input : 0,
+        outputTokens: l ? l.output : 0,
         contextLength,
         compactCount: acc.compactCount,
-        cacheReadTokens: t.cacheRead > 0 ? t.cacheRead : undefined,
-        cacheCreationTokens: t.cacheCreation > 0 ? t.cacheCreation : undefined,
-        totalTokens: t.input + t.output + t.cacheRead + t.cacheCreation,
+        cacheReadTokens: l && l.cacheRead > 0 ? l.cacheRead : undefined,
+        cacheCreationTokens: l && l.cacheCreation > 0 ? l.cacheCreation : undefined,
+        totalTokens: lastTotal,
         cumulativeTotalTokens: t.input + t.output + t.cacheRead + t.cacheCreation,
         cumulativeInputTokens: t.input,
         cumulativeOutputTokens: t.output,
@@ -382,12 +402,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;
@@ -440,18 +455,18 @@ export function readSessionContent(sessionId, cwd, opts = {}) {
     // ~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);
-    const usage = scan.usage.inputTokens + scan.usage.outputTokens > 0 ? scan.usage : undefined;
+    // 有 usage 即返回：非累计字段已是末轮 scope，命中判定用 session 累计兜底
+    // （末轮可能 input/output 为 0 而仍有 cacheRead，累计口径不会被末轮遮挡）。
+    const usage = (scan.usage.cumulativeTotalTokens ?? 0) > 0 ? scan.usage : undefined;
     // Extract events AFTER the last user message by re-reading + re-parsing
     // only the tail. If no user message was found (tailOffset === -1), fall
     // back to re-reading the whole file so the card still has something to
     // 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;