lark-remote 0.1.12 → 0.1.13

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

@@ -22,50 +22,10 @@
 import { ConnectionManager, } from '../../common/jsonrpc/connection-manager.js';
 import { OpencodeAcpTranslator } from './translator.js';
 import { RpcErrorCode, } from '../../common/acp/protocol-types.js';
-import { findOptionIdByKind } from '../../common/acp/protocol-helpers.js';
+import { OPENCODE_APPROVAL_KINDS, buildAcpPermissionOutcome, } from '../../common/acp/protocol-helpers.js';
 import { getLogger } from '../../../logger/index.js';
 import { ConnectionBasedRunner } from '../../common/connection-based-runner.js';
 import { OpencodeLogErrorMonitor, resolveOpencodeLogPath } from './error-monitor.js';
-/**
- * Build the ACP protocol response for a permission approval decision.
- *
- * accept            → {outcome:{outcome:'selected', optionId:<allow_once kind>}}
- * accept_for_session → {outcome:{outcome:'selected', optionId:<allow_always kind>}}
- * decline           → {outcome:{outcome:'selected', optionId:<reject kind>}}
- * cancel            → {outcome:{outcome:'cancelled'}}
- *
- * optionId is opaque and echoed back as-is (opencode permission.ts:20-24
- * offers once/always/reject with kinds allow_once/allow_always/reject_once;
- * the server maps optionId 'once'/'always' → approve, anything else →
- * reject — permission.ts:219-223). If no matching option is found, fall
- * back to cancelled (safe universal default).
- */
-function buildApprovalResponse(action, pending) {
-    if (action === 'cancel') {
-        return { outcome: { outcome: 'cancelled' } };
-    }
-    if (action === 'accept') {
-        const optionId = findOptionIdByKind(pending.options, ['allow_once', 'allow_always']);
-        if (optionId) {
-            return { outcome: { outcome: 'selected', optionId } };
-        }
-        return { outcome: { outcome: 'cancelled' } };
-    }
-    if (action === 'accept_for_session') {
-        // §P4: 卡片「允许本次会话」→ always 类 optionId（opencode 'always'）
-        const optionId = findOptionIdByKind(pending.options, ['allow_always', 'approve_always']);
-        if (optionId) {
-            return { outcome: { outcome: 'selected', optionId } };
-        }
-        return { outcome: { outcome: 'cancelled' } };
-    }
-    // decline
-    const optionId = findOptionIdByKind(pending.options, ['reject_once', 'reject']);
-    if (optionId) {
-        return { outcome: { outcome: 'selected', optionId } };
-    }
-    return { outcome: { outcome: 'cancelled' } };
-}
 // =============================================================================
 // Runner
 // =============================================================================
