lark-remote 0.1.12 → 0.1.13

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.12",
+  "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",