@nextclaw/ncp-agent-runtime 0.3.28 → 0.3.29-beta.0

package/dist/index.js

@@ -1,153 +1,9 @@
+import { NcpAssistantTextStreamNormalizer, NcpEventType, isHiddenNcpMessage, normalizeAssistantText, sanitizeAssistantReplyTags } from "@nextclaw/ncp";
 import { copyFileSync, existsSync, readFileSync } from "node:fs";
 import AjvPkg from "ajv";
 import { createHash, randomUUID } from "node:crypto";
 import { copyFile, mkdir, readFile, stat, writeFile } from "node:fs/promises";
 import { basename, dirname, join, resolve } from "node:path";
-import { NcpAssistantTextStreamNormalizer, NcpEventType, isHiddenNcpMessage, normalizeAssistantText } from "@nextclaw/ncp";
-//#region src/runtime/user-content.utils.ts
-function readOptionalString$1(value) {
-	if (typeof value !== "string") return null;
-	const trimmed = value.trim();
-	return trimmed.length > 0 ? trimmed : null;
-}
-function formatAssetReferenceBlock(params) {
-	const { fileName: rawFileName, mimeType: rawMimeType, assetUri: rawAssetUri, url: rawUrl, sizeBytes } = params;
-	const fileName = readOptionalString$1(rawFileName) ?? "asset";
-	const mimeType = readOptionalString$1(rawMimeType) ?? "application/octet-stream";
-	const assetUri = readOptionalString$1(rawAssetUri);
-	const url = readOptionalString$1(rawUrl);
-	const sizeText = typeof sizeBytes === "number" && Number.isFinite(sizeBytes) ? String(sizeBytes) : null;
-	return [
-		`[Asset: ${fileName}]`,
-		`[MIME: ${mimeType}]`,
-		...assetUri ? [`[Asset URI: ${assetUri}]`] : [],
-		...sizeText ? [`[Size Bytes: ${sizeText}]`] : [],
-		...url ? [`[Preview URL: ${url}]`] : [],
-		"[Instruction: This file is not embedded in the prompt. If you need to inspect or transform it, use asset_export to copy it to a normal file path first.]"
-	].join("\n");
-}
-function resolveFilePart(part, assetStore) {
-	const assetUri = readOptionalString$1(part.assetUri);
-	const stored = assetUri ? assetStore?.getByUri(assetUri) : null;
-	return {
-		fileName: readOptionalString$1(stored?.fileName) ?? readOptionalString$1(part.name) ?? "asset",
-		mimeType: readOptionalString$1(stored?.mimeType) ?? readOptionalString$1(part.mimeType) ?? "application/octet-stream",
-		assetUri,
-		url: readOptionalString$1(part.url),
-		contentBase64: readOptionalString$1(part.contentBase64),
-		sizeBytes: stored?.sizeBytes ?? (typeof part.sizeBytes === "number" ? part.sizeBytes : void 0),
-		contentPath: assetUri ? assetStore?.resolveContentPath(assetUri) ?? null : null
-	};
-}
-function formatImageAttachmentHint(params) {
-	const { fileName: rawFileName, mimeType: rawMimeType, assetUri: rawAssetUri, sizeBytes } = params;
-	const fileName = readOptionalString$1(rawFileName) ?? "asset";
-	const mimeType = readOptionalString$1(rawMimeType) ?? "application/octet-stream";
-	const assetUri = readOptionalString$1(rawAssetUri);
-	const sizeText = typeof sizeBytes === "number" && Number.isFinite(sizeBytes) ? String(sizeBytes) : null;
-	return [
-		`[Attached Image: ${fileName}]`,
-		`[MIME: ${mimeType}]`,
-		...assetUri ? [`[Asset URI: ${assetUri}]`] : [],
-		...sizeText ? [`[Size Bytes: ${sizeText}]`] : [],
-		assetUri ? "[Instruction: This image is embedded in the prompt. If you need to transform or process the original file with tools, use the asset URI.]" : "[Instruction: This image is embedded in the prompt.]"
-	].join("\n");
-}
-function isImageMimeType(value) {
-	return value?.startsWith("image/") ?? false;
-}
-function isModelReachableImageUrl(value) {
-	return value !== null && (/^https?:\/\//i.test(value) || /^data:/i.test(value));
-}
-function buildImageDataUrl(mimeType, bytes) {
-	return `data:${mimeType};base64,${Buffer.from(bytes).toString("base64")}`;
-}
-function resolveImageContentPart(part, assetStore) {
-	const resolved = resolveFilePart(part, assetStore);
-	if (!isImageMimeType(resolved.mimeType)) return null;
-	if (resolved.contentBase64) return {
-		type: "image_url",
-		image_url: {
-			url: `data:${resolved.mimeType};base64,${resolved.contentBase64}`,
-			detail: "auto"
-		}
-	};
-	if (resolved.contentPath) return {
-		type: "image_url",
-		image_url: {
-			url: buildImageDataUrl(resolved.mimeType, readFileSync(resolved.contentPath)),
-			detail: "auto"
-		}
-	};
-	const reachableImageUrl = resolved.url;
-	if (isModelReachableImageUrl(reachableImageUrl)) return {
-		type: "image_url",
-		image_url: {
-			url: reachableImageUrl,
-			detail: "auto"
-		}
-	};
-	return null;
-}
-function resolveImageAttachmentHint(part, assetStore) {
-	const resolved = resolveFilePart(part, assetStore);
-	if (!isImageMimeType(resolved.mimeType)) return null;
-	return formatImageAttachmentHint({
-		fileName: resolved.fileName,
-		mimeType: resolved.mimeType,
-		assetUri: resolved.assetUri,
-		sizeBytes: resolved.sizeBytes
-	});
-}
-function resolveAssetReferenceBlock(part, assetStore) {
-	const resolved = resolveFilePart(part, assetStore);
-	if (resolved.assetUri) return formatAssetReferenceBlock({
-		fileName: resolved.fileName,
-		mimeType: resolved.mimeType,
-		assetUri: resolved.assetUri,
-		url: resolved.url,
-		sizeBytes: resolved.sizeBytes
-	});
-	if (resolved.url || resolved.contentBase64) return formatAssetReferenceBlock({
-		fileName: resolved.fileName,
-		mimeType: resolved.mimeType,
-		url: resolved.url,
-		sizeBytes: resolved.sizeBytes
-	});
-	return null;
-}
-function buildNcpUserContent(parts, options = {}) {
-	const content = [];
-	for (const part of parts) {
-		if ((part.type === "text" || part.type === "rich-text") && part.text.trim().length > 0) {
-			content.push({
-				type: "text",
-				text: part.text
-			});
-			continue;
-		}
-		if (part.type !== "file") continue;
-		const imageContentPart = resolveImageContentPart(part, options.assetStore);
-		if (imageContentPart) {
-			content.push(imageContentPart);
-			const imageAttachmentHint = resolveImageAttachmentHint(part, options.assetStore);
-			if (imageAttachmentHint) content.push({
-				type: "text",
-				text: imageAttachmentHint
-			});
-			continue;
-		}
-		const assetReferenceBlock = resolveAssetReferenceBlock(part, options.assetStore);
-		if (assetReferenceBlock) content.push({
-			type: "text",
-			text: assetReferenceBlock
-		});
-	}
-	if (content.length === 0) return "";
-	if (content.length === 1 && content[0]?.type === "text") return content[0].text;
-	return content;
-}
-//#endregion
 //#region src/tool-result/tool-result-content.utils.ts
 const LARGE_INLINE_PAYLOAD_CHARS$1 = 2048;
 function sanitizePositiveInt(value, fallback) {
@@ -565,7 +421,233 @@ var ToolResultContentManager = class {
 };
 const defaultToolResultContentManager = new ToolResultContentManager();
 //#endregion
-//#region src/runtime/utils.ts
+//#region src/runtime/user-content.utils.ts
+function readOptionalString$1(value) {
+	if (typeof value !== "string") return null;
+	const trimmed = value.trim();
+	return trimmed.length > 0 ? trimmed : null;
+}
+function formatAssetReferenceBlock(params) {
+	const { fileName: rawFileName, mimeType: rawMimeType, assetUri: rawAssetUri, url: rawUrl, sizeBytes } = params;
+	const fileName = readOptionalString$1(rawFileName) ?? "asset";
+	const mimeType = readOptionalString$1(rawMimeType) ?? "application/octet-stream";
+	const assetUri = readOptionalString$1(rawAssetUri);
+	const url = readOptionalString$1(rawUrl);
+	const sizeText = typeof sizeBytes === "number" && Number.isFinite(sizeBytes) ? String(sizeBytes) : null;
+	return [
+		`[Asset: ${fileName}]`,
+		`[MIME: ${mimeType}]`,
+		...assetUri ? [`[Asset URI: ${assetUri}]`] : [],
+		...sizeText ? [`[Size Bytes: ${sizeText}]`] : [],
+		...url ? [`[Preview URL: ${url}]`] : [],
+		"[Instruction: This file is not embedded in the prompt. If you need to inspect or transform it, use asset_export to copy it to a normal file path first.]"
+	].join("\n");
+}
+function resolveFilePart(part, assetStore) {
+	const assetUri = readOptionalString$1(part.assetUri);
+	const stored = assetUri ? assetStore?.getByUri(assetUri) : null;
+	return {
+		fileName: readOptionalString$1(stored?.fileName) ?? readOptionalString$1(part.name) ?? "asset",
+		mimeType: readOptionalString$1(stored?.mimeType) ?? readOptionalString$1(part.mimeType) ?? "application/octet-stream",
+		assetUri,
+		url: readOptionalString$1(part.url),
+		contentBase64: readOptionalString$1(part.contentBase64),
+		sizeBytes: stored?.sizeBytes ?? (typeof part.sizeBytes === "number" ? part.sizeBytes : void 0),
+		contentPath: assetUri ? assetStore?.resolveContentPath(assetUri) ?? null : null
+	};
+}
+function formatImageAttachmentHint(params) {
+	const { fileName: rawFileName, mimeType: rawMimeType, assetUri: rawAssetUri, sizeBytes } = params;
+	const fileName = readOptionalString$1(rawFileName) ?? "asset";
+	const mimeType = readOptionalString$1(rawMimeType) ?? "application/octet-stream";
+	const assetUri = readOptionalString$1(rawAssetUri);
+	const sizeText = typeof sizeBytes === "number" && Number.isFinite(sizeBytes) ? String(sizeBytes) : null;
+	return [
+		`[Attached Image: ${fileName}]`,
+		`[MIME: ${mimeType}]`,
+		...assetUri ? [`[Asset URI: ${assetUri}]`] : [],
+		...sizeText ? [`[Size Bytes: ${sizeText}]`] : [],
+		assetUri ? "[Instruction: This image is embedded in the prompt. If you need to transform or process the original file with tools, use the asset URI.]" : "[Instruction: This image is embedded in the prompt.]"
+	].join("\n");
+}
+function isImageMimeType(value) {
+	return value?.startsWith("image/") ?? false;
+}
+function isModelReachableImageUrl(value) {
+	return value !== null && (/^https?:\/\//i.test(value) || /^data:/i.test(value));
+}
+function buildImageDataUrl(mimeType, bytes) {
+	return `data:${mimeType};base64,${Buffer.from(bytes).toString("base64")}`;
+}
+function resolveImageContentPart(part, assetStore) {
+	const resolved = resolveFilePart(part, assetStore);
+	if (!isImageMimeType(resolved.mimeType)) return null;
+	if (resolved.contentBase64) return {
+		type: "image_url",
+		image_url: {
+			url: `data:${resolved.mimeType};base64,${resolved.contentBase64}`,
+			detail: "auto"
+		}
+	};
+	if (resolved.contentPath) return {
+		type: "image_url",
+		image_url: {
+			url: buildImageDataUrl(resolved.mimeType, readFileSync(resolved.contentPath)),
+			detail: "auto"
+		}
+	};
+	const reachableImageUrl = resolved.url;
+	if (isModelReachableImageUrl(reachableImageUrl)) return {
+		type: "image_url",
+		image_url: {
+			url: reachableImageUrl,
+			detail: "auto"
+		}
+	};
+	return null;
+}
+function resolveImageAttachmentHint(part, assetStore) {
+	const resolved = resolveFilePart(part, assetStore);
+	if (!isImageMimeType(resolved.mimeType)) return null;
+	return formatImageAttachmentHint({
+		fileName: resolved.fileName,
+		mimeType: resolved.mimeType,
+		assetUri: resolved.assetUri,
+		sizeBytes: resolved.sizeBytes
+	});
+}
+function resolveAssetReferenceBlock(part, assetStore) {
+	const resolved = resolveFilePart(part, assetStore);
+	if (resolved.assetUri) return formatAssetReferenceBlock({
+		fileName: resolved.fileName,
+		mimeType: resolved.mimeType,
+		assetUri: resolved.assetUri,
+		url: resolved.url,
+		sizeBytes: resolved.sizeBytes
+	});
+	if (resolved.url || resolved.contentBase64) return formatAssetReferenceBlock({
+		fileName: resolved.fileName,
+		mimeType: resolved.mimeType,
+		url: resolved.url,
+		sizeBytes: resolved.sizeBytes
+	});
+	return null;
+}
+function buildNcpUserContent(parts, options = {}) {
+	const content = [];
+	for (const part of parts) {
+		if ((part.type === "text" || part.type === "rich-text") && part.text.trim().length > 0) {
+			content.push({
+				type: "text",
+				text: part.text
+			});
+			continue;
+		}
+		if (part.type !== "file") continue;
+		const imageContentPart = resolveImageContentPart(part, options.assetStore);
+		if (imageContentPart) {
+			content.push(imageContentPart);
+			const imageAttachmentHint = resolveImageAttachmentHint(part, options.assetStore);
+			if (imageAttachmentHint) content.push({
+				type: "text",
+				text: imageAttachmentHint
+			});
+			continue;
+		}
+		const assetReferenceBlock = resolveAssetReferenceBlock(part, options.assetStore);
+		if (assetReferenceBlock) content.push({
+			type: "text",
+			text: assetReferenceBlock
+		});
+	}
+	if (content.length === 0) return "";
+	if (content.length === 1 && content[0]?.type === "text") return content[0].text;
+	return content;
+}
+//#endregion
+//#region src/runtime/utils/message-converter.utils.ts
+function isRecord$2(value) {
+	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+function isTextLikePart(part) {
+	return part.type === "text" || part.type === "rich-text";
+}
+function readText(parts) {
+	return parts.filter(isTextLikePart).map((part) => part.text).join("");
+}
+function ncpMessageToOpenAiMessages(rawMessage, options = {}) {
+	const message = rawMessage.role === "assistant" ? sanitizeAssistantReplyTags(rawMessage) : rawMessage;
+	const parts = message.parts ?? [];
+	if (message.role === "user") return [{
+		role: "user",
+		content: buildNcpUserContent(parts, { assetStore: options.assetStore })
+	}];
+	if (message.role === "system" || message.role === "service") return [{
+		role: "system",
+		content: readText(parts)
+	}];
+	if (message.role === "tool") return [{
+		role: "tool",
+		content: readText(parts),
+		tool_call_id: message.id
+	}];
+	if (message.role !== "assistant") return [];
+	const texts = [];
+	const reasonings = [];
+	const toolInvocations = [];
+	for (const part of parts) {
+		if (part.type === "reasoning") reasonings.push(part.text);
+		if (part.type === "text") texts.push(part.text);
+		if (part.type === "tool-invocation" && part.state === "result" && part.result !== void 0) toolInvocations.push({
+			toolCallId: part.toolCallId ?? "",
+			toolName: part.toolName,
+			args: part.args ?? {},
+			result: part.result,
+			resultContentItems: part.resultContentItems
+		});
+	}
+	const text = texts.join("");
+	const reasoning = reasonings.join("");
+	const toolResultContentManager = options.toolResultContentManager ?? defaultToolResultContentManager;
+	if (toolInvocations.length === 0) return [{
+		role: "assistant",
+		content: text,
+		...reasoning ? { reasoning_content: reasoning } : {}
+	}];
+	return [
+		{
+			role: "assistant",
+			content: text || null,
+			...reasoning ? { reasoning_content: reasoning } : {},
+			tool_calls: toolInvocations.map((toolInvocation) => ({
+				id: toolInvocation.toolCallId,
+				type: "function",
+				function: {
+					name: toolInvocation.toolName,
+					arguments: typeof toolInvocation.args === "string" ? toolInvocation.args : JSON.stringify(toolInvocation.args ?? {})
+				}
+			}))
+		},
+		...toolInvocations.map((toolInvocation) => ({
+			role: "tool",
+			content: toolResultContentManager.toModelContent(toolInvocation.result, {
+				toolCallId: toolInvocation.toolCallId,
+				toolName: toolInvocation.toolName
+			}),
+			tool_call_id: toolInvocation.toolCallId
+		})),
+		...toolResultContentManager.toVisualObservationMessages(toolInvocations.map((toolInvocation) => ({
+			toolCallId: toolInvocation.toolCallId,
+			toolName: toolInvocation.toolName,
+			args: isRecord$2(toolInvocation.args) ? toolInvocation.args : null,
+			rawArgsText: typeof toolInvocation.args === "string" ? toolInvocation.args : JSON.stringify(toolInvocation.args ?? {}),
+			result: toolInvocation.result,
+			contentItems: toolInvocation.resultContentItems
+		})))
+	];
+}
+//#endregion
+//#region src/runtime/runtime.utils.ts
 const toolSchemaValidator = new AjvPkg({
 	allErrors: true,
 	strict: false,
@@ -750,9 +832,6 @@ function readOptionalString(value) {
 	const trimmed = value.trim();
 	return trimmed.length > 0 ? trimmed : null;
 }
-function isTextLikePart(part) {
-	return part.type === "text" || part.type === "rich-text";
-}
 function mergeMessageAndRequestMetadata(input) {
 	const messageMetadata = input.messages.slice().reverse().find((message) => isRecord(message.metadata))?.metadata;
 	return {
@@ -773,73 +852,6 @@ function readRequestedToolNames(metadata) {
 function isDefaultNcpContextBuilderOptions(value) {
 	return Boolean(value) && typeof value === "object" && !("getToolDefinitions" in value);
 }
-function messageToOpenAI(msg, options) {
-	const role = msg.role;
-	const parts = msg.parts ?? [];
-	if (role === "user" || role === "system") {
-		if (role === "user") return [{
-			role,
-			content: buildNcpUserContent(parts, { assetStore: options.assetStore })
-		}];
-		return [{
-			role,
-			content: parts.filter(isTextLikePart).map((part) => part.text).join("")
-		}];
-	}
-	if (role === "assistant") {
-		const texts = [];
-		const reasonings = [];
-		const toolInvocations = [];
-		for (const p of parts) {
-			if (p.type === "reasoning") reasonings.push(p.text);
-			if (p.type === "text") texts.push(p.text);
-			if (p.type === "tool-invocation" && p.state === "result" && p.result !== void 0) toolInvocations.push({
-				toolCallId: p.toolCallId ?? "",
-				toolName: p.toolName,
-				args: p.args ?? {},
-				result: p.result,
-				resultContentItems: p.resultContentItems
-			});
-		}
-		const text = texts.join("");
-		const reasoning = reasonings.join("");
-		const out = [];
-		if (toolInvocations.length > 0) {
-			out.push({
-				role: "assistant",
-				content: text || null,
-				...reasoning ? { reasoning_content: reasoning } : {},
-				tool_calls: toolInvocations.map((t) => ({
-					id: t.toolCallId,
-					type: "function",
-					function: {
-						name: t.toolName,
-						arguments: typeof t.args === "string" ? t.args : JSON.stringify(t.args ?? {})
-					}
-				}))
-			});
-			for (const t of toolInvocations) out.push({
-				role: "tool",
-				content: typeof t.result === "string" ? t.result : JSON.stringify(t.result),
-				tool_call_id: t.toolCallId
-			});
-			out.push(...defaultToolResultContentManager.toVisualObservationMessages(toolInvocations.map((toolInvocation) => ({
-				toolCallId: toolInvocation.toolCallId,
-				toolName: toolInvocation.toolName,
-				args: isRecord(toolInvocation.args) ? toolInvocation.args : null,
-				rawArgsText: typeof toolInvocation.args === "string" ? toolInvocation.args : JSON.stringify(toolInvocation.args ?? {}),
-				result: toolInvocation.result,
-				contentItems: toolInvocation.resultContentItems
-			}))));
-		} else out.push({
-			role: "assistant",
-			content: text,
-			...reasoning ? { reasoning_content: reasoning } : {}
-		});
-		return out;
-	}
-	return [];
-}
 var DefaultNcpContextBuilder = class {
 	toolRegistry;
 	assetStore;
@@ -862,8 +874,8 @@ var DefaultNcpContextBuilder = class {
 			role: "system",
 			content: systemPrompt
 		});
-		for (const msg of sessionMessages.slice(-maxMessages)) messages.push(...messageToOpenAI(msg, { assetStore: this.assetStore }));
-		for (const msg of input.messages) messages.push(...messageToOpenAI(msg, { assetStore: this.assetStore }));
+		for (const msg of sessionMessages.slice(-maxMessages)) messages.push(...ncpMessageToOpenAiMessages(msg, { assetStore: this.assetStore }));
+		for (const msg of input.messages) messages.push(...ncpMessageToOpenAiMessages(msg, { assetStore: this.assetStore }));
 		const toolDefinitions = this.toolRegistry?.getToolDefinitions() ?? [];
 		const tools = (requestedToolNames.length > 0 ? toolDefinitions.filter((definition) => requestedToolNames.includes(definition.name)) : toolDefinitions).map(buildOpenAiFunctionTool);
 		return {
@@ -1384,6 +1396,111 @@ function createStreamContentState(reasoningNormalizationMode) {
 	};
 }
 //#endregion
+//#region src/runtime/round-collector.ts
+var DefaultNcpRoundCollector = class {
+	rawText = "";
+	explicitReasoning = "";
+	toolCallBuffers = /* @__PURE__ */ new Map();
+	constructor(reasoningNormalizationMode = "off") {
+		this.reasoningNormalizationMode = reasoningNormalizationMode;
+	}
+	clear() {
+		this.rawText = "";
+		this.explicitReasoning = "";
+		this.toolCallBuffers.clear();
+	}
+	consumeChunk(chunk) {
+		const choice = chunk.choices?.[0];
+		if (!choice) return;
+		const delta = choice.delta;
+		if (!delta) return;
+		if (typeof delta.content === "string" && delta.content.length > 0) this.rawText += delta.content;
+		const reasoning = delta.reasoning_content ?? delta.reasoning;
+		if (typeof reasoning === "string" && reasoning.length > 0) this.explicitReasoning += reasoning;
+		const toolDeltas = delta.tool_calls;
+		if (!Array.isArray(toolDeltas)) return;
+		for (const toolDelta of toolDeltas) {
+			const index = getToolCallIndex(toolDelta, this.toolCallBuffers.size);
+			const current = applyToolDelta(this.toolCallBuffers.get(index) ?? { argumentsText: "" }, toolDelta);
+			this.toolCallBuffers.set(index, current);
+		}
+	}
+	getText() {
+		if (this.reasoningNormalizationMode !== "think-tags") return this.rawText;
+		return normalizeAssistantText(this.rawText, this.reasoningNormalizationMode).text;
+	}
+	getReasoning() {
+		if (this.explicitReasoning.length > 0) return this.explicitReasoning;
+		if (this.reasoningNormalizationMode !== "think-tags") return "";
+		return normalizeAssistantText(this.rawText, this.reasoningNormalizationMode).reasoning;
+	}
+	getToolCalls() {
+		const orderedEntries = Array.from(this.toolCallBuffers.entries()).sort(([left], [right]) => left - right);
+		const toolCalls = [];
+		for (const [, buffer] of orderedEntries) {
+			if (!buffer.id || !buffer.name) continue;
+			toolCalls.push({
+				toolCallId: buffer.id,
+				toolName: buffer.name,
+				args: buffer.argumentsText
+			});
+		}
+		return toolCalls;
+	}
+};
+//#endregion
+//#region src/runtime/utils/tool-call-execution.utils.ts
+async function executeCollectedToolCall(options) {
+	const { toolCall, tool } = options;
+	const parsedArgs = parseToolArgs(toolCall.args);
+	if (!parsedArgs.ok) return {
+		toolCallId: toolCall.toolCallId,
+		toolName: toolCall.toolName,
+		args: null,
+		rawArgsText: parsedArgs.rawText,
+		result: createInvalidToolArgumentsResult({
+			toolCallId: toolCall.toolCallId,
+			toolName: toolCall.toolName,
+			rawArgumentsText: parsedArgs.rawText,
+			issues: parsedArgs.issues
+		})
+	};
+	const validationIssues = tool ? [...validateToolArgs(parsedArgs.value, tool.parameters), ...tool.validateArgs?.(parsedArgs.value) ?? []] : [];
+	if (validationIssues.length > 0) return {
+		toolCallId: toolCall.toolCallId,
+		toolName: toolCall.toolName,
+		args: null,
+		rawArgsText: parsedArgs.rawText,
+		result: createInvalidToolArgumentsResult({
+			toolCallId: toolCall.toolCallId,
+			toolName: toolCall.toolName,
+			rawArgumentsText: parsedArgs.rawText,
+			issues: validationIssues
+		})
+	};
+	try {
+		return {
+			toolCallId: toolCall.toolCallId,
+			toolName: toolCall.toolName,
+			args: parsedArgs.value,
+			rawArgsText: parsedArgs.rawText,
+			result: await options.execute(tool, parsedArgs.value)
+		};
+	} catch (error) {
+		return {
+			toolCallId: toolCall.toolCallId,
+			toolName: toolCall.toolName,
+			args: parsedArgs.value,
+			rawArgsText: parsedArgs.rawText,
+			result: createToolExecutionFailedResult({
+				toolCallId: toolCall.toolCallId,
+				toolName: toolCall.toolName,
+				error
+			})
+		};
+	}
+}
+//#endregion
 //#region src/runtime/stream-encoder.ts
 /**
 * Converts LLM stream chunks to NCP events (text, reasoning, tool calls).
@@ -1396,6 +1513,11 @@ var DefaultNcpStreamEncoder = class {
 	}
 	async *encode(stream, context) {
 		const { sessionId, messageId } = context;
+		const streamContext = {
+			sessionId,
+			messageId,
+			correlationId: context.correlationId
+		};
 		let state = createStreamContentState(this.reasoningNormalizationMode);
 		const toolCallBuffers = /* @__PURE__ */ new Map();
 		for await (const chunk of stream) {
@@ -1403,39 +1525,18 @@ var DefaultNcpStreamEncoder = class {
 			if (!choice) continue;
 			const delta = choice.delta;
 			if (delta) {
-				yield* emitReasoningDelta(delta, {
-					sessionId,
-					messageId
-				});
-				state = yield* emitTextDeltas(delta, {
-					sessionId,
-					messageId
-				}, state);
-				state = yield* closeTextPartBeforeToolCalls(delta, {
-					sessionId,
-					messageId
-				}, state);
-				yield* emitToolCallDeltas(delta, toolCallBuffers, {
-					sessionId,
-					messageId
-				});
+				yield* emitReasoningDelta(delta, streamContext);
+				state = yield* emitTextDeltas(delta, streamContext, state);
+				state = yield* closeTextPartBeforeToolCalls(delta, streamContext, state);
+				yield* emitToolCallDeltas(delta, toolCallBuffers, streamContext);
 			}
 			const finishReason = choice.finish_reason;
 			if (typeof finishReason === "string" && finishReason.trim().length > 0) {
-				state = yield* flushTextDeltas({
-					sessionId,
-					messageId
-				}, state);
-				yield* flushToolCalls(toolCallBuffers, {
-					sessionId,
-					messageId
-				});
+				state = yield* flushTextDeltas(streamContext, state);
+				yield* flushToolCalls(toolCallBuffers, streamContext);
 				if (state.textStarted) yield {
 					type: NcpEventType.MessageTextEnd,
-					payload: {
-						sessionId,
-						messageId
-					}
+					payload: streamContext
 				};
 			}
 		}
@@ -1506,59 +1607,6 @@ var EchoNcpLLMApi = class {
 	};
 };
 //#endregion
-//#region src/runtime/round-collector.ts
-var DefaultNcpRoundCollector = class {
-	rawText = "";
-	explicitReasoning = "";
-	toolCallBuffers = /* @__PURE__ */ new Map();
-	constructor(reasoningNormalizationMode = "off") {
-		this.reasoningNormalizationMode = reasoningNormalizationMode;
-	}
-	clear() {
-		this.rawText = "";
-		this.explicitReasoning = "";
-		this.toolCallBuffers.clear();
-	}
-	consumeChunk(chunk) {
-		const choice = chunk.choices?.[0];
-		if (!choice) return;
-		const delta = choice.delta;
-		if (!delta) return;
-		if (typeof delta.content === "string" && delta.content.length > 0) this.rawText += delta.content;
-		const reasoning = delta.reasoning_content ?? delta.reasoning;
-		if (typeof reasoning === "string" && reasoning.length > 0) this.explicitReasoning += reasoning;
-		const toolDeltas = delta.tool_calls;
-		if (!Array.isArray(toolDeltas)) return;
-		for (const toolDelta of toolDeltas) {
-			const index = getToolCallIndex(toolDelta, this.toolCallBuffers.size);
-			const current = applyToolDelta(this.toolCallBuffers.get(index) ?? { argumentsText: "" }, toolDelta);
-			this.toolCallBuffers.set(index, current);
-		}
-	}
-	getText() {
-		if (this.reasoningNormalizationMode !== "think-tags") return this.rawText;
-		return normalizeAssistantText(this.rawText, this.reasoningNormalizationMode).text;
-	}
-	getReasoning() {
-		if (this.explicitReasoning.length > 0) return this.explicitReasoning;
-		if (this.reasoningNormalizationMode !== "think-tags") return "";
-		return normalizeAssistantText(this.rawText, this.reasoningNormalizationMode).reasoning;
-	}
-	getToolCalls() {
-		const orderedEntries = Array.from(this.toolCallBuffers.entries()).sort(([left], [right]) => left - right);
-		const toolCalls = [];
-		for (const [, buffer] of orderedEntries) {
-			if (!buffer.id || !buffer.name) continue;
-			toolCalls.push({
-				toolCallId: buffer.id,
-				toolName: buffer.name,
-				args: buffer.argumentsText
-			});
-		}
-		return toolCalls;
-	}
-};
-//#endregion
 //#region src/runtime/agent-runtime.service.ts
 var DefaultNcpAgentRuntime = class {
 	contextBuilder;
@@ -1656,56 +1704,11 @@ var DefaultNcpAgentRuntime = class {
 		}
 	};
 	executeToolCall = async function(toolCall) {
-		const tool = this.toolRegistry.getTool(toolCall.toolName);
-		const parsedArgs = parseToolArgs(toolCall.args);
-		if (!parsedArgs.ok) return {
-			toolCallId: toolCall.toolCallId,
-			toolName: toolCall.toolName,
-			args: null,
-			rawArgsText: parsedArgs.rawText,
-			result: createInvalidToolArgumentsResult({
-				toolCallId: toolCall.toolCallId,
-				toolName: toolCall.toolName,
-				rawArgumentsText: parsedArgs.rawText,
-				issues: parsedArgs.issues
-			})
-		};
-		const validationIssues = this.resolveValidationIssues(parsedArgs.value, tool);
-		if (validationIssues.length > 0) return {
-			toolCallId: toolCall.toolCallId,
-			toolName: toolCall.toolName,
-			args: null,
-			rawArgsText: parsedArgs.rawText,
-			result: createInvalidToolArgumentsResult({
-				toolCallId: toolCall.toolCallId,
-				toolName: toolCall.toolName,
-				rawArgumentsText: parsedArgs.rawText,
-				issues: validationIssues
-			})
-		};
-		return {
-			toolCallId: toolCall.toolCallId,
-			toolName: toolCall.toolName,
-			args: parsedArgs.value,
-			rawArgsText: parsedArgs.rawText,
-			result: await this.executeValidatedToolCall(toolCall, parsedArgs.value)
-		};
-	};
-	resolveValidationIssues = function(args, tool) {
-		const schemaIssues = validateToolArgs(args, tool?.parameters);
-		if (schemaIssues.length > 0) return schemaIssues;
-		return typeof tool?.validateArgs === "function" ? tool.validateArgs(args) : [];
-	};
-	executeValidatedToolCall = async function(toolCall, args) {
-		try {
-			return await this.toolRegistry.execute(toolCall.toolCallId, toolCall.toolName, args);
-		} catch (error) {
-			return createToolExecutionFailedResult({
-				toolCallId: toolCall.toolCallId,
-				toolName: toolCall.toolName,
-				error
-			});
-		}
+		return executeCollectedToolCall({
+			toolCall,
+			tool: this.toolRegistry.getTool(toolCall.toolName),
+			execute: (_tool, args) => this.toolRegistry.execute(toolCall.toolCallId, toolCall.toolName, args)
+		});
 	};
 	tapStream = async function* (stream, onChunk) {
 		for await (const chunk of stream) {
@@ -1715,6 +1718,6 @@ var DefaultNcpAgentRuntime = class {
 	};
 };
 //#endregion
-export { DefaultNcpAgentRuntime, DefaultNcpContextBuilder, DefaultNcpRoundBuffer, DefaultNcpStreamEncoder, DefaultNcpToolRegistry, EchoNcpLLMApi, LocalAssetStore, ToolResultContentManager, appendToolRoundToInput, assertOpenAiFunctionParametersSchema, buildAssetContentPath, buildNcpUserContent, buildOpenAiFunctionTool, createInvalidToolArgumentsResult, createToolExecutionFailedResult, defaultToolResultContentManager, genId, getOpenAiFunctionParametersSchemaIssues, isTextLikeAsset, parseToolArgs, validateToolArgs };
+export { DefaultNcpAgentRuntime, DefaultNcpContextBuilder, DefaultNcpRoundBuffer, DefaultNcpRoundCollector, DefaultNcpStreamEncoder, DefaultNcpToolRegistry, EchoNcpLLMApi, LocalAssetStore, ToolResultContentManager, appendToolRoundToInput, assertOpenAiFunctionParametersSchema, buildAssetContentPath, buildNcpUserContent, buildOpenAiFunctionTool, createInvalidToolArgumentsResult, createToolExecutionFailedResult, defaultToolResultContentManager, executeCollectedToolCall, genId, getOpenAiFunctionParametersSchemaIssues, isTextLikeAsset, ncpMessageToOpenAiMessages, parseToolArgs, validateToolArgs };
 
 //# sourceMappingURL=index.js.map