@nextclaw/nextclaw-ncp-runtime-stdio-client 0.1.9 → 0.1.10

package/dist/stdio-runtime-error.utils.js

@@ -1,7 +1,7 @@
 //#region src/stdio-runtime-error.utils.ts
 function buildSpawnFailureMessage(params) {
-	const cwdSuffix = params.cwd ? ` (cwd: ${params.cwd})` : "";
-	return `[narp-stdio] failed to start stdio runtime command "${params.command}"${cwdSuffix}: ${params.error.message}`;
+	const { command, cwd, error } = params;
+	return `[narp-stdio] failed to start stdio runtime command "${command}"${cwd ? ` (cwd: ${cwd})` : ""}: ${error.message}`;
 }
 function normalizeRuntimeError(error) {
 	if (isNcpError(error)) return error;

package/dist/stdio-runtime-probe.utils.js

@@ -1,4 +1,5 @@
 import { buildStdioRuntimeLaunchEnv } from "./stdio-runtime-config.utils.js";
+import { buildSpawnFailureMessage } from "./stdio-runtime-error.utils.js";
 import { spawn } from "node:child_process";
 import { Readable, Writable } from "node:stream";
 import * as acp from "@agentclientprotocol/sdk";
@@ -21,8 +22,11 @@ async function probeStdioRuntime(config) {
 	});
 	const spawnErrorPromise = new Promise((_, reject) => {
 		child.once("error", (error) => {
-			const cwdSuffix = config.cwd ? ` (cwd: ${config.cwd})` : "";
-			reject(/* @__PURE__ */ new Error(`[narp-stdio] failed to start stdio runtime command "${config.command}"${cwdSuffix}: ${error.message}`));
+			reject(new Error(buildSpawnFailureMessage({
+				command: config.command,
+				cwd: config.cwd,
+				error
+			})));
 		});
 	});
 	let stderr = "";

package/dist/stdio-runtime.service.d.ts

@@ -13,6 +13,7 @@ declare class StdioRuntimeNcpAgentRuntime implements NcpAgentRuntime {
   private readonly session;
   constructor(config: StdioRuntimeNcpAgentRuntimeConfig);
   run: (this: StdioRuntimeNcpAgentRuntime, input: NcpAgentRunInput, options?: NcpAgentRunOptions) => AsyncGenerator<NcpEndpointEvent>;
+  dispose: () => Promise<void>;
 }
 //#endregion
 export { StdioRuntimeNcpAgentRuntime, StdioRuntimeNcpAgentRuntimeConfig };

package/dist/stdio-runtime.service.js

@@ -53,28 +53,37 @@ var PromptUpdateCollector = class {
 				});
 				return;
 			case NcpEventType.MessageToolCallArgs:
-				this.upsertTool({
-					toolCallId: event.payload.toolCallId,
-					toolName: this.readToolName(event.payload.toolCallId),
-					args: event.payload.args,
-					state: "partial-call"
-				});
+				{
+					const tool = this.readTool(event.payload.toolCallId);
+					this.upsertTool({
+						toolCallId: event.payload.toolCallId,
+						toolName: tool.toolName,
+						args: event.payload.args,
+						state: "partial-call"
+					});
+				}
 				return;
 			case NcpEventType.MessageToolCallArgsDelta:
-				this.upsertTool({
-					toolCallId: event.payload.toolCallId,
-					toolName: this.readToolName(event.payload.toolCallId),
-					args: `${this.readToolArgs(event.payload.toolCallId)}${event.payload.delta}`,
-					state: "partial-call"
-				});
+				{
+					const tool = this.readTool(event.payload.toolCallId);
+					this.upsertTool({
+						toolCallId: event.payload.toolCallId,
+						toolName: tool.toolName,
+						args: `${tool.args}${event.payload.delta}`,
+						state: "partial-call"
+					});
+				}
 				return;
 			case NcpEventType.MessageToolCallEnd:
-				this.upsertTool({
-					toolCallId: event.payload.toolCallId,
-					toolName: this.readToolName(event.payload.toolCallId),
-					args: this.readToolArgs(event.payload.toolCallId),
-					state: "call"
-				});
+				{
+					const tool = this.readTool(event.payload.toolCallId);
+					this.upsertTool({
+						toolCallId: event.payload.toolCallId,
+						toolName: tool.toolName,
+						args: tool.args,
+						state: "call"
+					});
+				}
 				return;
 			default: return;
 		}
@@ -110,17 +119,17 @@ var PromptUpdateCollector = class {
 			...nextTool
 		});
 	};
