@nextclaw/ncp-toolkit 0.1.0 → 0.1.1

package/dist/index.d.ts

@@ -1,16 +1,17 @@
-import { NcpAgentConversationStateManager, NcpConversationSnapshot, NcpEndpointEvent, NcpRequestEnvelope, NcpMessageSentPayload, NcpMessageAcceptedPayload, NcpResponseEnvelope, NcpCompletedEnvelope, NcpFailedEnvelope, NcpMessageAbortPayload, NcpTextStartPayload, NcpTextDeltaPayload, NcpTextEndPayload, NcpReasoningStartPayload, NcpReasoningDeltaPayload, NcpReasoningEndPayload, NcpToolCallStartPayload, NcpToolCallArgsPayload, NcpToolCallArgsDeltaPayload, NcpToolCallEndPayload, NcpToolCallResultPayload, NcpRunStartedPayload, NcpRunFinishedPayload, NcpRunErrorPayload, NcpRunMetadataPayload, NcpError } from '@nextclaw/ncp';
+import { NcpAgentConversationStateManager, NcpAgentConversationSnapshot, NcpEndpointEvent, NcpRequestEnvelope, NcpMessageSentPayload, NcpMessageAcceptedPayload, NcpResponseEnvelope, NcpCompletedEnvelope, NcpFailedEnvelope, NcpMessageAbortPayload, NcpTextStartPayload, NcpTextDeltaPayload, NcpTextEndPayload, NcpReasoningStartPayload, NcpReasoningDeltaPayload, NcpReasoningEndPayload, NcpToolCallStartPayload, NcpToolCallArgsPayload, NcpToolCallArgsDeltaPayload, NcpToolCallEndPayload, NcpToolCallResultPayload, NcpRunStartedPayload, NcpRunFinishedPayload, NcpRunErrorPayload, NcpRunMetadataPayload, NcpError } from '@nextclaw/ncp';
 
 declare class DefaultNcpAgentConversationStateManager implements NcpAgentConversationStateManager {
     private messages;
     private streamingMessage;
     private error;
+    private activeRun;
     private readonly listeners;
     private readonly toolCallMessageIdByCallId;
     private readonly toolCallArgsRawByCallId;
     private stateVersion;
-    getSnapshot(): NcpConversationSnapshot;
-    subscribe(listener: (snapshot: NcpConversationSnapshot) => void): () => boolean;
-    dispatch(event: NcpEndpointEvent): void;
+    getSnapshot(): NcpAgentConversationSnapshot;
+    subscribe(listener: (snapshot: NcpAgentConversationSnapshot) => void): () => boolean;
+    dispatch(event: NcpEndpointEvent): Promise<void>;
     handleMessageRequest(payload: NcpRequestEnvelope): void;
     handleMessageSent(payload: NcpMessageSentPayload): void;
     handleMessageAccepted(_payload: NcpMessageAcceptedPayload): void;
@@ -29,10 +30,10 @@ declare class DefaultNcpAgentConversationStateManager implements NcpAgentConvers
     handleMessageToolCallArgsDelta(payload: NcpToolCallArgsDeltaPayload): void;
     handleMessageToolCallEnd(payload: NcpToolCallEndPayload): void;
     handleMessageToolCallResult(payload: NcpToolCallResultPayload): void;
-    handleRunStarted(_payload: NcpRunStartedPayload): void;
+    handleRunStarted(payload: NcpRunStartedPayload): void;
     handleRunFinished(_payload: NcpRunFinishedPayload): void;
     handleRunError(payload: NcpRunErrorPayload): void;
-    handleRunMetadata(_payload: NcpRunMetadataPayload): void;
+    handleRunMetadata(payload: NcpRunMetadataPayload): void;
     handleEndpointError(payload: NcpError): void;
     private applyToolCallArgs;
     private ensureStreamingMessage;

package/dist/index.js

@@ -13,7 +13,7 @@ var buildRuntimeError = (payload) => {
     code: "runtime-error",
     message: message && message.length > 0 ? message : "Agent run failed.",
     details: {
-      sessionKey: payload.sessionKey,
+      sessionId: payload.sessionId,
       messageId: payload.messageId,
       threadId: payload.threadId,
       runId: payload.runId
@@ -24,6 +24,7 @@ var DefaultNcpAgentConversationStateManager = class {
   messages = [];
   streamingMessage = null;
   error = null;
+  activeRun = null;
   listeners = /* @__PURE__ */ new Set();
   toolCallMessageIdByCallId = /* @__PURE__ */ new Map();
   toolCallArgsRawByCallId = /* @__PURE__ */ new Map();
@@ -32,19 +33,22 @@ var DefaultNcpAgentConversationStateManager = class {
     return {
       messages: this.messages.map((message) => cloneMessage(message)),
       streamingMessage: this.streamingMessage ? cloneMessage(this.streamingMessage) : null,
-      error: this.error ? { ...this.error, details: this.error.details ? { ...this.error.details } : void 0 } : null
+      error: this.error ? { ...this.error, details: this.error.details ? { ...this.error.details } : void 0 } : null,
+      activeRun: this.activeRun ? { ...this.activeRun } : null
     };
   }
   subscribe(listener) {
     this.listeners.add(listener);
     return () => this.listeners.delete(listener);
   }
-  dispatch(event) {
+  async dispatch(event) {
     const versionBeforeDispatch = this.stateVersion;
     switch (event.type) {
       case "message.request":
         this.handleMessageRequest(event.payload);
         break;
+      case "message.resume-request":
+        break;
       case "message.sent":
         this.handleMessageSent(event.payload);
         break;
@@ -215,14 +219,14 @@ var DefaultNcpAgentConversationStateManager = class {
     }
   }
   handleMessageTextStart(payload) {
-    this.ensureStreamingMessage(payload.sessionKey, payload.messageId, "streaming");
+    this.ensureStreamingMessage(payload.sessionId, payload.messageId, "streaming");
     this.setError(null);
   }
   handleMessageTextDelta(payload) {
     if (!payload.delta) {
       return;
     }
-    const targetMessage = this.ensureStreamingMessage(payload.sessionKey, payload.messageId, "streaming");
+    const targetMessage = this.ensureStreamingMessage(payload.sessionId, payload.messageId, "streaming");
     const nextParts = [...targetMessage.parts];
     const lastPart = nextParts[nextParts.length - 1];
     if (lastPart?.type === "text") {
@@ -252,13 +256,13 @@ var DefaultNcpAgentConversationStateManager = class {
     });
   }
   handleMessageReasoningStart(payload) {
-    this.ensureStreamingMessage(payload.sessionKey, payload.messageId, "streaming");
+    this.ensureStreamingMessage(payload.sessionId, payload.messageId, "streaming");
   }
   handleMessageReasoningDelta(payload) {
     if (!payload.delta) {
       return;
     }
-    const targetMessage = this.ensureStreamingMessage(payload.sessionKey, payload.messageId, "streaming");
+    const targetMessage = this.ensureStreamingMessage(payload.sessionId, payload.messageId, "streaming");
     const nextParts = [...targetMessage.parts];
     const reasoningPartIndex = this.findLastReasoningPartIndex(nextParts);
     if (reasoningPartIndex >= 0) {
@@ -285,7 +289,7 @@ var DefaultNcpAgentConversationStateManager = class {
   }
   handleMessageToolCallStart(payload) {
     const targetMessage = this.resolveToolCallTargetMessage(
-      payload.sessionKey,
+      payload.sessionId,
       payload.toolCallId,
       payload.messageId
     );
@@ -306,16 +310,16 @@ var DefaultNcpAgentConversationStateManager = class {
   }
   handleMessageToolCallArgs(payload) {
     this.toolCallArgsRawByCallId.set(payload.toolCallId, payload.args);
-    this.applyToolCallArgs(payload.sessionKey, payload.toolCallId, payload.args);
+    this.applyToolCallArgs(payload.sessionId, payload.toolCallId, payload.args);
   }
   handleMessageToolCallArgsDelta(payload) {
     const currentArgs = this.toolCallArgsRawByCallId.get(payload.toolCallId) ?? "";
     const nextArgs = `${currentArgs}${payload.delta}`;
     this.toolCallArgsRawByCallId.set(payload.toolCallId, nextArgs);
-    this.applyToolCallArgs(payload.sessionKey, payload.toolCallId, nextArgs, payload.messageId);
+    this.applyToolCallArgs(payload.sessionId, payload.toolCallId, nextArgs, payload.messageId);
   }
   handleMessageToolCallEnd(payload) {
-    const targetMessage = this.resolveToolCallTargetMessage(payload.sessionKey, payload.toolCallId);
+    const targetMessage = this.resolveToolCallTargetMessage(payload.sessionId, payload.toolCallId);
     const args = this.toolCallArgsRawByCallId.get(payload.toolCallId) ?? "";
     const nextParts = this.upsertToolInvocationPart(targetMessage.parts, {
       type: "tool-invocation",
@@ -343,7 +347,7 @@ var DefaultNcpAgentConversationStateManager = class {
       return this.upsertToolInvocationPart(targetMessage.parts, mergedPart);
     });
     if (!updated) {
-      const fallbackMessage = this.resolveToolCallTargetMessage(payload.sessionKey, payload.toolCallId);
+      const fallbackMessage = this.resolveToolCallTargetMessage(payload.sessionId, payload.toolCallId);
       const nextParts = this.upsertToolInvocationPart(fallbackMessage.parts, {
         type: "tool-invocation",
         toolCallId: payload.toolCallId,
@@ -358,21 +362,43 @@ var DefaultNcpAgentConversationStateManager = class {
       });
     }
   }
-  handleRunStarted(_payload) {
+  handleRunStarted(payload) {
     this.setError(null);
+    this.activeRun = {
+      runId: payload.runId ?? null,
+      sessionId: payload.sessionId
+    };
+    this.stateVersion += 1;
   }
   handleRunFinished(_payload) {
+    this.activeRun = null;
+    this.stateVersion += 1;
   }
   handleRunError(payload) {
     this.setError(buildRuntimeError(payload));
+    this.activeRun = null;
+    this.stateVersion += 1;
   }
-  handleRunMetadata(_payload) {
+  handleRunMetadata(payload) {
+    const m = payload.metadata;
+    if (m?.kind === "ready") {
+      const ready = m;
+      this.activeRun = {
+        runId: ready.runId ?? this.activeRun?.runId ?? null,
+        sessionId: ready.sessionId ?? this.activeRun?.sessionId,
+        abortDisabledReason: ready.supportsAbort === false ? ready.abortDisabledReason ?? "Unsupported" : null
+      };
+      this.stateVersion += 1;
+    } else if (m?.kind === "final") {
+      this.activeRun = null;
+      this.stateVersion += 1;
+    }
   }
   handleEndpointError(payload) {
     this.setError(payload);
   }
-  applyToolCallArgs(sessionKey, toolCallId, args, messageId) {
-    const targetMessage = this.resolveToolCallTargetMessage(sessionKey, toolCallId, messageId);
+  applyToolCallArgs(sessionId, toolCallId, args, messageId) {
+    const targetMessage = this.resolveToolCallTargetMessage(sessionId, toolCallId, messageId);
     const toolName = this.findToolNameByCallId(targetMessage.parts, toolCallId) ?? "unknown";
     const nextParts = this.upsertToolInvocationPart(targetMessage.parts, {
       type: "tool-invocation",
@@ -387,7 +413,7 @@ var DefaultNcpAgentConversationStateManager = class {
       status: "streaming"
     });
   }
-  ensureStreamingMessage(sessionKey, messageId, status) {
+  ensureStreamingMessage(sessionId, messageId, status) {
     if (this.streamingMessage?.id === messageId) {
       if (this.streamingMessage.status === status) {
         return this.streamingMessage;
@@ -401,7 +427,7 @@ var DefaultNcpAgentConversationStateManager = class {
     }
     const nextStreamingMessage = {
       id: messageId,
-      sessionKey,
+      sessionId,
       role: DEFAULT_ASSISTANT_ROLE,
       status,
       parts: [],
@@ -410,10 +436,10 @@ var DefaultNcpAgentConversationStateManager = class {
     this.replaceStreamingMessage(nextStreamingMessage);
     return nextStreamingMessage;
   }
-  resolveToolCallTargetMessage(sessionKey, toolCallId, messageId) {
+  resolveToolCallTargetMessage(sessionId, toolCallId, messageId) {
     const preferredMessageId = messageId?.trim() || this.toolCallMessageIdByCallId.get(toolCallId) || this.streamingMessage?.id || `tool-${toolCallId}`;
     this.toolCallMessageIdByCallId.set(toolCallId, preferredMessageId);
-    return this.ensureStreamingMessage(sessionKey, preferredMessageId, "streaming");
+    return this.ensureStreamingMessage(sessionId, preferredMessageId, "streaming");
   }
   updateMessageContainingToolCall(toolCallId, updater) {
     if (this.streamingMessage) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextclaw/ncp-toolkit",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "private": false,
   "description": "Toolkit implementations built on top of the NextClaw Communication Protocol.",
   "type": "module",
@@ -15,7 +15,7 @@
     "dist"
   ],
   "dependencies": {
-    "@nextclaw/ncp": "0.1.0"
+    "@nextclaw/ncp": "0.1.1"
   },
   "devDependencies": {
     "@types/node": "^20.17.6",