@xopcai/xopc 0.0.158 → 0.0.159

package/dist/src/gateway/chat-stream/thinking-delta-coalescer.js

@@ -0,0 +1,103 @@
+//#region src/gateway/chat-stream/thinking-delta-coalescer.ts
+const DEFAULT_WINDOW_MS = 24;
+const DEFAULT_MAX_CHARS = 256;
+function isThinkingDelta(event) {
+	return event.type === "thinking_delta";
+}
+function belongsToSameThinkingStream(left, right) {
+	return left.runId === right.runId && left.sessionKey === right.sessionKey && left.payload.messageId === right.payload.messageId;
+}
+function mergeThinkingDelta(left, right) {
+	return {
+		...left,
+		payload: {
+			...left.payload,
+			delta: left.payload.delta + right.payload.delta
+		}
+	};
+}
+async function nextBeforeDeadline(next, deadlineAt) {
+	let timer;
+	try {
+		return await Promise.race([next.then((result) => ({
+			kind: "next",
+			result
+		})), new Promise((resolve) => {
+			timer = setTimeout(() => resolve({ kind: "timeout" }), Math.max(0, deadlineAt - Date.now()));
+		})]);
+	} finally {
+		if (timer !== void 0) clearTimeout(timer);
+	}
+}
+async function* coalesceThinkingDeltas(source, options = {}) {
+	const windowMs = options.windowMs ?? DEFAULT_WINDOW_MS;
+	const maxChars = options.maxChars ?? DEFAULT_MAX_CHARS;
+	if (!Number.isFinite(windowMs) || windowMs <= 0) throw new Error("thinking delta coalescer windowMs must be greater than zero");
+	if (!Number.isInteger(maxChars) || maxChars <= 0) throw new Error("thinking delta coalescer maxChars must be a positive integer");
+	const iterator = source[Symbol.asyncIterator]();
+	let next = iterator.next();
+	let pending;
+	let deadlineAt = 0;
+	try {
+		while (true) {
+			if (!pending) {
+				const result = await next;
+				if (result.done) break;
+				next = iterator.next();
+				if (!isThinkingDelta(result.value)) {
+					yield result.value;
+					continue;
+				}
+				pending = result.value;
+				deadlineAt = Date.now() + windowMs;
+				if (pending.payload.delta.length >= maxChars) {
+					yield pending;
+					pending = void 0;
+				}
+				continue;
+			}
+			const outcome = await nextBeforeDeadline(next, deadlineAt);
+			if (outcome.kind === "timeout") {
+				yield pending;
+				pending = void 0;
+				continue;
+			}
+			const result = outcome.result;
+			if (result.done) {
+				yield pending;
+				pending = void 0;
+				break;
+			}
+			next = iterator.next();
+			const event = result.value;
+			if (!isThinkingDelta(event) || !belongsToSameThinkingStream(pending, event)) {
+				yield pending;
+				pending = void 0;
+				if (isThinkingDelta(event)) {
+					pending = event;
+					deadlineAt = Date.now() + windowMs;
+					if (pending.payload.delta.length >= maxChars) {
+						yield pending;
+						pending = void 0;
+					}
+				} else yield event;
+				continue;
+			}
+			pending = mergeThinkingDelta(pending, event);
+			if (pending.payload.delta.length >= maxChars) {
+				yield pending;
+				pending = void 0;
+			}
+		}
+	} catch (error) {
+		if (pending) {
+			yield pending;
+			pending = void 0;
+		}
+		throw error;
+	} finally {
+		await iterator.return?.();
+	}
+}
+//#endregion
+export { coalesceThinkingDeltas };

package/dist/src/gateway/hono/sse.d.ts

