lark-remote 0.1.12 → 0.2.0

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

@@ -9,3 +9,10 @@
  * mtime is older than this threshold cannot be from a running process.
  */
 export declare const STALE_MS: number;
+/**
+ * A session file is stale (cannot be from a running process) when its
+ * timestamp is older than STALE_MS. All readers share this single
+ * comparison — previously it was re-derived per reader as
+ * `Date.now() - mtimeMs > STALE_MS` (or its `< STALE_MS` negation).
+ */
+export declare function isStale(timestampMs: number, now?: number): boolean;

package/dist/session/common/constants.js

@@ -9,4 +9,13 @@
  * mtime is older than this threshold cannot be from a running process.
  */
 export const STALE_MS = 60 * 60 * 1000;
+/**
+ * A session file is stale (cannot be from a running process) when its
+ * timestamp is older than STALE_MS. All readers share this single
+ * comparison — previously it was re-derived per reader as
+ * `Date.now() - mtimeMs > STALE_MS` (or its `< STALE_MS` negation).
+ */
+export function isStale(timestampMs, now = Date.now()) {
+    return now - timestampMs > STALE_MS;
+}
 //# sourceMappingURL=constants.js.map

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/two-pass.d.ts

@@ -0,0 +1,22 @@
+import type { AgentSessionContentEvent } from '../../runner/types.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
+ * '\n'.
+ */
+export declare function tailOffsetAfter(line: string, offset: number): number;
+/**
+ * Pass 1: stream the file once, parse each line exactly once (broken lines
+ * skipped), and feed the parsed object + raw line + byte offset to `handle`.
+ * `handle` may mutate closure state to collect scalars and track the tail
+ * offset (via tailOffsetAfter on user lines).
+ */
+export declare function scanJsonlOnce(filePath: string, handle: (obj: Record<string, unknown>, line: string, offset: number) => void): void;
+/**
+ * Pass 2: re-read only the tail (lines after `tailOffset`; the whole file
+ * when tailOffset is -1) and map each parsed line to content events via
+ * `mapLine` (return an array — possibly empty — of events; returning null
+ * skips the line entirely). `maxEvents` keeps the LAST N events
+ * (`maxEvents <= 0` → [], guarding the `slice(-0)` full-array trap).
+ */
+export declare function scanTailEvents(filePath: string, tailOffset: number, mapLine: (obj: Record<string, unknown>) => AgentSessionContentEvent[] | null, maxEvents?: number): AgentSessionContentEvent[];

package/dist/session/common/two-pass.js

@@ -0,0 +1,70 @@
+/**
+ * Two-pass scan skeleton shared by the claude / pi session readers (P2-2 +
+ * P2-5/P2-6 lineage): pass 1 STREAMS the whole file once via `scanJsonlLines`
+ * (no `string[]` materialized), parsing each line exactly once to collect
+ * scalars (usage, tail offset, title) while retaining NO parsed objects; pass
+ * 2 re-reads ONLY the tail from the recorded offset and re-parses it for
+ * content 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 two-phase design.
+ */
+import { scanJsonlLines, readJsonlLinesFromOffset } from './jsonl.js';
+import { capEvents } from './pagination.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
+ * '\n'.
+ */
+export function tailOffsetAfter(line, offset) {
+    return offset + Buffer.byteLength(line, 'utf-8') + 1;
+}
+/**
+ * Pass 1: stream the file once, parse each line exactly once (broken lines
+ * skipped), and feed the parsed object + raw line + byte offset to `handle`.
+ * `handle` may mutate closure state to collect scalars and track the tail
+ * offset (via tailOffsetAfter on user lines).
+ */
+export function scanJsonlOnce(filePath, handle) {
+    scanJsonlLines(filePath, (line, offset) => {
+        let obj;
+        try {
+            obj = JSON.parse(line);
+        }
+        catch {
+            return;
+        }
+        handle(obj, line, offset);
+    });
+}
+/**
+ * Pass 2: re-read only the tail (lines after `tailOffset`; the whole file
+ * when tailOffset is -1) and map each parsed line to content events via
+ * `mapLine` (return an array — possibly empty — of events; returning null
+ * skips the line entirely). `maxEvents` keeps the LAST N events
+ * (`maxEvents <= 0` → [], guarding the `slice(-0)` full-array trap).
+ */
+export function scanTailEvents(filePath, tailOffset, mapLine, maxEvents) {
+    const tailLines = readJsonlLinesFromOffset(filePath, tailOffset >= 0 ? tailOffset : 0);
+    const events = [];
+    for (const line of tailLines) {
+        if (!line.trim())
+            continue;
+        let obj;
+        try {
+            obj = JSON.parse(line);
+        }
+        catch {
+            continue;
+        }
+        const produced = mapLine(obj);
+        if (produced)
+            events.push(...produced);
+    }
+    return capEvents(events, maxEvents);
+}
+//# sourceMappingURL=two-pass.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

@@ -12,9 +12,12 @@
  * readSessionContent: session.history → map SessionEvents to display events +
  *   session-wide usage accumulation (assistant/message.usage).
  */
-import { spawnSync } from 'node:child_process';
+import { spawnProcessSync } from '../../platform/spawn.js';
+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 { samePath } from '../../platform/path.js';
 import { capEvents, paginate } from '../common/pagination.js';
 import { truncateUtf8, TOOL_RESULT_MAX_BYTES } from '../../common/truncate.js';
 /**
@@ -32,7 +35,7 @@ function defaultSyncRequest(baseUrl, method, payload) {
         method,
         payload,
     });
-    const res = spawnSync('curl', [
+    const res = spawnProcessSync('curl', [
         '-s',
         '-X',
         'POST',
@@ -47,7 +50,7 @@ function defaultSyncRequest(baseUrl, method, payload) {
     }
     let parsed;
     try {
-        parsed = JSON.parse(res.stdout);
+        parsed = JSON.parse(String(res.stdout));
     }
     catch (err) {
         throw new Error(`DSH ${method} returned non-JSON: ${err.message}`, {
@@ -80,14 +83,14 @@ export class DshSessionReader {
             const value = this.unary('session.list', {});
             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)))
+                .filter((i) => i.cwd !== undefined && samePath(i.cwd, cwd))
                 .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 +150,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 {
@@ -170,7 +174,7 @@ export class DshSessionReader {
     isSessionActive(sessionId, cwd) {
         try {
             const value = this.unary('session.list', {});
-            const found = (value.items ?? []).find((i) => String(i.sessionId) === sessionId && i.cwd === cwd);
+            const found = (value.items ?? []).find((i) => String(i.sessionId) === sessionId && i.cwd !== undefined && samePath(i.cwd, cwd));
             return found?.running === true;
         }
         catch (error) {

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,31 @@ 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[];
+    };
+    /**
+     * W2.5 单源：resolveSessionWirePath 与 isSessionActive 共用的 cwd 守卫
+     * （realpathSync → state.json workDir/cwd 三态 → index workDir 兜底 →
+     * fail-closed）。返回 sessionDir；会话未知或守卫不过返回 null。
+     */
+    private verifySessionCwd;
     /**
      * Resolve the main wire.jsonl path for a session after passing the cwd
      * guard (state.json + session index fallback). Returns null when the