lark-remote 0.5.20 → 0.5.21

package/dist/runner/pi/rpc/translator.js

@@ -10,7 +10,56 @@
  *     `result` from that response.
  *   - `agent_settled` is ignored for compaction turns (no double result).
  */
-import { makeTurnStartedEvent } from '../../common/turn-started.js';
+import { produceTurnStartedEvent } from '../../common/turn-started.js';
+/** 首见：push 一个空 text/thinking 块并把游标移到它。 */
+function textLikeStart(kind, state, _evt) {
+    state.content.push(kind === 'text' ? { type: 'text', text: '' } : { type: 'thinking', thinking: '' });
+    state.currentContentIndex++;
+}
+/** 增量：把 delta 追加到当前 text/thinking 块（类型不匹配则忽略）。 */
+function textLikeDelta(kind, state, evt) {
+    const idx = state.currentContentIndex;
+    const block = state.content[idx];
+    if (idx >= 0 && block?.type === kind) {
+        block[kind] += evt.delta ?? '';
+    }
+}
+/** 收尾：以全量 content 覆盖当前 text/thinking 块（无 content 则忽略）。 */
+function textLikeEnd(kind, state, evt) {
+    const idx = state.currentContentIndex;
+    const block = state.content[idx];
+    if (idx >= 0 && block?.type === kind && evt.content) {
+        block[kind] = evt.content;
+    }
+}
+function toolCallStart(state, _evt) {
+    // 信息保真 不再 push 空壳 tool_use（空 id/name 会被渲染成
+    // 无意义工具块）。只保留 bookkeeping，toolcall_end 补发完整事件。
+    state.pendingToolCall = true;
+}
+function toolCallEnd(state, evt) {
+    if (state.pendingToolCall && evt.toolCall) {
+        state.content.push({
+            type: 'tool_use',
+            id: evt.toolCall.id,
+            name: evt.toolCall.name,
+            input: evt.toolCall.arguments,
+        });
+        state.currentContentIndex = state.content.length - 1;
+        state.pendingToolCall = false;
+    }
+}
+/** 查表分派 message_update；toolcall_delta 等无专属 handler 的类型为 no-op。 */
+const PI_UPDATE_HANDLERS = new Map([
+    ['text_start', textLikeStart.bind(null, 'text')],
+    ['text_delta', textLikeDelta.bind(null, 'text')],
+    ['text_end', textLikeEnd.bind(null, 'text')],
+    ['thinking_start', textLikeStart.bind(null, 'thinking')],
+    ['thinking_delta', textLikeDelta.bind(null, 'thinking')],
+    ['thinking_end', textLikeEnd.bind(null, 'thinking')],
+    ['toolcall_start', toolCallStart],
+    ['toolcall_end', toolCallEnd],
+]);
 export class PiRpcTranslator {
     content = [];
     currentContentIndex = -1;
@@ -135,8 +184,9 @@ export class PiRpcTranslator {
     }
     /** Self-produced turn_started (no wire equivalent). */
     produceTurnStarted(sessionId, turnId) {
-        this.sessionId = sessionId;
-        return makeTurnStartedEvent(sessionId, turnId, this.operationKind);
+        return produceTurnStartedEvent(sessionId, turnId, this.operationKind, (s) => {
+            this.sessionId = s;
+        });
     }
     /** Result for a completed normal turn (agent_settled). */
     produceResultFromSettled() {
@@ -236,63 +286,14 @@ export class PiRpcTranslator {
             this.lastTotalTokens = u.totalTokens;
     }
     applyUpdate(evt) {
-        switch (evt.type) {
-            case 'text_start':
-                this.content.push({ type: 'text', text: '' });
-                this.currentContentIndex++;
-                break;
-            case 'text_delta':
-                if (this.currentContentIndex >= 0 &&
-                    this.content[this.currentContentIndex]?.type === 'text') {
-                    this.content[this.currentContentIndex].text += evt.delta ?? '';
-                }
-                break;
-            case 'text_end':
-                if (this.currentContentIndex >= 0 &&
-                    this.content[this.currentContentIndex]?.type === 'text' &&
-                    evt.content) {
-                    this.content[this.currentContentIndex].text = evt.content;
-                }
-                break;
-            case 'thinking_start':
-                this.content.push({ type: 'thinking', thinking: '' });
-                this.currentContentIndex++;
-                break;
-            case 'thinking_delta':
-                if (this.currentContentIndex >= 0 &&
-                    this.content[this.currentContentIndex]?.type === 'thinking') {
-                    this.content[this.currentContentIndex].thinking +=
-                        evt.delta ?? '';
-                }
-                break;
-            case 'thinking_end':
-                if (this.currentContentIndex >= 0 &&
-                    this.content[this.currentContentIndex]?.type === 'thinking' &&
-                    evt.content) {
-                    this.content[this.currentContentIndex].thinking = evt.content;
-                }
-                break;
-            case 'toolcall_start':
-                // 信息保真 不再 push 空壳 tool_use（空 id/name 会被渲染成
-                // 无意义工具块）。只保留 bookkeeping，toolcall_end 补发完整事件。
-                this.pendingToolCall = true;
-                break;
-            case 'toolcall_end':
-                if (this.pendingToolCall && evt.toolCall) {
-                    this.content.push({
-                        type: 'tool_use',
-                        id: evt.toolCall.id,
-                        name: evt.toolCall.name,
-                        input: evt.toolCall.arguments,
-                    });
-                    this.currentContentIndex = this.content.length - 1;
-                    this.pendingToolCall = false;
-                }
-                break;
-            default:
-                // toolcall_delta: pi provides complete arguments at toolcall_end, ignore.
-                break;
-        }
+        const state = {
+            content: this.content,
+            currentContentIndex: this.currentContentIndex,
+            pendingToolCall: this.pendingToolCall,
+        };
+        PI_UPDATE_HANDLERS.get(evt.type)?.(state, evt);
+        this.currentContentIndex = state.currentContentIndex;
+        this.pendingToolCall = state.pendingToolCall;
     }
 }
 /**

package/dist/session/claude/sessions.js

@@ -7,6 +7,7 @@ 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 { logNonEnoentDebug } from '../session-store.js';
 import { UsageAccumulator, contextWindowOccupancy, cumulativeUsageFields, } from '../common/usage-accumulator.js';
 import { SessionIndex, extractText, isTaskNotificationText, CLAUDE_MAPPING, } from './session-index.js';
 /**
@@ -190,9 +191,7 @@ function hasRecentFileActivity(filePath, mtimeMs, now = Date.now()) {
  * 否则「文件不可读」会被当成「会话不活跃」。
  */
 function logStatFailure(filePath, err) {
-    if (err.code === 'ENOENT')
-        return;
-    getLogger().debug(`[claude-session-reader] stat ${filePath} failed: ${err?.message ?? String(err)}`);
+    logNonEnoentDebug(err, (m) => `[claude-session-reader] stat ${filePath} failed: ${m}`);
 }
 /**
  * Check if a Claude session (by sessionId + cwd) is still active.
@@ -353,110 +352,123 @@ export function buildClaudeUsage(records, opts) {
         ...cumulativeUsageFields(t),
     };
 }
-/**
- * first-pass scan: stream the file once via `scanJsonlLines`
- * (no `string[]` materialized), parse each line exactly once, and collect
- * all metadata needed by readSessionContent (usage, tailOffset, aiTitle,
- * recap, lastUserMessage). Does NOT retain parsed objects — the events tail
- * is re-parsed separately by `extractEventsFromTail` so memory for both raw
- * line strings and parsed objects is O(tail), not O(whole file).
- *
- * 主体是分发表：每类行只收集自己的标量（assistant → usage 并表、
- * compact_boundary → 计数 + postTokens、user → tail 定位/标题、ai-title）；
- * usage 的逐字段 max 合并（maxUsageRecord）与装配（buildClaudeUsage）已
- * 独立成纯函数。
- */
-function scalarScan(filePath) {
+function newScalarScanState() {
     // Per-message-id best usage record (per-field max). A streaming assistant
     // message spans multiple jsonl lines sharing the same message id; some
     // backends (third-party gateways, e.g. DeepSeek) write all-zero usage on
     // the early placeholder lines (empty thinking block) and the real usage
     // only on the final line carrying stop_reason. First-occurrence-wins dedup
-    // would pin the zero record and discard the real one (auto-resume
-    // card per-run stats all 0). Per-field max
-    // reconstructs the full usage regardless of line order — on the official
-    // API every line repeats identical usage, so max is a no-op there.
-    const usageByMessageId = new Map();
-    let lastPostTokens = 0;
-    let compactCount = 0;
-    let tailOffset = -1;
-    /** 真人 prompt 序号；末个 turn = 当前值。sidechain/注入/工具结果不递增。 */
-    let turnSeq = 0;
-    let lastAiTitle;
-    let lastRecap;
-    let lastUserMessage;
-    scanJsonlOnce(filePath, (obj, line, offset) => {
-        // --- usage aggregation (was aggregateSessionUsage) ---
-        if (obj.type === 'assistant') {
-            const msg = obj.message;
-            const usage = msg?.usage;
-            if (usage) {
-                const msgId = msg?.id;
-                if (msgId) {
-                    usageByMessageId.set(msgId, maxUsageRecord(usageByMessageId.get(msgId), usage, turnSeq));
-                }
-            }
-        }
-        if (obj.type === 'system' && obj.subtype === 'compact_boundary') {
-            compactCount++;
-            const cm = obj.compactMetadata;
-            if (cm?.postTokens) {
-                lastPostTokens = cm.postTokens;
-            }
-        }
-        // --- last user message offset ---
-        // Record the byte offset where the tail should start: the beginning of
-        // the NEXT line after this user message (see tailOffsetAfter).
-        if (obj.type === 'user') {
-            const msg = obj.message;
-            if (msg?.role === 'user') {
-                tailOffset = tailOffsetAfter(line, offset);
-            }
-        }
-        // --- ai-title extraction ---
-        if (obj.type === 'ai-title' && typeof obj.aiTitle === 'string') {
-            lastAiTitle = obj.aiTitle;
-        }
-        // --- recap extraction (last isCompactSummary wins) ---
-        if (obj.type === 'user' && obj.isCompactSummary === true) {
-            const msg = obj.message;
-            if (msg?.content) {
-                const recapContent = extractText(msg.content);
-                if (recapContent) {
-                    lastRecap = recapContent;
-                }
-            }
-        }
-        // --- last user message for displayTitle ---
-        // Skip: 1) tool_result content, 2) isCompactSummary (recap),
-        //       3) isMeta (skill injection / command echo / project rules)
-        if (obj.type === 'user' && !obj.isCompactSummary && !obj.isMeta) {
-            const msg = obj.message;
-            if (msg?.role === 'user' && msg.content) {
-                const content = msg.content;
-                const isToolResult = Array.isArray(content) &&
-                    content.length > 0 &&
-                    content[0]?.type === 'tool_result';
-                if (!isToolResult) {
-                    const userContent = extractText(content);
-                    if (userContent && !isTaskNotificationText(userContent)) {
-                        lastUserMessage = userContent;
-                    }
-                }
-            }
-        }
-        // --- turn boundary for per-run usage ---
-        // 真人 prompt 开启新 turn；注入/工具结果/sidechain 不递增。usage 记录在
-        // 解析到 assistant 行时已经带上当前 turnSeq，末尾只汇总末个 turn。
-        if (isRealUserPrompt(obj))
-            turnSeq++;
-    });
+    // would pin the zero record and discard the real one (auto-resume card
+    // per-run stats all 0). Per-field max reconstructs the full usage
+    // regardless of line order — on the official API every line repeats
+    // identical usage, so max is a no-op there.
+    return {
+        usageByMessageId: new Map(),
+        lastPostTokens: 0,
+        compactCount: 0,
+        tailOffset: -1,
+        turnSeq: 0,
+    };
+}
+/** assistant 行 → 按 message id 逐字段 max 合并 usage（was aggregateSessionUsage）。 */
+function collectAssistantUsage(state, obj) {
+    if (obj.type !== 'assistant')
+        return;
+    const msg = obj.message;
+    const usage = msg?.usage;
+    if (!usage)
+        return;
+    const msgId = msg?.id;
+    if (!msgId)
+        return;
+    state.usageByMessageId.set(msgId, maxUsageRecord(state.usageByMessageId.get(msgId), usage, state.turnSeq));
+}
+/** compact_boundary → 计数 + 压缩后 token 水位。 */
+function collectCompactBoundary(state, obj) {
+    if (obj.type !== 'system' || obj.subtype !== 'compact_boundary')
+        return;
+    state.compactCount++;
+    const cm = obj.compactMetadata;
+    if (cm?.postTokens) {
+        state.lastPostTokens = cm.postTokens;
+    }
+}
+/** 记录 tail 起点：本 user 行之后的下一行字节偏移（见 tailOffsetAfter）。 */
+function collectTailOffset(state, obj, line, offset) {
+    if (obj.type !== 'user')
+        return;
+    const msg = obj.message;
+    if (msg?.role === 'user') {
+        state.tailOffset = tailOffsetAfter(line, offset);
+    }
+}
+/** ai-title：最后一条生效。 */
+function collectAiTitle(state, obj) {
+    if (obj.type === 'ai-title' && typeof obj.aiTitle === 'string') {
+        state.lastAiTitle = obj.aiTitle;
+    }
+}
+/** recap：最后一条 isCompactSummary 生效。 */
+function collectRecap(state, obj) {
+    if (obj.type !== 'user' || obj.isCompactSummary !== true)
+        return;
+    const msg = obj.message;
+    if (!msg?.content)
+        return;
+    const recapContent = extractText(msg.content);
+    if (recapContent) {
+        state.lastRecap = recapContent;
+    }
+}
+/** displayTitle 用的最近真人输入：跳过 tool_result / recap / isMeta / 任务通知。 */
+function collectLastUserMessage(state, obj) {
+    if (obj.type !== 'user' || obj.isCompactSummary || obj.isMeta)
+        return;
+    const msg = obj.message;
+    if (msg?.role !== 'user' || !msg.content)
+        return;
+    const content = msg.content;
+    const isToolResult = Array.isArray(content) &&
+        content.length > 0 &&
+        content[0]?.type === 'tool_result';
+    if (isToolResult)
+        return;
+    const userContent = extractText(content);
+    if (userContent && !isTaskNotificationText(userContent)) {
+        state.lastUserMessage = userContent;
+    }
+}
+/** 真人 prompt 开启新 turn；注入/工具结果/sidechain 不递增。 */
+function countRealUserPrompt(state, obj) {
+    if (isRealUserPrompt(obj))
+        state.turnSeq++;
+}
+/**
+ * 单行分派：收集器调用顺序与原回调逐字一致（尤其 turnSeq 在最后递增，
+ * 保证 assistant usage 记录归属的是「本行之前」的 turn）。
+ */
+function scanScalarLine(state, obj, line, offset) {
+    collectAssistantUsage(state, obj);
+    collectCompactBoundary(state, obj);
+    collectTailOffset(state, obj, line, offset);
+    collectAiTitle(state, obj);
+    collectRecap(state, obj);
+    collectLastUserMessage(state, obj);
+    countRealUserPrompt(state, obj);
+}
+function scalarScan(filePath) {
+    const state = newScalarScanState();
+    scanJsonlOnce(filePath, scanScalarLine.bind(null, state));
     return {
-        tailOffset,
-        usage: buildClaudeUsage(usageByMessageId.values(), { turnSeq, lastPostTokens, compactCount }),
-        aiTitle: lastAiTitle,
-        recap: lastRecap,
-        lastUserMessage,
+        tailOffset: state.tailOffset,
+        usage: buildClaudeUsage(state.usageByMessageId.values(), {
+            turnSeq: state.turnSeq,
+            lastPostTokens: state.lastPostTokens,
+            compactCount: state.compactCount,
+        }),
+        aiTitle: state.lastAiTitle,
+        recap: state.lastRecap,
+        lastUserMessage: state.lastUserMessage,
     };
 }
 /**