@@ -252,7 +212,7 @@ export class OpencodeAcpRunner extends ConnectionBasedRunner {
         if (!client || !pending)
             return;
         const action = response?.action ?? 'decline';
-        const acpResponse = buildApprovalResponse(action, pending);
+        const acpResponse = buildAcpPermissionOutcome(action, pending.options, OPENCODE_APPROVAL_KINDS);
         client.respond(requestId, acpResponse);
         this.pendingApprovals.delete(requestId);
         getLogger().info(`[${this.logTag}] approval responded requestId=${requestId} action=${action}`);

package/dist/runner/opencode/acp/translator.d.ts

@@ -109,7 +109,6 @@ export declare class OpencodeAcpTranslator {
      * accept/decline/cancel are universal; acceptForSession requires an
      * always-class option (opencode `allow_always`, kimi `approve_always`).
      */
-    private deriveAvailableDecisions;
     /**
      * ResultEvent.usage nominally requires input_tokens/output_tokens, but the
      * ACP wire has no such split — the live snapshot is context occupancy only.

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

@@ -29,6 +29,7 @@
  *   session/request_permission     → approval_requested (optionId echo)
  */
 import { NotificationMethod, ServerRequestMethod, SessionEventType, } from '../../common/acp/protocol-types.js';
+import { deriveAcpAvailableDecisions, truncateWithEllipsis, } from '../../common/acp/protocol-helpers.js';
 import { getLogger } from '../../../logger/index.js';
 // =============================================================================
 // Translator
@@ -254,10 +255,10 @@ export class OpencodeAcpTranslator {
             requestId,
             kind: 'command',
             command: params.toolCall.title ?? undefined,
-            reason: rawInput ? truncate(stringify(rawInput), 200) : undefined,
+            reason: rawInput ? truncateWithEllipsis(stringify(rawInput), 200) : undefined,
             // §P4: 从服务端 options kind 派生——带 allow_always（或 approve_always）
             // 才提供「本会话总是允许」（acceptForSession）。
-            availableDecisions: this.deriveAvailableDecisions(params),
+            availableDecisions: deriveAcpAvailableDecisions(params.options ?? []),
         };
         return [
             {
@@ -277,14 +278,6 @@ export class OpencodeAcpTranslator {
      * accept/decline/cancel are universal; acceptForSession requires an
      * always-class option (opencode `allow_always`, kimi `approve_always`).
      */
-    deriveAvailableDecisions(params) {
-        const decisions = ['accept', 'decline', 'cancel'];
-        const hasAlwaysOption = (params.options ?? []).some((opt) => opt.kind === 'allow_always' || opt.kind === 'approve_always');
-        if (hasAlwaysOption) {
-            decisions.push('acceptForSession');
-        }
-        return decisions;
-    }
     // =========================================================================
     // Private helpers
     // =========================================================================
@@ -329,9 +322,6 @@ function extractToolResultContent(event) {
     }
     return '';
 }
-function truncate(text, maxLen) {
-    return text.length <= maxLen ? text : text.slice(0, maxLen) + '…';
-}
 function stringify(value) {
     if (typeof value === 'string')
         return value;

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

@@ -1,4 +1,2 @@
 export { PiRpcRunner } from './runner.js';
 export type { PiRpcRunnerOptions } from './runner.js';
-export { PiRpcClient } from './client.js';
-export { PiRpcTranslator } from './translator.js';

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

@@ -1,4 +1,2 @@
 export { PiRpcRunner } from './runner.js';
-export { PiRpcClient } from './client.js';
-export { PiRpcTranslator } from './translator.js';
 //# sourceMappingURL=index.js.map

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

@@ -9,9 +9,13 @@ export function resolveAgentChoices(config) {
     if (agent === 'claude') {
         return config;
     }
-    const agentChoices = choices[agent];
     const fields = choiceFieldsFor(agent);
-    if (!agentChoices || !fields) {
+    // dsh 的 choices 恒为空（host 是连接配置而非 per-run choice），无需恢复
+    if (!fields || fields.length === 0) {
+        return config;
+    }
+    const agentChoices = choices[agent];
+    if (!agentChoices) {
         return config;
     }
     // Clone to avoid mutation

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

@@ -2,7 +2,7 @@ import { choiceFieldsFor } from './agent-choices-common.js';
 export function syncAgentChoices(config, agent) {
     // claude 的配置在顶层 config.claude，不在 agents 下，无需同步
     const fields = choiceFieldsFor(agent);
-    if (!fields)
+    if (!fields || fields.length === 0)
         return config;
     const agents = config.agents;
     const agentCfg = agents?.[agent];

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

@@ -1,6 +1,7 @@
 import fs from 'node:fs';
 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 { getLogger } from '../../logger/index.js';
 // ─── Claude content block mapping (shared with sessions.ts) ─
@@ -175,7 +176,8 @@ export class SessionIndex {
                 byId.set(entry.sessionId, entry);
             }
         }
-        const sorted = [...byId.values()].sort((a, b) => b.mtimeMs - a.mtimeMs || a.sessionId.localeCompare(b.sessionId));
+        const sorted = [...byId.values()];
+        sortByRecencyDesc(sorted, (s) => s.mtimeMs, (s) => s.sessionId);
         const offset = opts.offset ?? 0;
         const limit = opts.limit;
         const sliced = limit === undefined ? sorted.slice(offset) : sorted.slice(offset, offset + limit);

package/dist/session/claude/sessions.js

@@ -5,7 +5,7 @@ import { findJsonlLine, readLastJsonlLine, scanJsonlLines, readJsonlLinesFromOff
 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 { UsageAccumulator, contextWindowOccupancy, cumulativeUsageFields, } from '../common/usage-accumulator.js';
 import { SessionIndex, extractText, isTaskNotificationText, CLAUDE_MAPPING, } from './session-index.js';
 /**
  * Directory Claude Code uses to store session transcripts for a given cwd.
@@ -329,7 +329,7 @@ function scalarScan(filePath) {
     // 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.
-    const lastWindow = l ? l.input + l.cacheRead + l.cacheCreation : 0;
+    const lastWindow = l ? contextWindowOccupancy(l) : 0;
     let contextLength = lastPostTokens;
     if (contextLength === 0 || lastWindow > contextLength) {
         contextLength = lastWindow;
@@ -347,11 +347,7 @@ function scalarScan(filePath) {
         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,
-        cumulativeCacheReadTokens: t.cacheRead,
-        cumulativeCacheCreationTokens: t.cacheCreation,
+        ...cumulativeUsageFields(t),
     };
     return {
         tailOffset,

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

@@ -21,7 +21,6 @@ interface CodexRolloutEntry {
     firstUserMessage: string;
     /** Last real (human-typed) user message, for the "最近输入" card label. */
     lastRealUserMessage: string;
-    createdAtMs: number;
     updatedAtMs: number;
     events: AgentSessionContentEvent[];
     /** Last-turn usage extracted from token_count events (ccusage-aligned). */
@@ -38,19 +37,6 @@ interface ListCodexRolloutsOptions {
     offset?: number;
 }
 export declare function readCodexRollout(filePath: string): CodexRolloutEntry | null;
-/**
- * Lightweight single-file scan that extracts only the display-relevant fields
- * (last real user message + usage) — **without** constructing the `events`
- * array. Backs `readCodexSessionSummary` so the `/resume` list prefetch does
- * not pay the cost of JSON.parse-ing every response_item and building events
- * that are immediately discarded.
- *
- * Returns null if the file doesn't exist, is corrupted, or has no session_meta.
- */
-export declare function readCodexRolloutSummary(filePath: string): {
-    lastRealUserMessage: string;
-    usage?: AgentSessionUsage;
-} | null;
 /**
  * List Codex sessions from rollout files.
  *

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

@@ -18,6 +18,7 @@ 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 { sortByRecencyDesc } from '../common/recency.js';
 import { getLogger } from '../../logger/index.js';
 import { isRecord, stringValue } from '../../common/guards.js';
 import { resolveCodexHome } from '../../config/codex-config.js';
@@ -45,11 +46,7 @@ export function readCodexRollout(filePath) {
         if (!sessionId) {
             return null;
         }
-        // Use file mtime as updatedAtMs, or parse timestamp from session_meta
         const stats = fs.statSync(filePath);
-        const createdAtMs = sessionMeta.timestamp
-            ? new Date(String(sessionMeta.timestamp)).getTime()
-            : stats.birthtimeMs;
         const updatedAtMs = stats.mtimeMs;
         const firstUserMessage = scan.realUserMessages[0] ?? '';
         const lastRealUserMessage = scan.realUserMessages[scan.realUserMessages.length - 1] ?? '';
@@ -59,7 +56,6 @@ export function readCodexRollout(filePath) {
             cwd,
             firstUserMessage: firstUserMessage || '(no user message)',
             lastRealUserMessage,
-            createdAtMs,
             updatedAtMs,
             events: scan.events,
             usage,
@@ -79,7 +75,7 @@ export function readCodexRollout(filePath) {
  *
  * Returns null if the file doesn't exist, is corrupted, or has no session_meta.
  */
-export function readCodexRolloutSummary(filePath) {
+function readCodexRolloutSummary(filePath) {
     if (!fs.existsSync(filePath)) {
         return null;
     }
@@ -316,7 +312,7 @@ export function listCodexRollouts(opts = {}) {
     // Establish the global order by mtime desc, then slice the page.
     // 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));
+    sortByRecencyDesc(matched, (e) => e.mtimeMs, (e) => e.filePath);
     const { items: page, total } = paginate(matched, { limit: opts.limit, offset: opts.offset });
     // Full-parse only the page being returned (summary/usage).
     const entries = [];

package/dist/session/common/pagination.d.ts

@@ -7,8 +7,6 @@
  * drifted on the default limit). Centralized here so the contract is defined
  * once: default page limit is 20, matching the majority of readers.
  */
-/** Default page size for listSessions. */
-export declare const DEFAULT_LIST_LIMIT = 20;
 /**
  * Paginate a (already-ordered) full item list by offset + limit.
  * Clamps negative offset to 0; caps limit to the remaining items.

package/dist/session/common/pagination.js

@@ -8,7 +8,7 @@
  * once: default page limit is 20, matching the majority of readers.
  */
 /** Default page size for listSessions. */
-export const DEFAULT_LIST_LIMIT = 20;
+const DEFAULT_LIST_LIMIT = 20;
 /**
  * Paginate a (already-ordered) full item list by offset + limit.
  * Clamps negative offset to 0; caps limit to the remaining items.

package/dist/session/common/recency.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Session-list ordering invariant shared by every reader: newest first,
+ * with a deterministic id tie-break so index rebuilds / walk-order changes
+ * never reorder a page (codex red line: never break out of a partial order).
+ */
+/** 「时间降序 + id 字典序 tie-break」原地排序（原先 6 处内联拷贝）。 */
+export declare function sortByRecencyDesc<T>(items: T[], time: (item: T) => number, id: (item: T) => string): void;

package/dist/session/common/recency.js

@@ -0,0 +1,10 @@
+/**
+ * Session-list ordering invariant shared by every reader: newest first,
+ * with a deterministic id tie-break so index rebuilds / walk-order changes
+ * never reorder a page (codex red line: never break out of a partial order).
+ */
+/** 「时间降序 + id 字典序 tie-break」原地排序（原先 6 处内联拷贝）。 */
+export function sortByRecencyDesc(items, time, id) {
+    items.sort((a, b) => time(b) - time(a) || id(a).localeCompare(id(b)));
+}
+//# sourceMappingURL=recency.js.map

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

@@ -55,4 +55,18 @@ export declare class UsageAccumulator {
      */
     bumpCompact(): void;
 }
+/** P2-8 统一契约：上下文窗口占用 = 末轮 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；
+ * codex 走 last_token_usage 口径、opencode 保留自己的条件赋值，原为逐字段复制的 4 连拷贝）。 */
+export declare function cumulativeUsageFields(t: {
+    input: number;
+    output: number;
+    cacheRead: number;
+    cacheCreation: number;
+}): Pick<import('../../runner/types.js').AgentSessionUsage, 'cumulativeTotalTokens' | 'cumulativeInputTokens' | 'cumulativeOutputTokens' | 'cumulativeCacheReadTokens' | 'cumulativeCacheCreationTokens'>;
 export {};

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

@@ -69,4 +69,19 @@ export class UsageAccumulator {
         this._compactCount++;
     }
 }
+/** P2-8 统一契约：上下文窗口占用 = 末轮 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；
+ * codex 走 last_token_usage 口径、opencode 保留自己的条件赋值，原为逐字段复制的 4 连拷贝）。 */
+export function cumulativeUsageFields(t) {
+    return {
+        cumulativeTotalTokens: t.input + t.output + t.cacheRead + t.cacheCreation,
+        cumulativeInputTokens: t.input,
+        cumulativeOutputTokens: t.output,
+        cumulativeCacheReadTokens: t.cacheRead,
+        cumulativeCacheCreationTokens: t.cacheCreation,
+    };
+}
 //# sourceMappingURL=usage-accumulator.js.map

package/dist/session/dsh/sessions.js

@@ -13,6 +13,8 @@
  *   session-wide usage accumulation (assistant/message.usage).
  */
 import { spawnSync } from 'node:child_process';
+import { cumulativeUsageFields } from '../common/usage-accumulator.js';
+import { sortByRecencyDesc } from '../common/recency.js';
 import { getLogger } from '../../logger/index.js';
 import { DEFAULT_DSH_HOST } from '../../config/index.js';
 import { capEvents, paginate } from '../common/pagination.js';
@@ -81,13 +83,13 @@ export class DshSessionReader {
             const items = value.items ?? [];
             const filtered = items
                 .filter((i) => i.cwd === cwd)
-                .sort((a, b) => b.updatedAt - a.updatedAt || String(a.sessionId).localeCompare(String(b.sessionId)))
                 .map((i) => ({
                 sessionId: String(i.sessionId),
                 summary: '',
                 mtime: i.updatedAt,
                 ...(i.agentPreset ? { agentPreset: i.agentPreset } : {}),
             }));
+            sortByRecencyDesc(filtered, (i) => i.mtime, (i) => i.sessionId);
             const { items: page, total } = paginate(filtered, opts ?? {});
             return { sessions: page, total };
         }
@@ -147,11 +149,12 @@ export class DshSessionReader {
                     cacheReadTokens: cacheRead,
                     cacheCreationTokens: cacheWrite,
                     totalTokens: input + output + cacheRead + cacheWrite,
-                    cumulativeTotalTokens: cumInput + cumOutput + cumCacheRead + cumCacheWrite,
-                    cumulativeInputTokens: cumInput,
-                    cumulativeOutputTokens: cumOutput,
-                    cumulativeCacheReadTokens: cumCacheRead,
-                    cumulativeCacheCreationTokens: cumCacheWrite,
+                    ...cumulativeUsageFields({
+                        input: cumInput,
+                        output: cumOutput,
+                        cacheRead: cumCacheRead,
+                        cacheCreation: cumCacheWrite,
+                    }),
                 };
             }
             return {

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

@@ -19,7 +19,9 @@ export interface KimiSessionState {
  * `messagesCompacted` 是死字段，真实 record 里不存在——禁止再写。
  */
 export interface KimiCompactionRecord {
-    type: 'full_compaction.complete' | 'context.apply_compaction';
+    type: 'full_compaction.begin' | 'full_compaction.complete' | 'full_compaction.cancel' | 'context.apply_compaction';
+    /** 压缩来源（仅 full_compaction.begin 携带）：'manual' | 'auto'。 */
+    source?: string;
     /** 压缩掉的消息条数（仅 context.apply_compaction 携带）。 */
     compactedCount?: number;
     /** 压缩前上下文 token 水位（仅 context.apply_compaction 携带）。 */
@@ -96,13 +98,25 @@ export declare class KimiSessionReader implements AgentSessionReader {
         maxEvents?: number;
     }): SessionContent;
     /**
-     * Read the compaction records (context.apply_compaction /
-     * full_compaction.complete) from a session's wire.jsonl.
+     * Read the compaction records (full_compaction.begin / complete / cancel /
+     * context.apply_compaction) from a session's wire.jsonl.
      *
      * Same cwd guard as readSessionContent. Used by KimiAcpRunner.runCompact
-     * (R2) to wait for the background compaction to land before ending the run.
+     * to wait for the background compaction terminal before ending the run, and
+     * by readCompactionState to detect an in-flight compaction.
      */
     readCompactionRecords(sessionId: string, cwd: string): KimiCompactionRecord[];
+    /**
+     * 由 begin/terminal 记录重建压缩状态机：最后一次 begin 无更新的 terminal
+     * 记录 = 在途（kimi-compact-wait-redesign §5.1）。崩溃墓碑由 kimi resume
+     * 时补写 full_compaction.cancel，天然闭合。
+     */
+    readCompactionState(sessionId: string, cwd: string): {
+        inFlight: boolean;
+        /** 在途 begin 的 time（epoch ms）。 */
+        inFlightSince?: number;
+        records: KimiCompactionRecord[];
+    };
     /**
      * Resolve the main wire.jsonl path for a session after passing the cwd
      * guard (state.json + session index fallback). Returns null when the

package/dist/session/kimi/sessions.js

@@ -2,10 +2,12 @@ import fs from 'node:fs';
 import path from 'node:path';
 import os from 'node:os';
 import { readJsonlLines as readJsonlLinesShared, readLastNJsonlLines } from '../common/jsonl.js';
-import { UsageAccumulator } from '../common/usage-accumulator.js';
+import { UsageAccumulator, cumulativeUsageFields } from '../common/usage-accumulator.js';
 import { getLogger } from '../../logger/index.js';
 import { STALE_MS } from '../common/constants.js';
 import { capEvents, paginate } from '../common/pagination.js';
+import { sortByRecencyDesc } from '../common/recency.js';
+import { TtlCache } from '../../common/ttl-cache.js';
 import { truncateUtf8, TOOL_RESULT_MAX_BYTES } from '../../common/truncate.js';
 import { truncateToolInput } from '../common/content-blocks.js';
 /** Default Kimi config directory */
@@ -25,6 +27,16 @@ function isTurnPrompt(entry) {
 function isCompactionComplete(entry) {
     return entry.type === 'full_compaction.complete' || entry.type === 'context.apply_compaction';
 }
+/** full_compaction.begin：压缩开始（手动 /compact 或自动触发都写）。 */
+function isCompactionBegin(entry) {
+    return entry.type === 'full_compaction.begin';
+}
+/** 压缩终态：完成（complete/apply）或失败/取消（cancel）共用 cancel 记录。 */
+function isCompactionTerminal(entry) {
+    return (entry.type === 'full_compaction.complete' ||
+        entry.type === 'context.apply_compaction' ||
+        entry.type === 'full_compaction.cancel');
+}
 /**
  * Max lines scanned backwards when looking for the last loop event.
  * Bounds the tail scan so huge wire files are not fully parsed.
@@ -55,10 +67,7 @@ function lastLoopEventIsStepEnd(lines) {
     return false;
 }
 /** Cache for JSONL file contents to avoid repeated full reads */
-const jsonlCache = new Map();
-const CACHE_TTL_MS = 5000; // 5 second cache TTL
-/** Upper bound on cached files; evict the least-recently-used entry past this. */
-const CACHE_MAX_ENTRIES = 32;
+const jsonlCache = new TtlCache(5_000, 32);
 /**
  * Read lines from a JSONL file with caching.
  * Delegates to the shared readJsonlLines for the actual file read,
@@ -68,25 +77,14 @@ function readJsonlLines(filePath) {
     try {
         const stat = fs.statSync(filePath);
         const mtime = stat.mtimeMs;
+        // P1-17: TTL 由 TtlCache 按缓存写入时间判定（不是文件 mtime），命中即 LRU 刷新；
+        // mtime 变化视为失效（文件被改写后不得返回旧行）。
         const cached = jsonlCache.get(filePath);
-        // P1-17: TTL must be measured from the cache-write time (cachedAt), not
-        // the FILE mtime — a file modified an hour ago would otherwise never hit
-        // the cache, making every call re-read and re-write the same entry.
-        if (cached && mtime === cached.mtime && Date.now() - cached.cachedAt < CACHE_TTL_MS) {
-            // LRU refresh on hit: re-insert so recently-used entries survive eviction.
-            jsonlCache.delete(filePath);
-            jsonlCache.set(filePath, cached);
+        if (cached && mtime === cached.mtime) {
             return cached.lines;
         }
         const lines = readJsonlLinesShared(filePath);
-        jsonlCache.set(filePath, { mtime, cachedAt: Date.now(), lines });
-        // P1-17: bound the cache. Map iteration is insertion order; after the LRU
-        // refresh above the least-recently-used entry is the first key.
-        if (jsonlCache.size > CACHE_MAX_ENTRIES) {
-            const oldest = jsonlCache.keys().next().value;
-            if (oldest !== undefined)
-                jsonlCache.delete(oldest);
-        }
+        jsonlCache.set(filePath, { mtime, lines });
         return lines;
     }
     catch {
@@ -271,7 +269,7 @@ export class KimiSessionReader {
             }
             // Sort by mtime descending; same-mtime ties use a deterministic
             // secondary key so ordering is stable across scans.
-            sessions.sort((a, b) => b.mtime - a.mtime || a.sessionId.localeCompare(b.sessionId));
+            sortByRecencyDesc(sessions, (s) => s.mtime, (s) => s.sessionId);
             const { items, total } = paginate(sessions, opts ?? {});
             return {
                 sessions: items,
@@ -469,11 +467,7 @@ export class KimiSessionReader {
                 totalTokens: t.input + t.output + t.cacheRead + t.cacheCreation,
                 // Cumulative (session-wide): kimi sums all usage.records; mirrors
                 // inputTokens/outputTokens which are already session totals.
-                cumulativeTotalTokens: t.input + t.output + t.cacheRead + t.cacheCreation,
-                cumulativeInputTokens: t.input,
-                cumulativeOutputTokens: t.output,
-                cumulativeCacheReadTokens: t.cacheRead > 0 ? t.cacheRead : 0,
-                cumulativeCacheCreationTokens: t.cacheCreation > 0 ? t.cacheCreation : 0,
+                ...cumulativeUsageFields(t),
                 // §6.3: compaction stats from wire.jsonl
                 compactCount,
                 ...(compactPreContextLength !== undefined ? { compactPreContextLength } : {}),
@@ -490,11 +484,12 @@ export class KimiSessionReader {
         }
     }
     /**
-     * Read the compaction records (context.apply_compaction /
-     * full_compaction.complete) from a session's wire.jsonl.
+     * Read the compaction records (full_compaction.begin / complete / cancel /
+     * context.apply_compaction) from a session's wire.jsonl.
      *
      * Same cwd guard as readSessionContent. Used by KimiAcpRunner.runCompact
-     * (R2) to wait for the background compaction to land before ending the run.
+     * to wait for the background compaction terminal before ending the run, and
+     * by readCompactionState to detect an in-flight compaction.
      */
     readCompactionRecords(sessionId, cwd) {
         const wirePath = this.resolveSessionWirePath(sessionId, cwd);
@@ -506,9 +501,10 @@ export class KimiSessionReader {
             for (const line of readJsonlLines(wirePath)) {
                 try {
                     const entry = JSON.parse(line);
-                    if (isCompactionComplete(entry)) {
+                    if (isCompactionBegin(entry) || isCompactionTerminal(entry)) {
                         records.push({
                             type: entry.type,
+                            ...(entry.source !== undefined ? { source: entry.source } : {}),
                             ...(entry.compactedCount !== undefined
                                 ? { compactedCount: entry.compactedCount }
                                 : {}),
@@ -529,6 +525,29 @@ export class KimiSessionReader {
         }
         return records;
     }
+    /**
+     * 由 begin/terminal 记录重建压缩状态机：最后一次 begin 无更新的 terminal
+     * 记录 = 在途（kimi-compact-wait-redesign §5.1）。崩溃墓碑由 kimi resume
+     * 时补写 full_compaction.cancel，天然闭合。
+     */
+    readCompactionState(sessionId, cwd) {
+        const records = [...this.readCompactionRecords(sessionId, cwd)].sort((a, b) => a.time - b.time);
+        let pendingBeginAt;
+        for (const record of records) {
+            if (isCompactionBegin(record)) {
+                pendingBeginAt = record.time;
+            }
+            else {
+                // 终态（complete/apply/cancel）闭合当前在途压缩。
+                pendingBeginAt = undefined;
+            }
+        }
+        return {
+            inFlight: pendingBeginAt !== undefined,
+            ...(pendingBeginAt !== undefined ? { inFlightSince: pendingBeginAt } : {}),
+            records,
+        };
+    }
     /**
      * Resolve the main wire.jsonl path for a session after passing the cwd
      * guard (state.json + session index fallback). Returns null when the

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

@@ -24,25 +24,13 @@ interface OpencodeSessionReaderOptions {
      */
     captureExport?: (sessionId: string) => string;
 }
-interface OpencodeSessionListEntry {
-    id: string;
-    title: string;
-    updated: number;
-    created: number;
-    projectId: string;
-    directory: string;
-}
 export declare class OpencodeSessionReader implements AgentSessionReader {
     private readonly binary;
     private readonly cacheTtlMs;
     /** Optional raw-export capture override (testing / alt transport). */
     private readonly captureExportOverride?;
-    /** Cache keyed by cwd - each cwd has its own cache entry */
-    /** cwd → 列表缓存（public：测试直接断言缓存形状，替代 as unknown as）。 */
-    listCache: Map<string, {
-        ts: number;
-        data: OpencodeSessionListEntry[];
-    }>;
+    /** cwd → 列表缓存（TTL 由 cacheTtlMs 决定）。 */
+    private listCache;
     constructor(opts?: OpencodeSessionReaderOptions);
     /**
      * List sessions in a given cwd, using directory field for matching.