@nextclaw/ncp-toolkit 0.5.7 → 0.5.9

package/dist/index.js

@@ -12,6 +12,7 @@ function normalizeConversationMessage(message) {
 }
 //#endregion
 //#region src/agent/agent-conversation-state-manager.utils.ts
+const ABORTED_TOOL_CALL_SENTINEL = "__nextclaw_aborted_tool_call__";
 function buildRuntimeError(payload) {
 	const message = payload.error?.trim();
 	return {
@@ -68,6 +69,20 @@ function upsertToolInvocationPart(parts, toolPart) {
 	nextParts.push(toolPart);
 	return nextParts;
 }
+function cancelInFlightToolInvocations(parts) {
+	const toolCallIds = [];
+	return {
+		parts: parts.map((part) => {
+			if (part.type !== "tool-invocation" || !part.toolCallId || part.state === "result" || part.state === "cancelled") return part;
+			toolCallIds.push(part.toolCallId);
+			return {
+				...part,
+				state: "cancelled"
+			};
+		}),
+		toolCallIds
+	};
+}
 //#endregion
 //#region src/agent/agent-conversation-state-manager.ts
 const DEFAULT_ASSISTANT_ROLE = "assistant";
@@ -205,13 +220,16 @@ var DefaultNcpAgentConversationStateManager = class {
 		this.setError(null);
 		if (this.streamingMessage && (!targetMessageId || this.streamingMessage.id === targetMessageId)) {
 			const streamingMessageId = this.streamingMessage.id;
+			const { parts: nextParts, toolCallIds } = cancelInFlightToolInvocations(this.streamingMessage.parts);
 			this.upsertMessage({
 				...this.streamingMessage,
-				status: "final"
+				status: "final",
+				parts: nextParts
 			});
 			this.replaceStreamingMessage(null);
 			if (targetMessageId) clearToolCallTrackingByMessageId(this.toolCallMessageIdByCallId, this.toolCallArgsRawByCallId, targetMessageId);
 			else clearToolCallTrackingByMessageId(this.toolCallMessageIdByCallId, this.toolCallArgsRawByCallId, streamingMessageId);
+			toolCallIds.forEach((toolCallId) => this.toolCallArgsRawByCallId.set(toolCallId, ABORTED_TOOL_CALL_SENTINEL));
 		}
 	};
 	handleMessageTextStart = (payload) => {
@@ -271,6 +289,7 @@ var DefaultNcpAgentConversationStateManager = class {
 		if (this.streamingMessage?.id !== payload.messageId) return;
 	};
 	handleMessageToolCallStart = (payload) => {
+		if (this.toolCallArgsRawByCallId.get(payload.toolCallId) === "__nextclaw_aborted_tool_call__") return;
 		const targetMessage = this.resolveToolCallTargetMessage(payload.sessionId, payload.toolCallId, payload.messageId);
 		this.toolCallArgsRawByCallId.set(payload.toolCallId, "");
 		const nextParts = upsertToolInvocationPart(targetMessage.parts, {
@@ -288,15 +307,18 @@ var DefaultNcpAgentConversationStateManager = class {
 		this.setError(null);
 	};
 	handleMessageToolCallArgs = (payload) => {
+		if (this.toolCallArgsRawByCallId.get(payload.toolCallId) === "__nextclaw_aborted_tool_call__") return;
 		this.toolCallArgsRawByCallId.set(payload.toolCallId, payload.args);
 		this.applyToolCallArgs(payload.sessionId, payload.toolCallId, payload.args);
 	};
 	handleMessageToolCallArgsDelta = (payload) => {
+		if (this.toolCallArgsRawByCallId.get(payload.toolCallId) === "__nextclaw_aborted_tool_call__") return;
 		const nextArgs = `${this.toolCallArgsRawByCallId.get(payload.toolCallId) ?? ""}${payload.delta}`;
 		this.toolCallArgsRawByCallId.set(payload.toolCallId, nextArgs);
 		this.applyToolCallArgs(payload.sessionId, payload.toolCallId, nextArgs, payload.messageId);
 	};
 	handleMessageToolCallEnd = (payload) => {
+		if (this.toolCallArgsRawByCallId.get(payload.toolCallId) === "__nextclaw_aborted_tool_call__") return;
 		const targetMessage = this.resolveToolCallTargetMessage(payload.sessionId, payload.toolCallId);
 		const args = this.toolCallArgsRawByCallId.get(payload.toolCallId) ?? "";
 		const nextParts = upsertToolInvocationPart(targetMessage.parts, {
@@ -313,6 +335,7 @@ var DefaultNcpAgentConversationStateManager = class {
 		});
 	};
 	handleMessageToolCallResult = (payload) => {
+		if (this.toolCallArgsRawByCallId.get(payload.toolCallId) === "__nextclaw_aborted_tool_call__") return;
 		if (!this.updateMessageContainingToolCall(payload.toolCallId, (targetMessage, existingPart) => {
 			const mergedPart = {
 				type: "tool-invocation",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextclaw/ncp-toolkit",
-  "version": "0.5.7",
+  "version": "0.5.9",
   "private": false,
   "description": "Toolkit implementations built on top of the NextClaw Communication Protocol.",
   "type": "module",
@@ -15,14 +15,14 @@
     "dist"
   ],
   "dependencies": {
-    "@nextclaw/ncp": "0.5.2"
+    "@nextclaw/ncp": "0.5.4"
   },
   "devDependencies": {
     "@types/node": "^20.17.6",
     "prettier": "^3.3.3",
     "typescript": "^5.6.3",
     "vitest": "^4.1.2",
-    "@nextclaw/ncp-agent-runtime": "0.3.12"
+    "@nextclaw/ncp-agent-runtime": "0.3.14"
   },
   "scripts": {
     "build": "tsdown src/index.ts --dts --clean --target es2022 --no-fixedExtension",