@yefengr/remote-pi 0.7.12 → 0.7.14

package/dist/runtime/pairing_coordinator.d.ts

@@ -0,0 +1,42 @@
+import type { PeerRecord, PeerWriteReceipt } from "../pairing/storage.js";
+import type { QRSession } from "../pairing/qr.js";
+import type { ClientFrame, ServerFrame } from "../protocol/v2/index.js";
+import type { RelayClient } from "../transport/relay_client.js";
+import { V2PeerChannel, type HostRouteIdentity } from "../transport/peer_channel.js";
+type PairRequest = Extract<ClientFrame, {
+    type: "pair_request";
+}>;
+type PairOk = Extract<ServerFrame, {
+    type: "pair_ok";
+}>;
+export interface PairingBinding {
+    readonly channel: V2PeerChannel;
+}
+export interface PairingCoordinatorDependencies {
+    readonly qrSession: QRSession;
+    readonly routeIdentity: () => HostRouteIdentity;
+    readonly isRelayCurrent: (relay: RelayClient) => boolean;
+    readonly attachOwner: (relay: RelayClient, ownerId: string) => PairingBinding | null;
+    readonly activeBinding: (ownerId: string) => PairingBinding | undefined;
+    readonly addPeer: (record: PeerRecord) => Promise<PeerWriteReceipt>;
+    readonly rollbackPeer: (receipt: PeerWriteReceipt) => Promise<unknown>;
+    readonly updateEndpoint: (relay: RelayClient) => Promise<boolean>;
+    readonly refreshCurrentEndpoint: () => Promise<boolean>;
+    readonly buildPairOk: (frame: PairRequest) => PairOk;
+}
+/** Coordinates one-process pairing retries across storage and Relay lifecycles. */
+export declare class PairingCoordinator {
+    private readonly deps;
+    private readonly attempts;
+    constructor(deps: PairingCoordinatorDependencies);
+    handle(relay: RelayClient, ownerId: string, frame: PairRequest): Promise<void>;
+    abandonInactive(): void;
+    private run;
+    private rollback;
+    private lifecycleIsCurrent;
+    private canCommit;
+    private reject;
+    private sendError;
+    private attemptKey;
+}
+export {};

package/dist/runtime/pairing_coordinator.js

