lark-remote 0.5.14 → 0.5.16

package/dist/session/pi/sessions.js

@@ -157,6 +157,11 @@ function findSessionFile(sessionId, cwd, sessionsDir) {
  */
 function piScalarScan(filePath) {
     const acc = new UsageAccumulator();
+    // 末个真人 turn 的 flow：user 消息开启新 turn，assistant 用量同时进两个
+    // accumulator。带工具往返的 turn 有多个 assistant 消息（一次模型请求一条），
+    // 只取末条会低报整轮消耗。
+    let turnAcc = new UsageAccumulator();
+    let sawUser = false;
     let tailOffset = -1;
     let lastUserText;
     scanJsonlOnce(filePath, (rawObj, line, offset) => {
@@ -168,18 +173,22 @@ function piScalarScan(filePath) {
             // usage aggregation (assistant only)
             if (msg.role === 'assistant' && msg.usage) {
                 const u = msg.usage;
-                acc.add({
+                const record = {
                     input: u.input ?? 0,
                     output: u.output ?? 0,
                     cacheRead: u.cacheRead ?? 0,
                     cacheCreation: u.cacheWrite ?? 0,
                     total: u.totalTokens ?? 0,
-                });
+                };
+                acc.add(record);
+                turnAcc.add(record);
             }
             // last user message offset + displayTitle. Record the byte offset
             // where the tail should start: the beginning of the NEXT line after
             // this user message (see tailOffsetAfter).
             if (msg.role === 'user') {
+                sawUser = true;
+                turnAcc = new UsageAccumulator();
                 tailOffset = tailOffsetAfter(line, offset);
                 const text = extractPiText(msg.content);
                 // Compress skill-injection bodies so the "最近输入" label shows what
@@ -195,7 +204,7 @@ function piScalarScan(filePath) {
     });
     return {
         tailOffset,
-        usage: buildPiUsage(acc),
+        usage: buildPiUsage(acc, turnAcc, sawUser),
         // Whitespace-normalized single-line display title (no length truncation —
         // the consumer truncates). Normalization collapses the skill-injection
         // newlines so the title stays on one line.
@@ -203,27 +212,38 @@ function piScalarScan(filePath) {
     };
 }
 /**
- * Build the AgentSessionUsage from an accumulator, preserving pi's
- * "last turn" semantics: inputTokens/outputTokens use the LAST turn's
- * values, contextLength = last turn's context-window occupancy
- * (input + cacheRead + cacheCreation, excludes output —unified
- * contract across all five readers), cumulative = session-wide sum.
+ * Build the AgentSessionUsage: flow (input/output/cache/total) is the sum of
+ * every assistant message in the LAST real-user turn; contextLength is the
+ * last assistant message's window occupancy; cumulative is the whole session.
+ * With no real-user turn (legacy/truncated file), flow falls back to the last
+ * assistant sample, matching dsh/codex's no-turn-marker fallback.
  * Returns undefined when no usage data was observed.
  */
-function buildPiUsage(acc) {
+function buildPiUsage(acc, turnAcc, sawUser) {
     const t = acc.totals;
-    if (t.input + t.output === 0) {
+    if (t.input + t.output + t.cacheRead + t.cacheCreation === 0) {
         return undefined;
     }
     const l = acc.last;
+    // 没有真人 user prompt（旧数据/截断文件）→ 无法划分 turn，回退末条采样，
+    // 与 dsh/codex「无 turn 标记退回末条」一致；不能把整份文件当成一轮。
+    const f = sawUser
+        ? turnAcc.totals
+        : {
+            input: l.input,
+            output: l.output,
+            cacheRead: l.cacheRead,
+            cacheCreation: l.cacheCreation,
+            total: l.total,
+        };
     return {
-        inputTokens: l.input,
-        outputTokens: l.output,
+        inputTokens: f.input,
+        outputTokens: f.output,
         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,
+        cacheReadTokens: f.cacheRead > 0 ? f.cacheRead : 0,
+        cacheCreationTokens: f.cacheCreation > 0 ? f.cacheCreation : 0,
+        totalTokens: f.total > 0 ? f.total : undefined,
         // Cumulative (session-wide): sum of ALL runs in the jsonl file.
         ...cumulativeUsageFields(t),
     };

package/dist/session/registry.d.ts

@@ -10,4 +10,6 @@ export declare class SessionReaderRegistry {
     private readonly readers;
     register(kind: AgentKind, reader: AgentSessionReader): void;
     get(kind: AgentKind): AgentSessionReader;
+    /** 可选能力探测用：不抛错，交给调用方决定降级行为。 */
+    tryGet(kind: AgentKind): AgentSessionReader | undefined;
 }

package/dist/session/registry.js

@@ -16,5 +16,9 @@ export class SessionReaderRegistry {
         }
         return reader;
     }
+    /** 可选能力探测用：不抛错，交给调用方决定降级行为。 */
+    tryGet(kind) {
+        return this.readers.get(kind);
+    }
 }
 //# sourceMappingURL=registry.js.map

package/dist/session-contract.d.ts

@@ -175,4 +175,10 @@ export interface AgentSessionReader {
      * 未实现 = 该 agent 没有这个概念，调用方按「不在途」处理。
      */
     readCompactionState?(sessionId: string, cwd: string): CompactionState;
+    /**
+     * `readSessionContent` 是否产出 `compactCount`。opencode 的 export 没有
+     * 压缩计数；compact 收尾的重试不能把「不支持」误判成「还没落盘」。
+     * 未声明 = 支持（保持既有 reader 行为）。
+     */
+    supportsCompactCount?: boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lark-remote",
-  "version": "0.5.14",
+  "version": "0.5.16",
   "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",