lark-remote 0.1.11 → 0.1.13

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.

package/dist/session/opencode/sessions.js

@@ -22,17 +22,19 @@ import { truncateUtf8, TOOL_RESULT_MAX_BYTES } from '../../common/truncate.js';
 import { getLogger } from '../../logger/index.js';
 import { STALE_MS } from '../common/constants.js';
 import { paginate, capEvents } from '../common/pagination.js';
+import { sortByRecencyDesc } from '../common/recency.js';
+import { TtlCache } from '../../common/ttl-cache.js';
 export class OpencodeSessionReader {
     binary;
     cacheTtlMs;
     /** Optional raw-export capture override (testing / alt transport). */
     captureExportOverride;
-    /** Cache keyed by cwd - each cwd has its own cache entry */
-    /** cwd → 列表缓存（public：测试直接断言缓存形状，替代 as unknown as）。 */
-    listCache = new Map();
+    /** cwd → 列表缓存（TTL 由 cacheTtlMs 决定）。 */
+    listCache;
     constructor(opts = {}) {
         this.binary = 'opencode';
         this.cacheTtlMs = opts.cacheTtlMs ?? 10_000;
+        this.listCache = new TtlCache(this.cacheTtlMs);
         this.captureExportOverride = opts.captureExport;
     }
     /**
@@ -47,7 +49,7 @@ export class OpencodeSessionReader {
         const filtered = entries.filter((e) => e.directory === realCwd);
         // Sort by updated descending; same-updated ties use id as a deterministic
         // secondary key so CLI/list-cache rebuilds never reorder the page.
-        filtered.sort((a, b) => b.updated - a.updated || a.id.localeCompare(b.id));
+        sortByRecencyDesc(filtered, (s) => s.updated, (s) => s.id);
         // Compute total over the full sorted set, then paginate.
         const { items, total } = paginate(filtered, opts ?? {});
         return {
@@ -302,8 +304,8 @@ export class OpencodeSessionReader {
     fetchSessionList(cwd) {
         const realCwd = this.realpath(cwd);
         const cached = this.listCache.get(realCwd);
-        if (cached && Date.now() - cached.ts < this.cacheTtlMs) {
-            return cached.data;
+        if (cached) {
+            return cached;
         }
         try {
             // Pass cwd to execFileSync so opencode CLI returns sessions for the correct directory
@@ -322,7 +324,7 @@ export class OpencodeSessionReader {
             }
             const data = JSON.parse(output);
             // Update cache keyed by cwd
-            this.listCache.set(realCwd, { ts: Date.now(), data });
+            this.listCache.set(realCwd, data);
             return data;
         }
         catch (err) {

package/dist/session/pi/sessions.js

@@ -3,9 +3,11 @@ import path from 'node:path';
 import os from 'node:os';
 import { findJsonlLine, scanJsonlLines, readJsonlLinesFromOffset } from '../common/jsonl.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 { 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';
 function defaultPiDir() {
     return path.join(os.homedir(), '.pi', 'agent');
 }
@@ -19,10 +21,7 @@ function projectDirForCwd(cwd, sessionsDir) {
  * P1-19: TTL cache for pi directory scans (mirror codex getSessionIndex's
  * 5s TTL). Repeated /resume pages re-scan the whole sessions dir per call.
  */
-const PI_LIST_TTL_MS = 5000;
-/** Upper bound on cached listings; FIFO eviction past this. */
-const PI_LIST_MAX_ENTRIES = 32;
-const piListCache = new Map();
+const piListCache = new TtlCache(5_000, 32);
 /** Pi-specific field-name mapping for content block extraction. */
 export const PI_MAPPING = {
     toolUseType: 'toolCall',
@@ -207,21 +206,16 @@ function buildPiUsage(acc) {
         return undefined;
     }
     const l = acc.last;
-    const contextLength = l.input + l.cacheRead + l.cacheCreation;
     return {
         inputTokens: l.input,
         outputTokens: l.output,
-        contextLength,
+        contextLength: contextWindowOccupancy(l),
         compactCount: acc.compactCount > 0 ? acc.compactCount : undefined,
         cacheReadTokens: l.cacheRead > 0 ? l.cacheRead : 0,
         cacheCreationTokens: l.cacheCreation > 0 ? l.cacheCreation : 0,
         totalTokens: l.total > 0 ? l.total : undefined,
         // Cumulative (session-wide): sum of ALL runs in the jsonl file.
-        cumulativeTotalTokens: t.input + t.output + t.cacheRead + t.cacheCreation,
-        cumulativeInputTokens: t.input,
-        cumulativeOutputTokens: t.output,
-        cumulativeCacheReadTokens: t.cacheRead,
-        cumulativeCacheCreationTokens: t.cacheCreation,
+        ...cumulativeUsageFields(t),
     };
 }
 /**
@@ -346,8 +340,8 @@ export class PiSessionReader {
     listSessionsByScan(cwd) {
         const cacheKey = `${this.sessionsDir}\u0000${cwd}`;
         const cached = piListCache.get(cacheKey);
-        if (cached && Date.now() - cached.builtAt < PI_LIST_TTL_MS) {
-            return cached.sessions;
+        if (cached) {
+            return cached;
         }
         const dir = projectDirForCwd(cwd, this.sessionsDir);
         let files;
@@ -381,14 +375,8 @@ export class PiSessionReader {
             }
         }
         // Same-mtime ties: secondary key keeps the full order deterministic.
-        sessions.sort((a, b) => b.mtime - a.mtime || a.sessionId.localeCompare(b.sessionId));
-        piListCache.set(cacheKey, { builtAt: Date.now(), sessions });
-        // Bound the cache (map iteration order = insertion order).
-        if (piListCache.size > PI_LIST_MAX_ENTRIES) {
-            const oldest = piListCache.keys().next().value;
-            if (oldest !== undefined)
-                piListCache.delete(oldest);
-        }
+        sortByRecencyDesc(sessions, (s) => s.mtime, (s) => s.sessionId);
+        piListCache.set(cacheKey, sessions);
         return sessions;
     }
 }

package/dist/update/index.d.ts

@@ -5,6 +5,6 @@
  * package installation (detect package manager + global install),
  * and the combined workflow for the /update command and --update CLI flag.
  */
-export { isNewer, checkLatestVersion, type VersionCheckResult, type UpdateCache, } from './version-check.js';
-export { runInstallLatest, type PackageManager, type InstallResult } from './install.js';
+export { isNewer, checkLatestVersion, type VersionCheckResult } from './version-check.js';
+export { runInstallLatest, type InstallResult } from './install.js';
 export { formatUpdateHint } from './startup-hint.js';

package/dist/update/index.js

@@ -5,7 +5,7 @@
  * package installation (detect package manager + global install),
  * and the combined workflow for the /update command and --update CLI flag.
  */
-export { isNewer, checkLatestVersion, } from './version-check.js';
+export { isNewer, checkLatestVersion } from './version-check.js';
 export { runInstallLatest } from './install.js';
 export { formatUpdateHint } from './startup-hint.js';
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lark-remote",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "description": "Feishu (Lark) private-chat bridge to local coding agents — Claude Code / Codex / opencode / pi / kimi, with live-streaming CardKit 2.0 cards",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -101,7 +101,6 @@
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",
-    "@types/form-data": "^2.5.2",
     "@types/node": "^26.1.2",
     "@types/qrcode-terminal": "^0.12.2",
     "@vitest/coverage-v8": "4.1.10",