@@ -0,0 +1,136 @@
+import { V2PeerChannel } from "../transport/peer_channel.js";
+/** Coordinates one-process pairing retries across storage and Relay lifecycles. */
+export class PairingCoordinator {
+    deps;
+    attempts = new Map();
+    constructor(deps) {
+        this.deps = deps;
+    }
+    async handle(relay, ownerId, frame) {
+        if (!this.deps.isRelayCurrent(relay))
+            return;
+        const key = this.attemptKey(ownerId, frame.id);
+        const pending = this.attempts.get(key);
+        if (pending) {
+            await pending.completion;
+            return this.handle(relay, ownerId, frame);
+        }
+        const reservation = this.deps.qrSession.reserveToken(frame.token, ownerId, frame.id);
+        if (reservation.status === "expired" || reservation.status === "consumed" || reservation.status === "unknown") {
+            const code = reservation.status === "expired" ? "token_expired" : reservation.status === "consumed" ? "token_consumed" : "token_unknown";
+            this.reject(relay, ownerId, frame, code, reservation.status === "consumed" ? "Pairing token is already in use" : "Pairing token is invalid or expired");
+            return;
+        }
+        if (reservation.status === "committed") {
+            const activeBinding = this.deps.activeBinding(ownerId);
+            if (activeBinding) {
+                activeBinding.channel.sendV2(reservation.completion);
+                return;
+            }
+            const replayBinding = this.deps.attachOwner(relay, ownerId);
+            replayBinding?.channel.sendV2(reservation.completion);
+            return;
+        }
+        if (reservation.status !== "reserved")
+            return;
+        const binding = this.deps.attachOwner(relay, ownerId);
+        if (!binding) {
+            this.deps.qrSession.releaseToken(reservation.reservation);
+            return;
+        }
+        let resolveCompletion;
+        const completion = new Promise((resolve) => { resolveCompletion = resolve; });
+        const attempt = {
+            key,
+            ownerId,
+            relay,
+            binding,
+            reservation: reservation.reservation,
+            completion,
+            resolveCompletion,
+        };
+        this.attempts.set(key, attempt);
+        void this.run(attempt, frame);
+    }
+    abandonInactive() {
+        for (const attempt of [...this.attempts.values()]) {
+            if (this.lifecycleIsCurrent(attempt))
+                continue;
+            this.attempts.delete(attempt.key);
+            this.deps.qrSession.releaseToken(attempt.reservation);
+            attempt.resolveCompletion(null);
+        }
+    }
+    async run(attempt, frame) {
+        let completion = null;
+        let receipt;
+        try {
+            receipt = await this.deps.addPeer({ name: frame.device_name, remote_epk: attempt.ownerId, paired_at: new Date().toISOString() });
+            if (!this.canCommit(attempt)) {
+                await this.rollback(receipt);
+                return;
+            }
+            // peers.json is durable authority, but do not confirm pairing while the
+            // current Relay has explicitly rejected the ACL frame. A later retry of
+            // the same request can safely repeat the idempotent write.
+            const aclSent = await this.deps.updateEndpoint(attempt.relay);
+            if (!aclSent || !this.canCommit(attempt)) {
+                await this.rollback(receipt);
+                return;
+            }
+            const pairOk = this.deps.buildPairOk(frame);
+            if (!this.deps.qrSession.commitToken(attempt.reservation, pairOk)) {
+                await this.rollback(receipt);
+                return;
+            }
+            completion = pairOk;
+            attempt.binding.channel.sendV2(pairOk);
+        }
+        catch {
+            if (receipt)
+                await this.rollback(receipt);
+            if (this.lifecycleIsCurrent(attempt)) {
+                this.sendError(attempt.binding.channel, frame, "internal_error", "Failed to persist pairing");
+            }
+        }
+        finally {
+            if (!completion)
+                this.deps.qrSession.releaseToken(attempt.reservation);
+            if (this.attempts.get(attempt.key) === attempt)
+                this.attempts.delete(attempt.key);
+            attempt.resolveCompletion(completion);
+        }
+    }
+    async rollback(receipt) {
+        try {
+            await this.deps.rollbackPeer(receipt);
+        }
+        catch {
+            // A failed compensation leaves peers.json authoritative.
+        }
+        // A new Relay may have announced the transient write while this old
+        // attempt was pending. Always refresh whichever Relay is current now.
+        try {
+            await this.deps.refreshCurrentEndpoint();
+        }
+        catch { /* reconnect owns recovery */ }
+    }
+    lifecycleIsCurrent(attempt) {
+        return this.deps.isRelayCurrent(attempt.relay) && this.deps.activeBinding(attempt.ownerId) === attempt.binding;
+    }
+    canCommit(attempt) {
+        return this.lifecycleIsCurrent(attempt) && this.deps.qrSession.isReservationCurrent(attempt.reservation);
+    }
+    reject(relay, ownerId, frame, code, message) {
+        const channel = new V2PeerChannel(relay, ownerId, this.deps.routeIdentity(), () => undefined);
+        this.sendError(channel, frame, code, message);
+        channel.detach();
+    }
+    sendError(channel, frame, code, message) {
+        channel.sendV2({ protocol_version: 2, type: "pair_error", in_reply_to: frame.id, code, message });
+    }
+    attemptKey(ownerId, requestId) {
+        return `${ownerId}\u0000${requestId}`;
+    }
+}
+//# sourceMappingURL=pairing_coordinator.js.map

package/dist/runtime/pairing_coordinator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pairing_coordinator.js","sourceRoot":"","sources":["../../src/runtime/pairing_coordinator.ts"],"names":[],"mappings":"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"}

