lark-remote 0.5.13 → 0.5.15

package/dist/session/claude/session-index.d.ts

@@ -74,15 +74,22 @@ export declare class SessionIndex {
     private readonly byCwd;
     private lastRefreshAt;
     private built;
+    private scanError?;
     constructor(projectsDir: string, opts?: SessionIndexOptions);
     /** Whether a full scan has ever completed successfully (readdir succeeded). */
     get isBuilt(): boolean;
+    /**
+     * 最近一次全量扫描的非 ENOENT 失败（undefined = 上次扫描正常）。
+     * list 路径用它把「读不到」与「真的没有」区分开。
+     */
+    get lastScanError(): unknown;
     build(): void;
     refresh(): void;
-    listByCwd(cwd: string, opts?: {
-        limit?: number;
-        offset?: number;
-    }): SessionIndexEntry[];
+    /**
+     * 该 cwd 的全部会话（newest first）。分页不在这里：`listSessions` 的
+     * offset/limit 契约由 reader 用共享 `paginate()` 完成，索引只负责有序全集。
+     */
+    listByCwd(cwd: string): SessionIndexEntry[];
     /**
      * Find a session entry by sessionId and cwd.
      * Re-stats the file to verify fingerprint before returning (拍板 3):

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

@@ -83,6 +83,7 @@ export function parseSessionJsonl(filePath) {
     });
     // If file couldn't be opened, return empty result
     if (!ok) {
+        getLogger().debug(`[session-index] unreadable session file ${filePath}, treating as empty`);
         return { cwdSet: new Set(), summary: '(无摘要)' };
     }
     return { cwdSet, summary };
@@ -98,7 +99,12 @@ export function buildFingerprint(filePath) {
     try {
         st = fs.statSync(filePath, { bigint: true });
     }
-    catch {
+    catch (err) {
+        // ENOENT = 文件在扫描间隙被删除（正常竞态）。其余（EACCES/EBUSY…）留痕，
+        // 否则该会话会静默从 /resume 列表里消失。
+        if (err.code !== 'ENOENT') {
+            getLogger().warn(`[session-index] cannot stat ${filePath}: ${err?.message ?? String(err)}`);
+        }
         return '';
     }
     const parts = [String(st.size), String(st.mtimeNs)];
@@ -153,6 +159,7 @@ export class SessionIndex {
     byCwd = new Map();
     lastRefreshAt = 0;
     built = false;
+    scanError;
     constructor(projectsDir, opts = {}) {
         this.projectsDir = projectsDir;
         this.refreshIntervalMs = opts.refreshIntervalMs ?? 5000;
@@ -162,6 +169,13 @@ export class SessionIndex {
     get isBuilt() {
         return this.built;
     }
+    /**
+     * 最近一次全量扫描的非 ENOENT 失败（undefined = 上次扫描正常）。
+     * list 路径用它把「读不到」与「真的没有」区分开。
+     */
+    get lastScanError() {
+        return this.scanError;
+    }
     // ── Build (initial full scan) ───────────────────────────
     build() {
         this.fullScan();
@@ -177,7 +191,11 @@ export class SessionIndex {
         this.lastRefreshAt = now;
     }
     // ── Query: listByCwd ────────────────────────────────────
-    listByCwd(cwd, opts = {}) {
+    /**
+     * 该 cwd 的全部会话（newest first）。分页不在这里：`listSessions` 的
+     * offset/limit 契约由 reader 用共享 `paginate()` 完成，索引只负责有序全集。
+     */
+    listByCwd(cwd) {
         const paths = this.byCwd.get(pathKey(cwd, { platform: this.platform }));
         if (!paths || paths.size === 0)
             return [];
@@ -194,10 +212,7 @@ export class SessionIndex {
         }
         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);
-        return sliced;
+        return sorted;
     }
     // ── Query: findBySessionIdAndCwd ────────────────────────
     /**
@@ -261,11 +276,18 @@ export class SessionIndex {
         try {
             entries = fs.readdirSync(this.projectsDir);
         }
-        catch {
+        catch (err) {
             // readdir failure → preserve old index, degrade to fallback
-            getLogger().warn('[session-index] readdir failed, preserving old index');
+            if (err.code === 'ENOENT') {
+                // projectsDir 不存在 = 全新环境（真空态），不是故障。
+                this.scanError = undefined;
+                return;
+            }
+            this.scanError = err;
+            getLogger().warn(`[session-index] readdir ${this.projectsDir} failed, preserving old index: ${err?.message ?? String(err)}`);
             return;
         }
+        this.scanError = undefined;
         // readdir succeeded → the snapshot is authoritative for what we could read.
         this.built = true;
         const currentPaths = new Set();

package/dist/session/claude/session-reader.d.ts

@@ -1,4 +1,4 @@
-import type { AgentSession, AgentSessionReader, SessionContent } from '../../runner/index.js';
+import type { AgentSession, AgentSessionReader, SessionContent } from '../../session-contract.js';
 /**
  * Adapter that exposes Claude Code's session-reading functions through the
  * unified `AgentSessionReader` interface. This lets `SessionReaderRegistry`

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

@@ -1,4 +1,4 @@
-import type { AgentSession, AgentSessionContentEvent, AgentSessionUsage } from '../../runner/index.js';
+import type { AgentSession, AgentSessionContentEvent, AgentSessionUsage } from '../../session-contract.js';
 /**
  * List Claude Code sessions for a given cwd, newest first. Each entry has
  * the sessionId (= jsonl filename stem), a one-line summary extracted from
@@ -15,7 +15,7 @@ export declare function getNewestSession(cwd: string, opts?: {
 }): AgentSession | undefined;
 /**
  * Check if a Claude session (by sessionId + cwd) is still active.
- * Public wrapper around the internal `isSessionActive(filePath, mtimeMs, now)`
+ * Public wrapper around the internal `hasRecentFileActivity(filePath, mtimeMs, now)`
  * for use by `ClaudeSessionReader` and the multi-agent adapter layer.
  *
  * Resolves the jsonl path via `projectDirForCwd`, stats it for mtime, then

package/dist/session/claude/sessions.js

@@ -6,6 +6,7 @@ import { isStale } from '../common/constants.js';
 import { samePath, encodeProjectDirName } from '../../platform/path.js';
 import { extractContentBlocks } from '../common/content-blocks.js';
 import { scanJsonlOnce, tailOffsetAfter, scanTailEvents } from '../common/two-pass.js';
+import { getLogger } from '../../logger/index.js';
 import { UsageAccumulator, contextWindowOccupancy, cumulativeUsageFields, } from '../common/usage-accumulator.js';
 import { SessionIndex, extractText, isTaskNotificationText, CLAUDE_MAPPING, } from './session-index.js';
 /**
@@ -61,7 +62,10 @@ function findSessionFileInProjects(sessionId, projectsDir, cwd) {
     try {
         entries = fs.readdirSync(projectsDir);
     }
-    catch {
+    catch (err) {
+        if (err.code !== 'ENOENT') {
+            getLogger().debug(`[claude-session-reader] cannot read projects dir ${projectsDir}: ${err?.message ?? String(err)}`);
+        }
         return undefined;
     }
     const name = `${sessionId}.jsonl`;
@@ -123,6 +127,13 @@ export function listClaudeSessions(cwd, opts = {}) {
         summary: e.summary,
         mtime: e.mtimeMs,
     }));
+    // 空列表 + 上次扫描是非 ENOENT 失败 → 是「读不到」而非「真的没有」。
+    // 与 opencode/kimi/pi 同口径：router 显示「列表失败」，别假装空态。
+    if (sessions.length === 0 && index.lastScanError !== undefined) {
+        const err = index.lastScanError;
+        const msg = err instanceof Error ? err.message : String(err);
+        throw new Error(`claude session list 读取失败: ${msg}`, { cause: err });
+    }
     return limit === undefined ? sessions : sessions.slice(0, limit);
 }
 /** Get the newest session for a given cwd. Returns undefined if none exist. */
@@ -145,7 +156,15 @@ export function getNewestSession(cwd, opts = {}) {
  *
  * Override `now` for tests.
  */
-function isSessionActive(filePath, mtimeMs, now = Date.now()) {
+/** 末行是这些类型之一 = 会话已收尾（模块级：逐文件判定不必每次重建 Set）。 */
+const CLAUDE_TERMINAL_TYPES = new Set(['result', 'last-prompt', 'mode', 'permission-mode']);
+/**
+ * 文件侧的活跃判定：mtime 新鲜 + 末行没有终态标记。
+ *
+ * 刻意不叫 `isSessionActive`——那是 reader 契约上的方法名，语义各家自己定；
+ * 本函数只看这一个文件，两者同名不同义曾让人把「最近有写入」当成「turn 在跑」。
+ */
+function hasRecentFileActivity(filePath, mtimeMs, now = Date.now()) {
     // Hard signal: file untouched for over an hour → can't be from a live process
     if (isStale(mtimeMs, now))
         return false;
@@ -158,8 +177,7 @@ function isSessionActive(filePath, mtimeMs, now = Date.now()) {
         // `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: 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))
+        if (typeof obj.type === 'string' && CLAUDE_TERMINAL_TYPES.has(obj.type))
             return false;
     }
     catch {
@@ -167,9 +185,18 @@ function isSessionActive(filePath, mtimeMs, now = Date.now()) {
     }
     return true;
 }
+/**
+ * stat 失败：ENOENT = 文件在两次查询之间消失（正常竞态）；其余 errno 必须留痕，
+ * 否则「文件不可读」会被当成「会话不活跃」。
+ */
+function logStatFailure(filePath, err) {
+    if (err.code === 'ENOENT')
+        return;
+    getLogger().debug(`[claude-session-reader] stat ${filePath} failed: ${err?.message ?? String(err)}`);
+}
 /**
  * Check if a Claude session (by sessionId + cwd) is still active.
- * Public wrapper around the internal `isSessionActive(filePath, mtimeMs, now)`
+ * Public wrapper around the internal `hasRecentFileActivity(filePath, mtimeMs, now)`
  * for use by `ClaudeSessionReader` and the multi-agent adapter layer.
  *
  * Resolves the jsonl path via `projectDirForCwd`, stats it for mtime, then
@@ -187,9 +214,10 @@ export function isClaudeSessionActive(sessionId, cwd, opts = {}) {
         if (entry) {
             try {
                 const st = fs.statSync(entry.path);
-                return isSessionActive(entry.path, st.mtimeMs);
+                return hasRecentFileActivity(entry.path, st.mtimeMs);
             }
-            catch {
+            catch (err) {
+                logStatFailure(entry.path, err);
                 return false;
             }
         }
@@ -210,9 +238,10 @@ export function isClaudeSessionActive(sessionId, cwd, opts = {}) {
             return false;
         try {
             const st = fs.statSync(filePath);
-            return isSessionActive(filePath, st.mtimeMs);
+            return hasRecentFileActivity(filePath, st.mtimeMs);
         }
-        catch {
+        catch (err) {
+            logStatFailure(filePath, err);
             return false;
         }
     }
@@ -411,23 +440,9 @@ export function readSessionContent(sessionId, cwd, opts = {}) {
             return { events: [] };
         }
     }
-    // First pass STREAMS the file once via
-    // `scanJsonlLines` (no `string[]` materialized), parsing each line once to
-    // collect scalars (usage, tailOffset, aiTitle, recap, lastUserMessage)
-    // while retaining NO parsed objects and NO whole-file line array. The
-    // tailOffset is the byte offset where the tail begins (start of the line
-    // after the last user message). A second pass re-reads ONLY the tail from
-    // that offset via `readJsonlLinesFromOffset` and re-parses it for events —
-    // O(tail) memory for both raw line strings and parsed objects, instead of
-    // O(whole file).
-    //
-    // Parse ratio: ≈1.0–1.5× line count when a user message exists (streaming
-    // full-file scan + tail re-parse of the usually-short post-user lines).
-    // When the session has NO user message, tailOffset stays -1 and the tail
-    // IS the whole file → scan(N) + tail(N) = 2.0× — the known asymptotic
-    // upper bound of the body's two-phase design (still better than pre-'s
-    // ~3×). Total parse count adds the index-miss fallback guard's fixed
-    // early-stop overhead (~2 parses, independent of line count).
+    // Two-pass 扫描（pass 1 流式收标量 + pass 2 只重读 tail）的口径与解析比
+    // 见 `src/session/common/two-pass.ts` 头注释；claude 侧只多一项：索引 miss
+    // 时的 fallback 守卫另有固定 ~2 次早停解析，与行数无关。
     const scan = scalarScan(filePath);
     // 有 usage 即返回：非累计字段已是末轮 scope，命中判定用 session 累计兜底
     // （末轮可能 input/output 为 0 而仍有 cacheRead，累计口径不会被末轮遮挡）。

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

@@ -23,7 +23,7 @@
  * Note: This handles the **rollout file format** (historical logging), NOT the
  * `codex exec --json` stdout format（已随 exec 模式移除）。
  */
-import type { AgentSessionContentEvent, SessionContent, SessionSummary, AgentSessionUsage } from '../../runner/index.js';
+import type { AgentSessionContentEvent, AgentSessionUsage, SessionContent, SessionSummary } from '../../session-contract.js';
 interface CodexRolloutEntry {
     threadId: string;
     cwd: string;

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

@@ -32,6 +32,7 @@ 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 { TtlCache } from '../../common/ttl-cache.js';
 import { resolveCodexHome } from '../../config/codex-config.js';
 /** Field-wise difference (total - previous) for cumulative->incremental. */
 function subtractRawUsage(a, b) {
@@ -623,7 +624,12 @@ function safeIsDir(p) {
     }
 }
 const INDEX_TTL_MS = 5_000; // 5 seconds — covers a single /resume flow
-const sessionIndexCache = new Map();
+/**
+ * codexHome → 会话索引。共享 `TtlCache`（TTL 由写入时间判定 + LRU 上限），
+ * 与 kimi/pi/opencode 三个 reader 同一套语义。生产侧 `CodexSessionReader`
+ * 构造时就把 codexHome 解析定死，实际只会用到 1 个键；上限是防漏的界。
+ */
+const sessionIndexCache = new TtlCache(INDEX_TTL_MS, 4);
 /**
  * Build or return cached session index for a given resolved codexHome.
  * The index maps sessionId → {filePath, cwd, mtimeMs}.
@@ -635,19 +641,14 @@ const sessionIndexCache = new Map();
  *                           AFTER the cache was built — but still within the
  *                           5s TTL — is found without waiting for expiry.
  *
- * Cache shape note: `sessionIndexCache` is module-level and keyed by the
- * resolved codexHome string. In production `CodexSessionReader` resolves
- * codexHome once in its constructor and reuses it for every call, so a single
- * bridge instance produces exactly one cache entry — the Map does NOT grow
- * unbounded. The TTL refreshes the value on each rebuild; entries are never
- * evicted, but there is effectively just one.
+ * Cache shape note: the cache is module-level and keyed by the resolved
+ * codexHome string; `TtlCache` caps entries (LRU) so a caller that injects
+ * many distinct codexHomes cannot grow memory without bound.
  */
 function getSessionIndex(resolvedCodexHome, forceRefresh = false) {
-    const cacheKey = resolvedCodexHome;
-    const cached = sessionIndexCache.get(cacheKey);
-    if (!forceRefresh && cached && Date.now() - cached.builtAt < INDEX_TTL_MS) {
-        return cached.index;
-    }
+    const cached = forceRefresh ? undefined : sessionIndexCache.get(resolvedCodexHome);
+    if (cached)
+        return cached;
     const sessionsDir = path.join(resolvedCodexHome, 'sessions');
     const files = walkRolloutFiles(sessionsDir);
     const index = new Map();
@@ -704,7 +705,7 @@ function getSessionIndex(resolvedCodexHome, forceRefresh = false) {
             continue;
         }
     }
-    sessionIndexCache.set(cacheKey, { index, builtAt: Date.now() });
+    sessionIndexCache.set(resolvedCodexHome, index);
     return index;
 }
 /** Clear the session index cache. Exposed for tests. */

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

@@ -1,4 +1,4 @@
-import type { AgentSession, SessionContent, SessionSummary, AgentSessionReader } from '../../runner/index.js';
+import type { AgentSession, AgentSessionReader, SessionContent, SessionSummary } from '../../session-contract.js';
 interface CodexSessionReaderOptions {
     codexHome?: string;
 }

package/dist/session/codex/sessions.js

@@ -1,4 +1,6 @@
 import { resolveCodexHome } from '../../config/codex-config.js';
+import { DEFAULT_LIST_LIMIT } from '../common/pagination.js';
+import { newestOf } from '../common/recency.js';
 import { listCodexRollouts, readCodexSessionContent, readCodexSessionSummary, isCodexSessionActive, } from './rollout-reader.js';
 export class CodexSessionReader {
     codexHome;
@@ -9,7 +11,7 @@ export class CodexSessionReader {
         const result = listCodexRollouts({
             codexHome: this.codexHome,
             cwd,
-            limit: opts?.limit ?? 20,
+            limit: opts?.limit ?? DEFAULT_LIST_LIMIT,
             offset: opts?.offset,
         });
         return {
@@ -25,7 +27,7 @@ export class CodexSessionReader {
         };
     }
     getNewestSession(cwd) {
-        return this.listSessions(cwd, { limit: 1 }).sessions[0] ?? null;
+        return newestOf(this, cwd);
     }
     readSessionContent(sessionId, cwd, opts) {
         return readCodexSessionContent(sessionId, {

package/dist/session/common/jsonl.js

@@ -1,4 +1,5 @@
 import fs from 'node:fs';
+import { getLogger } from '../../logger/index.js';
 /**
  * Stream a JSONL file line-by-line using chunked reads.
  *
@@ -55,7 +56,12 @@ function forEachJsonlLineCore(filePath, opts) {
     try {
         fd = fs.openSync(filePath, 'r');
     }
-    catch {
+    catch (err) {
+        // ENOENT 是正常空态（陈旧 cwd / 会话已被清理）；其余（EACCES/EBUSY…）
+        // 必须留痕：否则「文件打不开」在 /resume 上与「没有会话」不可区分。
+        if (err.code !== 'ENOENT') {
+            getLogger().warn(`[jsonl] cannot open ${filePath}: ${err?.message ?? String(err)}`);
+        }
         return false;
     }
     const CHUNK_SIZE = 65536;

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

@@ -7,6 +7,8 @@
  * 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. */
-const DEFAULT_LIST_LIMIT = 20;
+export 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

@@ -3,5 +3,11 @@
  * 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).
  */
+import type { AgentSessionReader } from '../../session-contract.js';
 /** 「时间降序 + id 字典序 tie-break」原地排序（原先 6 处内联拷贝）。 */
 export declare function sortByRecencyDesc<T>(items: T[], time: (item: T) => number, id: (item: T) => string): void;
+/**
+ * 列表首项 = 最新会话（`getNewestSession` 的唯一实现，此前 5 个 reader 逐字各抄一遍）。
+ * 「newest first」是 `AgentSessionReader.listSessions` 的契约，这里只取第一页第一条。
+ */
+export declare function newestOf(reader: Pick<AgentSessionReader, 'listSessions'>, cwd: string): import("../../session-contract.js").AgentSession;

package/dist/session/common/recency.js

@@ -1,10 +1,12 @@
-/**
- * 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)));
 }
+/**
+ * 列表首项 = 最新会话（`getNewestSession` 的唯一实现，此前 5 个 reader 逐字各抄一遍）。
+ * 「newest first」是 `AgentSessionReader.listSessions` 的契约，这里只取第一页第一条。
+ */
+export function newestOf(reader, cwd) {
+    return reader.listSessions(cwd, { limit: 1 }).sessions[0] ?? null;
+}
 //# sourceMappingURL=recency.js.map

package/dist/session/common/two-pass.d.ts

@@ -1,4 +1,4 @@
-import type { AgentSessionContentEvent } from '../../runner/types.js';
+import type { AgentSessionContentEvent } from '../../session-contract.js';
 /**
  * Byte offset where the tail begins: the start of the line AFTER `line`.
  * `offset` is the byte offset of `line` itself; +1 accounts for the trailing

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

@@ -77,5 +77,5 @@ export declare function cumulativeUsageFields(t: {
     output: number;
     cacheRead: number;
     cacheCreation: number;
-}): Pick<import('../../runner/types.js').AgentSessionUsage, 'cumulativeTotalTokens' | 'cumulativeInputTokens' | 'cumulativeOutputTokens' | 'cumulativeCacheReadTokens' | 'cumulativeCacheCreationTokens'>;
+}): Pick<import('../../session-contract.js').AgentSessionUsage, 'cumulativeTotalTokens' | 'cumulativeInputTokens' | 'cumulativeOutputTokens' | 'cumulativeCacheReadTokens' | 'cumulativeCacheCreationTokens'>;
 export {};

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

@@ -13,7 +13,7 @@
  *   session-wide usage accumulation (assistant/message.usage)；本 run 的 flow
  *   字段 = 末个 turn（turn/start–turn/end）内所有采样之和，与 codex 同口径。
  */
-import type { AgentSession, AgentSessionReader, SessionContent } from '../../runner/index.js';
+import type { AgentSession, AgentSessionReader, SessionContent } from '../../session-contract.js';
 interface DshSessionReaderOptions {
     host?: string;
     /** Configured DSH home; selects `.credentials.yaml` when credentialsFile is unset. */

package/dist/session/dsh/sessions.js

@@ -15,13 +15,13 @@
  */
 import { spawnProcessSync } from '../../platform/spawn.js';
 import { cumulativeUsageFields } from '../common/usage-accumulator.js';
-import { sortByRecencyDesc } from '../common/recency.js';
+import { newestOf, sortByRecencyDesc } from '../common/recency.js';
 import { getLogger } from '../../logger/index.js';
 import { DEFAULT_DSH_HOST } from '../../config/index.js';
 import { samePath } from '../../platform/path.js';
 import { isWin32 } from '../../platform/select.js';
-import { dshArgs, extractDshToken } from '../../runner/dsh/client.js';
-import { DSH_COOKIE_LIFETIME_MS, isDshCredentialsNotFound, mintDshBrowserCookie, readDshBrowserSecretSync, resolveDshCredentialsFile, } from '../../runner/dsh/auth.js';
+import { dshArgs, extractDshToken } from '../../dsh/protocol.js';
+import { DSH_COOKIE_LIFETIME_MS, isDshCredentialsNotFound, mintDshBrowserCookie, readDshBrowserSecretSync, resolveDshCredentialsFile, } from '../../dsh/auth.js';
 import { capEvents, paginate } from '../common/pagination.js';
 import { truncateUtf8, TOOL_RESULT_MAX_BYTES } from '../../common/truncate.js';
 import { summarizeToolInput } from '../../common/tool-summary.js';
@@ -50,13 +50,23 @@ function defaultSyncRequest(baseUrl, method, payload, cookie) {
         ...(cookie ? ['-H', `Cookie: ${cookie}`] : []),
         '--data',
         body,
+        // 末尾追加 HTTP 状态码：401/403 要与「偶发失败」区分（cookie 失效才值得重试）。
+        '--write-out',
+        '\n%{http_code}',
     ], { encoding: 'utf-8', timeout: 15_000, maxBuffer: 64 * 1024 * 1024 });
     if (res.error || res.status !== 0) {
         throw new Error(`DSH ${method} failed: ${(res.error?.message ?? res.stderr) || 'unknown'}`);
     }
+    const raw = String(res.stdout);
+    const statusMatch = /\n(\d{3})$/.exec(raw);
+    const httpStatus = statusMatch ? Number(statusMatch[1]) : undefined;
+    const bodyText = statusMatch ? raw.slice(0, statusMatch.index) : raw;
+    if (httpStatus === 401 || httpStatus === 403) {
+        throw new Error(`DSH ${method} unauthorized (HTTP ${httpStatus})`);
+    }
     let parsed;
     try {
-        parsed = JSON.parse(String(res.stdout));
+        parsed = JSON.parse(bodyText);
     }
     catch (err) {
         throw new Error(`DSH ${method} returned non-JSON: ${err.message}`, {
@@ -82,6 +92,11 @@ function defaultSyncConnect(baseUrl, token) {
         throw new Error('DSH auth failed: index handshake did not return a cookie');
     return cookie;
 }
+/** Cookie 失效的判定：HTTP 401/403 或服务端回报 unauthorized/forbidden。 */
+function isAuthFailure(err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    return /\b401\b|\b403\b|unauthori[sz]ed|forbidden|invalid[ -]?cookie/i.test(msg);
+}
 export class DshSessionReader {
     hostProvider;
     dshHomeProvider;
@@ -121,11 +136,23 @@ export class DshSessionReader {
         try {
             return this.syncRequest(baseUrl, method, payload, this.resolveCookie());
         }
-        catch {
-            // DSH may have restarted while lark-remote cached a token-derived cookie.
-            // Re-read the credentials file and retry once with a fresh cookie.
+        catch (first) {
+            // 只有 cookie 失效值得清缓存重试。404/500/timeout 重试会让 /resume 延迟
+            // 翻倍，且第二次错误会盖掉真正的根因。
+            if (!isAuthFailure(first))
+                throw first;
+            getLogger().warn(`[dsh-session-reader] ${method} auth failed, refreshing cookie and retrying: ${first?.message ?? String(first)}`);
             this.cookieCache.clear();
-            return this.syncRequest(baseUrl, method, payload, this.resolveCookie());
+            try {
+                return this.syncRequest(baseUrl, method, payload, this.resolveCookie());
+            }
+            catch (second) {
+                // 重试仍失败：首错（cookie 失效）才是根因。`cause` 必须是本次捕获的 err
+                // （lint preserve-caught-error），所以根因写进 message 一并留痕。
+                const firstMsg = first?.message ?? String(first);
+                const secondMsg = second?.message ?? String(second);
+                throw new Error(`DSH ${method} failed after cookie refresh: ${secondMsg} (root cause: ${firstMsg})`, { cause: second });
+            }
         }
     }
     /** Mint from the durable secret, or bootstrap and cache a token cookie. */
@@ -186,7 +213,7 @@ export class DshSessionReader {
         }
     }
     getNewestSession(cwd) {
-        return this.listSessions(cwd, { limit: 1 }).sessions[0] ?? null;
+        return newestOf(this, cwd);
     }
     readSessionContent(sessionId, cwd, opts) {
         try {
@@ -354,9 +381,7 @@ export class DshSessionReader {
         const projection = this.unary('session/projections', { sessionId });
         if (typeof projection?.asOfSeq === 'number')
             return projection.asOfSeq;
-        const row = known ??
-            this.unary('session/list', {}).items?.find((item) => String(item.sessionId) === sessionId);
-        return typeof row?.projections?.asOfSeq === 'number' ? row.projections.asOfSeq : -1;
+        return typeof known.projections?.asOfSeq === 'number' ? known.projections.asOfSeq : -1;
     }
 }
 /** Preset moved from the summary top level to projections in DSH 0.2.x. */

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

@@ -1,4 +1,4 @@
-import type { AgentSession, AgentSessionReader, SessionContent } from '../../runner/index.js';
+import type { AgentSession, AgentSessionReader, SessionContent } from '../../session-contract.js';
 export interface KimiSessionState {
     version?: number;
     createdAt: string | number;