@@ -23,7 +23,7 @@ export declare function createAgentSSEHandler(config: SSEHandlerConfig): (c: Con
  * POST /api/agent/resume — Re-attach to an in-progress agent run via SSE.
  *
  * Request body: { runId, sessionKey }
- * The relay replays all buffered events from the beginning and then live-tails
+ * The relay replays retained buffered events from the beginning and then live-tails
  * until the run completes.
  *
  * SSE events are identical to those from POST /api/agent.

package/dist/src/gateway/hono/sse.js

@@ -168,7 +168,7 @@ function createAgentSSEHandler(config) {
 * POST /api/agent/resume — Re-attach to an in-progress agent run via SSE.
 *
 * Request body: { runId, sessionKey }
-* The relay replays all buffered events from the beginning and then live-tails
+* The relay replays retained buffered events from the beginning and then live-tails
 * until the run completes.
 *
 * SSE events are identical to those from POST /api/agent.

package/dist/src/gateway/service/run-gateway-agent.js

@@ -7,6 +7,7 @@ import { shouldSkipWebchatInboundByAbortCutoff } from "../../session/abort-cutof
 import "../chat-limits.js";
 import { resolveWebchatSessionKey } from "../resolve-webchat-session-key.js";
 import { ChatStreamMapper } from "../chat-stream/mapper.js";
+import { coalesceThinkingDeltas } from "../chat-stream/thinking-delta-coalescer.js";
 import crypto from "crypto";
 //#region src/gateway/service/run-gateway-agent.ts
 init_logger();
@@ -90,7 +91,10 @@ async function* runGatewayAgent(deps, message, channel, chatId, attachments, thi
 					signal: mergedSignal,
 					runId
 				});
-				for await (const event of eventStream) yield* emitAndYield(mapper.map(event));
+				const mappedEvents = (async function* () {
+					for await (const event of eventStream) yield* mapper.map(event);
+				})();
+				for await (const event of coalesceThinkingDeltas(mappedEvents)) yield* emitAndYield([event]);
 				const endStatus = mergedSignal.aborted ? "cancelled" : "success";
 				const endSummary = mergedSignal.aborted ? "Interrupted" : "Message processed successfully";
 				yield* emitAndYield(mapper.end(endStatus, endSummary));

package/dist/src/media/session-references.js

@@ -1,25 +1,28 @@
 import { tryParseMediaUri } from "./uri.js";
 import { deleteMediaBuffer } from "./store.js";
 //#region src/media/session-references.ts
-function collectFromValue(value, out) {
+function collectFromValue(value, out, seen) {
 	if (!value) return;
 	if (typeof value === "string") {
 		if (value.startsWith("media://")) out.add(value.trim());
 		return;
 	}
 	if (Array.isArray(value)) {
-		for (const item of value) collectFromValue(item, out);
+		if (seen.has(value)) return;
+		seen.add(value);
+		for (const item of value) collectFromValue(item, out, seen);
 		return;
 	}
 	if (typeof value !== "object") return;
+	if (seen.has(value)) return;
+	seen.add(value);
 	const record = value;
-	if (typeof record.uri === "string" && record.uri.startsWith("media://")) out.add(record.uri.trim());
-	if (Array.isArray(record.media)) collectFromValue(record.media, out);
-	if (Array.isArray(record.attachments)) collectFromValue(record.attachments, out);
+	for (const nested of Object.values(record)) collectFromValue(nested, out, seen);
 }
 function collectMediaUrisFromMessages(messages) {
 	const out = /* @__PURE__ */ new Set();
-	for (const message of messages) collectFromValue(message, out);
+	const seen = /* @__PURE__ */ new WeakSet();
+	for (const message of messages) collectFromValue(message, out, seen);
 	return out;
 }
 function messagesReferenceMediaUri(messages, uri) {

package/dist/src/session/client-history.d.ts

@@ -36,6 +36,7 @@ export interface ClientHistoryMessage {
         args?: unknown;
         result?: string;
         isError?: boolean;
+        details?: unknown;
     }>;
 }
 export declare function flattenMessageContent(content: string | unknown[]): string;

package/dist/src/session/client-history.js

@@ -33,22 +33,65 @@ function collectToolResults(messages) {
 		if (!id || typeof id !== "string") continue;
 		map.set(id, {
 			text: flattenMessageContent(m.content),
-			isError: m.isError
+			isError: m.isError,
+			details: m.details
 		});
 	}
 	return map;
 }
-function toolCallsWithResults(tool_calls, results) {
-	if (!tool_calls?.length) return void 0;
+function collectMessageToolCalls(content, openAiToolCalls, rawToolCalls) {
 	const out = [];
-	for (const tc of tool_calls) {
-		const res = results.get(tc.id);
+	const seen = /* @__PURE__ */ new Set();
+	const add = (call) => {
+		const key = call.id ? `id:${call.id}` : `position:${out.length}`;
+		if (seen.has(key)) return;
+		seen.add(key);
+		out.push(call);
+	};
+	for (const call of openAiToolCalls ?? []) add({
+		id: call.id,
+		name: call.function.name,
+		args: safeJsonParseArguments(call.function.arguments)
+	});
+	for (const item of Array.isArray(rawToolCalls) ? rawToolCalls : []) {
+		if (!item || typeof item !== "object") continue;
+		const call = item;
+		const name = typeof call.name === "string" ? call.name : void 0;
+		if (!name) continue;
+		add({
+			id: typeof call.id === "string" ? call.id : void 0,
+			name,
+			args: call.args ?? call.arguments ?? call.input
+		});
+	}
+	for (const item of Array.isArray(content) ? content : []) {
+		if (!item || typeof item !== "object") continue;
+		const call = item;
+		if (call.type !== "toolCall" && call.type !== "tool_use" && call.type !== "tool_call") continue;
+		const fn = call.function && typeof call.function === "object" ? call.function : void 0;
+		const name = typeof call.name === "string" ? call.name : typeof fn?.name === "string" ? fn.name : void 0;
+		if (!name) continue;
+		const rawArgs = call.arguments ?? call.args ?? call.input ?? fn?.arguments;
+		add({
+			id: typeof call.id === "string" ? call.id : void 0,
+			name,
+			args: typeof rawArgs === "string" ? safeJsonParseArguments(rawArgs) : rawArgs
+		});
+	}
+	return out.length ? out : void 0;
+}
+function toolCallsWithResults(toolCalls, results) {
+	if (!toolCalls?.length) return void 0;
+	const out = [];
+	for (const call of toolCalls) {
+		const res = call.id ? results.get(call.id) : void 0;
 		out.push({
-			id: tc.id,
-			name: tc.function.name,
-			args: safeJsonParseArguments(tc.function.arguments),
+			id: call.id,
+			name: call.name,
+			args: call.args,
 			result: res?.text,
-			isError: res?.isError
+			isError: res?.isError,
+			details: res?.details
 		});
 	}
 	return out.length ? out : void 0;
@@ -74,7 +117,7 @@ function messagesToClientHistory(messages, opts) {
 		}
 		if (m.role === "assistant") {
 			const text = flattenMessageContent(m.content);
-			const toolCalls = toolCallsWithResults(m.tool_calls, results);
+			const toolCalls = toolCallsWithResults(collectMessageToolCalls(m.content, m.tool_calls), results);
 			out.push({
 				role: "assistant",
 				content: text,
@@ -108,7 +151,8 @@ function collectHistoryToolResults(messages) {
 		if (!id || typeof id !== "string") continue;
 		map.set(id, {
 			text: flattenMessageContent(m.content ?? ""),
-			isError: m.isError
+			isError: m.isError,
+			details: m.details
 		});
 	}
 	return map;
@@ -380,7 +424,7 @@ function transcriptRowsToClientHistory(rows, opts) {
 			...rawContent ? { rawContent } : {},
 			...displayIndex !== void 0 ? { displayIndex } : {},
 			timestamp: parseTimestampValue(messageRow.timestamp),
-			toolCalls: toolCallsWithResults(messageRow.tool_calls ?? messageRow.toolCalls, results)
+			toolCalls: toolCallsWithResults(collectMessageToolCalls(messageRow.content, messageRow.tool_calls, messageRow.toolCalls), results)
 		});
 	}
 	return out;

package/dist/src/session/types.d.ts

@@ -16,6 +16,7 @@ export interface Message {
     tool_call_id$?: string;
     toolName?: string;
     isError?: boolean;
+    details?: unknown;
     name?: string;
     /** Token usage from the LLM response (assistant messages only). */
     usage?: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xopcai/xopc",
-  "version": "0.0.158",
+  "version": "0.0.159",
   "description": "Local-first AI system that remembers context, coordinates AI, and sustains long-term progress.",
   "type": "module",
   "main": "dist/src/index.js",