-	readToolArgs = (toolCallId) => {
-		return this.findTool(toolCallId)?.args ?? "";
-	};
-	readToolName = (toolCallId) => {
-		return this.findTool(toolCallId)?.toolName ?? "unknown";
-	};
-	findTool = (toolCallId) => {
+	readTool = (toolCallId) => {
 		const index = this.toolIndex.get(toolCallId);
-		if (typeof index !== "number") return null;
-		const part = this.parts[index];
-		return part?.type === "tool-invocation" ? part : null;
+		const part = typeof index === "number" ? this.parts[index] : null;
+		if (part?.type !== "tool-invocation") return {
+			toolName: "unknown",
+			args: ""
+		};
+		return {
+			toolName: part.toolName,
+			args: part.args
+		};
 	};
 };
 var StdioRuntimeClientBridge = class {
@@ -249,6 +258,21 @@ var StdioRuntimeSession = class {
 		};
 	};
 	readStderr = () => this.stderr;
+	dispose = async () => {
+		await this.cancel();
+		const child = this.child;
+		this.connection = null;
+		this.remoteSessionId = null;
+		this.child = null;
+		if (!child || child.killed || child.exitCode !== null || child.signalCode !== null) return;
+		const forceKill = setTimeout(() => {
+			child.kill("SIGKILL");
+		}, 3e3);
+		child.once("exit", () => {
+			clearTimeout(forceKill);
+		});
+		child.kill("SIGTERM");
+	};
 };
 var StdioRuntimeRunController = class {
 	buffer = new UpdateBuffer();
@@ -402,36 +426,34 @@ var StdioRuntimeRunController = class {
 			default: return [];
 		}
 	};
-	emitTextDelta = (content, messageId) => {
-		if (content.type !== "text" || !content.text) return [];
-		const events = [];
-		if (!this.textStarted) {
+	emitTextDelta = (content, messageId) => this.emitContentDelta({
+		content,
+		messageId,
+		started: this.textStarted,
+		markStarted: () => {
 			this.textStarted = true;
-			events.push({
-				type: NcpEventType.MessageTextStart,
-				payload: {
-					sessionId: this.input.sessionId,
-					messageId
-				}
-			});
-		}
-		events.push({
-			type: NcpEventType.MessageTextDelta,
-			payload: {
-				sessionId: this.input.sessionId,
-				messageId,
-				delta: content.text
-			}
-		});
-		return events;
-	};
-	emitReasoningDelta = (content, messageId) => {
+		},
+		startType: NcpEventType.MessageTextStart,
+		deltaType: NcpEventType.MessageTextDelta
+	});
+	emitReasoningDelta = (content, messageId) => this.emitContentDelta({
+		content,
+		messageId,
+		started: this.reasoningStarted,
+		markStarted: () => {
+			this.reasoningStarted = true;
+		},
+		startType: NcpEventType.MessageReasoningStart,
+		deltaType: NcpEventType.MessageReasoningDelta
+	});
+	emitContentDelta = (params) => {
+		const { content, deltaType, markStarted, messageId, started, startType } = params;
 		if (content.type !== "text" || !content.text) return [];
 		const events = [];
-		if (!this.reasoningStarted) {
-			this.reasoningStarted = true;
+		if (!started) {
+			markStarted();
 			events.push({
-				type: NcpEventType.MessageReasoningStart,
+				type: startType,
 				payload: {
 					sessionId: this.input.sessionId,
 					messageId
@@ -439,7 +461,7 @@ var StdioRuntimeRunController = class {
 			});
 		}
 		events.push({
-			type: NcpEventType.MessageReasoningDelta,
+			type: deltaType,
 			payload: {
 				sessionId: this.input.sessionId,
 				messageId,
@@ -558,6 +580,9 @@ var StdioRuntimeNcpAgentRuntime = class {
 		await this.session.ensureStarted({ providerRoute: this.config.resolveProviderRoute?.(input) });
 		yield* new StdioRuntimeRunController(this.session, input, this.config.stateManager, this.config.resolveTools, this.config.resolveProviderRoute).execute(options);
 	};
+	dispose = async () => {
+		await this.session.dispose();
+	};
 };
 function extractPromptText(message) {
 	const text = (message.parts ?? []).map((part) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextclaw/nextclaw-ncp-runtime-stdio-client",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "private": false,
   "description": "Optional NCP runtime adapter backed by a protocol-aware stdio agent command.",
   "type": "module",
@@ -17,7 +17,7 @@
   ],
   "dependencies": {
     "@agentclientprotocol/sdk": "^0.19.0",
-    "@nextclaw/ncp": "0.5.9"
+    "@nextclaw/ncp": "0.5.10"
   },
   "devDependencies": {
     "@types/node": "^20.17.6",