package/dist/timeline/runtime.d.ts

@@ -1,5 +1,5 @@
-import type { SessionManager } from "@earendil-works/pi-coding-agent";
-import { type JsonValue, type TimelineEvent } from "../protocol/v2/index.js";
+import type { MessageUpdateEvent, SessionManager, ToolExecutionEndEvent, ToolExecutionStartEvent, ToolExecutionUpdateEvent } from "@earendil-works/pi-coding-agent";
+import { type JsonValue, type TimelineEvent, type TimelinePartial } from "../protocol/v2/index.js";
 export declare const TIMELINE_MARKER: "remote-pi:timeline-v2";
 type MessageRole = "user" | "assistant" | "toolResult";
 export type Correlation = {
@@ -22,6 +22,7 @@ export type TimelineRuntimeOptions = {
     getHistoryGeneration?: () => string;
     onStarted?: (started: TimelineStarted) => void;
     onPublished?: (event: TimelineEvent, correlation: Correlation) => void;
+    onPartial?: (partial: TimelinePartial, correlation: Correlation) => void;
 };
 export declare class TimelineRuntime {
     private readonly correlations;
@@ -29,13 +30,16 @@ export declare class TimelineRuntime {
     private readonly pending;
     private readonly pendingByRole;
     private readonly published;
+    private readonly toolAssociations;
     private sessionManager;
     private epoch;
+    private stateRevision;
     private activeGroupId;
     private active;
     private readonly getHistoryGenerationValue?;
     private readonly onStarted?;
     private readonly onPublished?;
+    private readonly onPartial?;
     constructor(options?: TimelineRuntimeOptions);
     attach(sessionManager: SessionManager): void;
     resetSession(sessionManager: SessionManager): void;
@@ -52,9 +56,18 @@ export declare class TimelineRuntime {
     onAgentStart(): void;
     onAgentEnd(): void;
     onMessageStart(message: unknown, sessionManager: SessionManager): TimelineStarted | null;
+    onMessageUpdate(event: MessageUpdateEvent, sessionManager: SessionManager): void;
     onMessageEnd(message: unknown, sessionManager: SessionManager): void;
+    onToolExecutionStart(event: ToolExecutionStartEvent, sessionManager: SessionManager): void;
+    onToolExecutionUpdate(event: ToolExecutionUpdateEvent, sessionManager: SessionManager): void;
+    onToolExecutionEnd(event: ToolExecutionEndEvent, sessionManager: SessionManager): void;
+    private publishToolPartial;
     recover(sessionManager: SessionManager): TimelineEvent[];
+    private findPending;
+    private messageIdentity;
     private publish;
+    private publishPartial;
+    private partialDeltaChunks;
     private correlationFor;
     private buildMarker;
     private parseMarker;
@@ -71,6 +84,5 @@ export declare class TimelineRuntime {
     private textFromContent;
     private nonEmpty;
     private base64Length;
-    private jsonValue;
 }
 export {};

package/dist/timeline/runtime.js

@@ -1,7 +1,9 @@
 import { AsyncLocalStorage } from "node:async_hooks";
 import { randomUUID } from "node:crypto";
-import { MarkerSchemaV2, TimelineEventSchema, } from "../protocol/v2/index.js";
+import { MarkerSchemaV2, TimelineEventSchema } from "../protocol/v2/index.js";
+import { jsonValue, recoverToolCalls, ToolLifecycleTracker, toolPartial, toolTimelineEvent } from "./tool_lifecycle.js";
 export const TIMELINE_MARKER = "remote-pi:timeline-v2";
+const MAX_PARTIAL_DELTA_CHARS = 64 * 1024;
 export class TimelineRuntime {
     correlations = new AsyncLocalStorage();
     messageCorrelations = new WeakMap();
@@ -12,17 +14,21 @@ export class TimelineRuntime {
         toolResult: [],
     };
     published = [];
+    toolAssociations = new ToolLifecycleTracker();
     sessionManager = null;
     epoch = 0;
+    stateRevision = 0;
     activeGroupId = null;
     active = false;
     getHistoryGenerationValue;
     onStarted;
     onPublished;
+    onPartial;
     constructor(options = {}) {
         this.getHistoryGenerationValue = options.getHistoryGeneration;
         this.onStarted = options.onStarted;
         this.onPublished = options.onPublished;
+        this.onPartial = options.onPartial;
     }
     attach(sessionManager) {
         if (this.sessionManager === sessionManager)
@@ -35,6 +41,7 @@ export class TimelineRuntime {
         this.resetState();
     }
     resetState() {
+        this.stateRevision += 1;
         this.epoch = 0;
         this.activeGroupId = null;
         this.active = false;
@@ -42,6 +49,7 @@ export class TimelineRuntime {
         this.pendingByRole.user = [];
         this.pendingByRole.assistant = [];
         this.pendingByRole.toolResult = [];
+        this.toolAssociations.clear();
     }
     get sessionId() {
         return this.sessionManager?.getSessionId() ?? null;
@@ -85,6 +93,10 @@ export class TimelineRuntime {
     onAgentEnd() {
         this.active = false;
         this.activeGroupId = null;
+        this.pendingByRole.user = [];
+        this.pendingByRole.assistant = [];
+        this.pendingByRole.toolResult = [];
+        this.toolAssociations.clear();
     }
     onMessageStart(message, sessionManager) {
         this.attach(sessionManager);
@@ -102,7 +114,7 @@ export class TimelineRuntime {
         sessionManager.appendCustomEntry(TIMELINE_MARKER, marker);
         const objectMessage = message;
         this.messageCorrelations.set(objectMessage, correlation);
-        const pending = { message: objectMessage, role: record.role, marker, correlation };
+        const pending = { message: objectMessage, role: record.role, marker, correlation, identity: this.messageIdentity(record) };
         this.pending.set(objectMessage, pending);
         this.pendingByRole[record.role].push(pending);
         const started = {
@@ -115,18 +127,55 @@ export class TimelineRuntime {
         this.onStarted?.(started);
         return started;
     }
+    onMessageUpdate(event, sessionManager) {
+        if (this.sessionManager !== sessionManager || this.messageRole(event.message) !== "assistant")
+            return;
+        const pending = this.findPending(event.message, "assistant");
+        if (!pending)
+            return;
+        const update = event.assistantMessageEvent;
+        if (update.type === "text_start") {
+            this.publishPartial(pending, "assistant", update.contentIndex, "running");
+        }
+        else if (update.type === "thinking_start") {
+            this.publishPartial(pending, "thinking", update.contentIndex, "running");
+        }
+        else if (update.type === "text_delta" && update.delta) {
+            this.publishPartial(pending, "assistant", update.contentIndex, "delta", update.delta);
+        }
+        else if (update.type === "thinking_delta" && update.delta) {
+            this.publishPartial(pending, "thinking", update.contentIndex, "delta", update.delta);
+        }
+        else if (update.type === "toolcall_end") {
+            this.toolAssociations.indexAssistantContent([update.toolCall], {
+                groupId: pending.marker.group_id,
+                correlation: { ...pending.correlation },
+            });
+        }
+    }
     onMessageEnd(message, sessionManager) {
         this.attach(sessionManager);
         if (typeof message !== "object" || message === null)
             return;
         const objectMessage = message;
-        const direct = this.pending.get(objectMessage);
         const role = this.messageRole(message);
-        const pending = direct ?? (role && role !== "user" ? this.pendingByRole[role][0] : undefined);
+        const pending = role ? this.findPending(message, role) : undefined;
         if (!pending)
             return;
+        if (pending.role === "assistant") {
+            this.toolAssociations.indexAssistantContent(this.asMessageRecord(message)?.content, {
+                groupId: pending.marker.group_id,
+                correlation: { ...pending.correlation },
+            });
+        }
+        this.pending.delete(pending.message);
+        this.pending.delete(objectMessage);
         this.pendingByRole[pending.role] = this.pendingByRole[pending.role].filter((candidate) => candidate !== pending);
+        const revision = this.stateRevision;
+        const generation = this.historyGeneration;
         setImmediate(() => {
+            if (this.stateRevision !== revision || this.sessionManager !== sessionManager || this.historyGeneration !== generation)
+                return;
             const branch = sessionManager.getBranch();
             const markerIndex = branch.findIndex((entry) => entry.id === pending.marker.event_id || (entry.type === "custom" && entry.customType === TIMELINE_MARKER && entry.data &&
                 typeof entry.data === "object" && entry.data.event_id === pending.marker.event_id));
@@ -135,15 +184,50 @@ export class TimelineRuntime {
             const target = this.scanTargetAfterMarker(branch, markerIndex, pending.role);
             if (!target)
                 return;
-            const event = this.toTimelineEvent(target, pending.marker, pending.correlation, sessionManager);
+            const call = pending.role === "toolResult" ? recoverToolCalls(branch).get(target.id) : undefined;
+            const event = this.toTimelineEvent(target, pending.marker, pending.correlation, sessionManager, call);
             if (!event)
                 return;
             this.publish(event, pending.correlation);
+            if (event.kind === "tool")
+                this.toolAssociations.complete(event.tool_call_id);
         });
     }
+    onToolExecutionStart(event, sessionManager) {
+        if (this.sessionManager !== sessionManager || !this.active)
+            return;
+        const fallback = this.activeGroupId ? {
+            groupId: this.activeGroupId,
+            correlation: this.currentCorrelation() ?? { origin: "unknown", delivery: "unknown" },
+        } : undefined;
+        this.toolAssociations.start(event.toolCallId, event.toolName, event.args, fallback);
+        this.publishToolPartial(event.toolCallId);
+    }
+    onToolExecutionUpdate(event, sessionManager) {
+        if (this.sessionManager !== sessionManager || !this.active)
+            return;
+        this.publishToolPartial(event.toolCallId, event.partialResult);
+    }
+    onToolExecutionEnd(event, sessionManager) {
+        if (this.sessionManager !== sessionManager || !this.active)
+            return;
+        this.publishToolPartial(event.toolCallId, event.result);
+    }
+    publishToolPartial(toolCallId, result) {
+        const association = this.toolAssociations.get(toolCallId);
+        const sessionId = this.sessionId;
+        const historyGeneration = this.historyGeneration;
+        if (!association || !sessionId || !historyGeneration)
+            return;
+        const partial = toolPartial(toolCallId, association, { sessionId, historyGeneration }, result);
+        if (partial)
+            this.onPartial?.(partial, { ...association.correlation });
+    }
     recover(sessionManager) {
         this.attach(sessionManager);
         const branch = sessionManager.getBranch();
+        const legacyGroup = `legacy:${sessionManager.getSessionId()}`;
+        const recoveryTools = recoverToolCalls(branch);
         const matched = new Set();
         const recovered = [];
         for (let index = 0; index < branch.length; index += 1) {
@@ -156,12 +240,11 @@ export class TimelineRuntime {
                 if (!target || target.type !== "message")
                     continue;
                 matched.add(target.id);
-                const event = this.toTimelineEvent(target, marker, this.correlationFromMarker(marker), sessionManager);
+                const event = this.toTimelineEvent(target, marker, this.correlationFromMarker(marker), sessionManager, recoveryTools.get(target.id));
                 if (event)
                     recovered.push(event);
             }
         }
-        const legacyGroup = `legacy:${sessionManager.getSessionId()}`;
         for (const entry of branch) {
             if (entry.type !== "message" || matched.has(entry.id))
                 continue;
@@ -171,7 +254,7 @@ export class TimelineRuntime {
             const marker = role === "user"
                 ? { version: 2, event_id: `legacy:${entry.id}`, group_id: legacyGroup, kind: "user", origin: "unknown", delivery: "unknown" }
                 : { version: 2, event_id: `legacy:${entry.id}`, group_id: legacyGroup, kind: role === "assistant" ? "assistant" : "tool" };
-            const event = this.toTimelineEvent(entry, marker, this.correlationFromMarker(marker), sessionManager);
+            const event = this.toTimelineEvent(entry, marker, this.correlationFromMarker(marker), sessionManager, recoveryTools.get(entry.id));
             if (event)
                 recovered.push(event);
         }
@@ -182,12 +265,69 @@ export class TimelineRuntime {
         }
         return recovered;
     }
+    findPending(message, role) {
+        if (typeof message !== "object" || message === null)
+            return undefined;
+        const direct = this.pending.get(message);
+        if (direct?.role === role && this.pendingByRole[role].includes(direct))
+            return direct;
+        const record = this.asMessageRecord(message);
+        const identity = record ? this.messageIdentity(record) : null;
+        if (!identity)
+            return undefined;
+        return this.pendingByRole[role].find((candidate) => candidate.identity === identity);
+    }
+    messageIdentity(message) {
+        if (typeof message.timestamp !== "number" || !Number.isFinite(message.timestamp))
+            return null;
+        return [message.role, message.timestamp, message.api ?? "", message.provider ?? "", message.model ?? ""].join(":");
+    }
     publish(event, correlation) {
         if (this.published.some((existing) => existing.event_id === event.event_id))
             return;
         this.published.push(event);
         this.onPublished?.(event, { ...correlation });
     }
+    publishPartial(pending, kind, contentIndex, status, delta) {
+        const sessionId = this.sessionId;
+        const historyGeneration = this.historyGeneration;
+        const groupId = pending.marker.group_id;
+        if (!sessionId || !historyGeneration || !groupId)
+            return;
+        const publish = (chunk) => {
+            const partial = {
+                protocol_version: 2,
+                type: "timeline_partial",
+                session_id: sessionId,
+                history_generation: historyGeneration,
+                group_id: groupId,
+                partial_id: `${pending.marker.event_id}:${kind}:${contentIndex}`,
+                kind,
+                status,
+                ...(chunk === undefined ? {} : { delta: chunk }),
+            };
+            this.onPartial?.(partial, { ...pending.correlation });
+        };
+        if (delta === undefined) {
+            publish();
+            return;
+        }
+        for (const chunk of this.partialDeltaChunks(delta))
+            publish(chunk);
+    }
+    partialDeltaChunks(delta) {
+        const chunks = [];
+        for (let offset = 0; offset < delta.length;) {
+            let end = Math.min(delta.length, offset + MAX_PARTIAL_DELTA_CHARS);
+            const finalCodeUnit = delta.charCodeAt(end - 1);
+            const nextCodeUnit = delta.charCodeAt(end);
+            if (end < delta.length && finalCodeUnit >= 0xD800 && finalCodeUnit <= 0xDBFF && nextCodeUnit >= 0xDC00 && nextCodeUnit <= 0xDFFF)
+                end -= 1;
+            chunks.push(delta.slice(offset, end));
+            offset = end;
+        }
+        return chunks;
+    }
     correlationFor(message) {
         const existing = this.currentCorrelation();
         if (existing)
@@ -239,7 +379,7 @@ export class TimelineRuntime {
         }
         return undefined;
     }
-    toTimelineEvent(entry, marker, correlation, sessionManager) {
+    toTimelineEvent(entry, marker, correlation, sessionManager, association) {
         const message = this.asMessageRecord(entry.message);
         if (!message)
             return null;
@@ -248,6 +388,8 @@ export class TimelineRuntime {
         const historyGeneration = this.getHistoryGenerationValue?.() ?? sessionId;
         const base = { event_id: marker.event_id, session_id: sessionId, history_generation: historyGeneration, timestamp };
         const groupId = marker.group_id;
+        if (!groupId)
+            return null;
         if (message.role === "user") {
             const senderRef = marker.kind === "user" && marker.sender_ref ? { sender_ref: marker.sender_ref } : {};
             return TimelineEventSchema.parse({
@@ -270,19 +412,7 @@ export class TimelineRuntime {
                 status: message.stopReason === "aborted" ? "interrupted" : "complete",
             });
         }
-        const result = this.jsonValue(message.content);
-        if (message.isError) {
-            return TimelineEventSchema.parse({
-                ...base, group_id: groupId, kind: "tool", tool_call_id: message.toolCallId ?? marker.event_id,
-                tool: message.toolName ?? "unknown", args: this.jsonValue(message.args ?? {}), truncated: false,
-                status: "error", error: this.nonEmpty(message.errorMessage ?? this.textFromContent(message.content) ?? "tool failed"),
-            });
-        }
-        return TimelineEventSchema.parse({
-            ...base, group_id: groupId, kind: "tool", tool_call_id: message.toolCallId ?? marker.event_id,
-            tool: message.toolName ?? "unknown", args: this.jsonValue(message.args ?? {}), truncated: false,
-            status: "complete", result,
-        });
+        return toolTimelineEvent(base, groupId, message, association);
     }
     toSystemEvent(entry, sessionManager) {
         const base = {
@@ -302,7 +432,7 @@ export class TimelineRuntime {
                     first_kept_entry_id: entry.firstKeptEntryId,
                     tokens_before: entry.tokensBefore,
                     from_hook: entry.fromHook ?? false,
-                    ...(entry.details === undefined ? {} : { details: this.jsonValue(entry.details) }),
+                    ...(entry.details === undefined ? {} : { details: jsonValue(entry.details) }),
                 },
             };
         }
@@ -314,7 +444,7 @@ export class TimelineRuntime {
                     summary: entry.summary,
                     from_id: entry.fromId,
                     from_hook: entry.fromHook ?? false,
-                    ...(entry.details === undefined ? {} : { details: this.jsonValue(entry.details) }),
+                    ...(entry.details === undefined ? {} : { details: jsonValue(entry.details) }),
                 },
             };
         }
@@ -324,7 +454,7 @@ export class TimelineRuntime {
                 kind: "custom",
                 payload: {
                     custom_type: entry.customType,
-                    ...(entry.data === undefined ? {} : { data: this.jsonValue(entry.data) }),
+                    ...(entry.data === undefined ? {} : { data: jsonValue(entry.data) }),
                 },
             };
         }
@@ -380,9 +510,10 @@ export class TimelineRuntime {
             if (!part || typeof part !== "object")
                 return [];
             const item = part;
-            if ((item.type === "text" || item.type === "thinking") && typeof item.text === "string") {
-                return [{ type: item.type, text: item.text }];
-            }
+            if (item.type === "text" && typeof item.text === "string")
+                return [{ type: "text", text: item.text }];
+            if (item.type === "thinking" && typeof item.thinking === "string")
+                return [{ type: "thinking", text: item.thinking }];
             return [];
         });
     }
@@ -409,20 +540,5 @@ export class TimelineRuntime {
             return 0;
         }
     }
-    jsonValue(value) {
-        if (value === null || typeof value === "boolean" || typeof value === "string")
-            return value;
-        if (typeof value === "number")
-            return Number.isFinite(value) ? value : null;
-        if (Array.isArray(value))
-            return value.map((item) => this.jsonValue(item));
-        if (typeof value === "object") {
-            const result = {};
-            for (const [key, item] of Object.entries(value))
-                result[key] = this.jsonValue(item);
-            return result;
-        }
-        return null;
-    }
 }
 //# sourceMappingURL=runtime.js.map