@yourgpt/copilot-sdk 2.1.8 → 2.1.9-alpha.0

package/dist/{chunk-ISOMZAYN.js → chunk-RBULQ6EJ.js}

@@ -39,6 +39,19 @@ function isStreamDone(chunk) {
 }
 
 // src/chat/functions/stream/processChunk.ts
+function parsePartialJson(partial) {
+  if (!partial || !partial.startsWith("{")) return null;
+  const result = {};
+  const stringPairs = partial.matchAll(/"(\w+)"\s*:\s*"((?:[^"\\]|\\.)*)"/g);
+  for (const m of stringPairs) {
+    result[m[1]] = m[2];
+  }
+  const openString = partial.match(/"(\w+)"\s*:\s*"((?:[^"\\]|\\.)*)$/);
+  if (openString) {
+    result[openString[1]] = openString[2];
+  }
+  return Object.keys(result).length > 0 ? result : null;
+}
 function processStreamChunk(chunk, state) {
   switch (chunk.type) {
     case "message:start":
@@ -79,12 +92,17 @@ function processStreamChunk(chunk, state) {
       const existing = state.toolResults.get(chunk.id);
       if (existing) {
         const newResults = new Map(state.toolResults);
+        let parsed = null;
         try {
+          parsed = JSON.parse(chunk.args);
+        } catch {
+          parsed = parsePartialJson(chunk.args);
+        }
+        if (parsed) {
           newResults.set(chunk.id, {
             ...existing,
-            args: JSON.parse(chunk.args)
+            args: parsed
           });
-        } catch {
         }
         return { ...state, toolResults: newResults };
       }
@@ -1523,7 +1541,8 @@ var AbstractChat = class {
       threadId: init.threadId,
       debug: init.debug,
       optimization: init.optimization,
-      yourgptConfig: init.yourgptConfig
+      yourgptConfig: init.yourgptConfig,
+      streamMode: init.streamMode
     };
     this.state = init.state ?? new SimpleChatState();
     this.transport = init.transport ?? new HttpTransport({
@@ -1749,6 +1768,12 @@ var AbstractChat = class {
       this.callbacks.onMessagesChange?.(this._allMessages());
       this.callbacks.onStatusChange?.("submitted");
       await new Promise((resolve) => setTimeout(resolve, 0));
+      if (this.status === "ready" || this.status === "error") {
+        this.debug(
+          "Skipping processRequest \u2014 status reset during yield (stop was called)"
+        );
+        return;
+      }
       await this.processRequest();
     } catch (error) {
       this.handleError(error);
@@ -2187,11 +2212,19 @@ ${this.dynamicContext}`.trim() : this.config.systemPrompt;
       if (existing) {
         assistantMessage = existing;
       } else {
-        assistantMessage = createEmptyAssistantMessage();
+        const visibleMessages = this.state.messages;
+        const currentLeafId = visibleMessages.length > 0 ? visibleMessages[visibleMessages.length - 1].id : void 0;
+        assistantMessage = createEmptyAssistantMessage(void 0, {
+          parentId: currentLeafId
+        });
         this.state.pushMessage(assistantMessage);
       }
     } else {
-      assistantMessage = createEmptyAssistantMessage();
+      const visibleMessages = this.state.messages;
+      const currentLeafId = visibleMessages.length > 0 ? visibleMessages[visibleMessages.length - 1].id : void 0;
+      assistantMessage = createEmptyAssistantMessage(void 0, {
+        parentId: currentLeafId
+      });
       this.state.pushMessage(assistantMessage);
     }
     this.streamState = createStreamState(assistantMessage.id);
@@ -2211,37 +2244,58 @@ ${this.dynamicContext}`.trim() : this.config.systemPrompt;
         this.handleError(error);
         return;
       }
-      if (chunk.type === "message:end" && this.streamState !== null && (this.streamState.content || (this.streamState.toolResults?.size ?? 0) > 0)) {
-        this.debug("message:end mid-stream", {
-          messageId: this.streamState.messageId,
-          contentLength: this.streamState.content.length,
-          toolCallsInState: this.streamState.toolCalls?.length ?? 0,
-          chunkCount
-        });
-        const turnMessage = streamStateToMessage(this.streamState);
-        const toolCallsHidden = {};
-        for (const [id, result] of this.streamState.toolResults) {
-          if (result.hidden !== void 0) {
-            toolCallsHidden[id] = result.hidden;
+      if (chunk.type === "message:end" && this.streamState) {
+        if (this.config.streamMode === "single-turn") {
+          this.debug(
+            "message:end mid-stream (single-turn: keeping streamState alive)",
+            {
+              messageId: this.streamState.messageId,
+              contentLength: this.streamState.content.length,
+              chunkCount
+            }
+          );
+          continue;
+        }
+        if (!this.streamState.content && (this.streamState.toolResults?.size ?? 0) === 0) ; else {
+          this.debug("message:end mid-stream", {
+            messageId: this.streamState.messageId,
+            contentLength: this.streamState.content.length,
+            toolCallsInState: this.streamState.toolCalls?.length ?? 0,
+            chunkCount
+          });
+          const turnMessage = streamStateToMessage(this.streamState);
+          const toolCallsHidden = {};
+          for (const [id, result] of this.streamState.toolResults) {
+            if (result.hidden !== void 0) {
+              toolCallsHidden[id] = result.hidden;
+            }
+          }
+          if (turnMessage.toolCalls?.length && Object.keys(toolCallsHidden).length > 0) {
+            turnMessage.metadata = {
+              ...turnMessage.metadata,
+              toolCallsHidden
+            };
           }
+          this.state.updateMessageById(
+            this.streamState.messageId,
+            (existing) => ({
+              ...turnMessage,
+              ...existing.parentId !== void 0 ? { parentId: existing.parentId } : {},
+              ...existing.childrenIds !== void 0 ? { childrenIds: existing.childrenIds } : {}
+            })
+          );
+          this.callbacks.onMessageFinish?.(turnMessage);
+          this.streamState = null;
+          continue;
         }
-        if (turnMessage.toolCalls?.length && Object.keys(toolCallsHidden).length > 0) {
-          turnMessage.metadata = {
-            ...turnMessage.metadata,
-            toolCallsHidden
-          };
+      }
+      if (chunk.type === "message:start" && this.streamState !== null) {
+        if (this.config.streamMode === "single-turn") {
+          this.debug(
+            "message:start mid-stream (single-turn: streamState already active, skipping)"
+          );
+          continue;
         }
-        this.state.updateMessageById(
-          this.streamState.messageId,
-          (existing) => ({
-            ...turnMessage,
-            ...existing.parentId !== void 0 ? { parentId: existing.parentId } : {},
-            ...existing.childrenIds !== void 0 ? { childrenIds: existing.childrenIds } : {}
-          })
-        );
-        this.callbacks.onMessageFinish?.(turnMessage);
-        this.streamState = null;
-        continue;
       }
       if (chunk.type === "message:start" && this.streamState === null) {
         this.debug("message:start after mid-stream end - creating new message");
@@ -2256,6 +2310,45 @@ ${this.dynamicContext}`.trim() : this.config.systemPrompt;
         continue;
       }
       if (!this.streamState) {
+        if (chunk.type === "action:start") {
+          this.callbacks.onServerToolStart?.({
+            id: chunk.id,
+            name: chunk.name,
+            hidden: chunk.hidden
+          });
+          continue;
+        }
+        if (chunk.type === "action:args") {
+          let args = {};
+          try {
+            args = JSON.parse(chunk.args);
+          } catch {
+            try {
+              const partial = chunk.args;
+              if (partial && partial.startsWith("{")) {
+                const extracted = {};
+                const pairs = partial.matchAll(
+                  /"(\w+)"\s*:\s*"((?:[^"\\]|\\.)*)"/g
+                );
+                for (const m of pairs) extracted[m[1]] = m[2];
+                const open = partial.match(/"(\w+)"\s*:\s*"((?:[^"\\]|\\.)*)$/);
+                if (open) extracted[open[1]] = open[2];
+                if (Object.keys(extracted).length > 0) args = extracted;
+              }
+            } catch {
+            }
+          }
+          const execName = chunk.id;
+          this.callbacks.onServerToolArgs?.({
+            id: chunk.id,
+            name: execName,
+            args
+          });
+          continue;
+        }
+        if (chunk.type === "action:end") {
+          continue;
+        }
         if (chunk.type === "tool_calls") {
           pendingClientToolCalls = chunk.toolCalls;
           this.debug("tool_calls (post-message:end, stored as pending)", {
@@ -2278,6 +2371,8 @@ ${this.dynamicContext}`.trim() : this.config.systemPrompt;
             );
             const messagesToInsert = [];
             let clientAssistantToolCalls;
+            const lastVisibleMsgs = this.state.messages;
+            let postEndInsertParentId = lastVisibleMsgs.length > 0 ? lastVisibleMsgs[lastVisibleMsgs.length - 1].id : void 0;
             for (const msg of chunk.messages) {
               if (msg.role === "assistant" && msg.tool_calls?.length && pendingIds.size > 0 && msg.tool_calls.every(
                 (tc) => pendingIds.has(tc?.id ?? "")
@@ -2292,14 +2387,17 @@ ${this.dynamicContext}`.trim() : this.config.systemPrompt;
                 continue;
               if (msg.role === "tool" && msg.tool_call_id && pendingIds.has(msg.tool_call_id))
                 continue;
-              messagesToInsert.push({
+              const insertedMsg = {
                 id: generateMessageId(),
                 role: msg.role,
                 content: msg.content ?? "",
                 toolCalls: msg.tool_calls,
                 toolCallId: msg.tool_call_id,
-                createdAt: /* @__PURE__ */ new Date()
-              });
+                createdAt: /* @__PURE__ */ new Date(),
+                ...postEndInsertParentId ? { parentId: postEndInsertParentId } : {}
+              };
+              postEndInsertParentId = insertedMsg.id;
+              messagesToInsert.push(insertedMsg);
             }
             if (clientAssistantToolCalls) {
               const currentMessages = this.state.messages;
@@ -2317,7 +2415,7 @@ ${this.dynamicContext}`.trim() : this.config.systemPrompt;
               }
             }
             if (messagesToInsert.length > 0) {
-              const currentMessages = this.state.messages;
+              const currentMessages = this._allMessages();
               let insertIdx = currentMessages.length;
               for (let i = currentMessages.length - 1; i >= 0; i--) {
                 if (currentMessages[i].role === "assistant") {
@@ -2373,6 +2471,20 @@ ${this.dynamicContext}`.trim() : this.config.systemPrompt;
         try {
           args = JSON.parse(chunk.args);
         } catch {
+          try {
+            const partial = chunk.args;
+            if (partial && partial.startsWith("{")) {
+              const extracted = {};
+              const pairs = partial.matchAll(
+                /"(\w+)"\s*:\s*"((?:[^"\\]|\\.)*)"/g
+              );
+              for (const m of pairs) extracted[m[1]] = m[2];
+              const open = partial.match(/"(\w+)"\s*:\s*"((?:[^"\\]|\\.)*)$/);
+              if (open) extracted[open[1]] = open[2];
+              if (Object.keys(extracted).length > 0) args = extracted;
+            }
+          } catch {
+          }
         }
         const existingResult = this.streamState?.toolResults.get(chunk.id);
         if (existingResult) {
@@ -2443,10 +2555,21 @@ ${this.dynamicContext}`.trim() : this.config.systemPrompt;
               (m) => `${m.role}${m.tool_calls?.length ? `[${m.tool_calls.length}tc]` : ""}`
             )
           });
-          const currentStreamToolCallIds = new Set(
-            this.streamState?.toolCalls?.map((toolCall) => toolCall.id) ?? []
-          );
+          const currentStreamToolCallIds = /* @__PURE__ */ new Set([
+            ...this.streamState?.toolCalls?.map((toolCall) => toolCall.id) ?? [],
+            ...this.config.streamMode === "single-turn" && this.streamState?.toolResults ? Array.from(this.streamState.toolResults.keys()) : []
+          ]);
           const messagesToInsert = [];
+          let insertChainParentId;
+          if (this.config.streamMode === "single-turn" && this.streamState) {
+            const allMsgs = this._allMessages();
+            const streamIdx = allMsgs.findIndex(
+              (m) => m.id === this.streamState.messageId
+            );
+            insertChainParentId = streamIdx > 0 ? allMsgs[streamIdx - 1].id : void 0;
+          } else {
+            insertChainParentId = this.streamState?.messageId;
+          }
           const toolCallsHidden = {};
           if (this.streamState?.toolResults) {
             for (const [id, result] of this.streamState.toolResults) {
@@ -2459,6 +2582,12 @@ ${this.dynamicContext}`.trim() : this.config.systemPrompt;
             if (msg.role === "assistant" && !msg.tool_calls?.length) {
               continue;
             }
+            if (this.config.streamMode === "single-turn" && msg.role === "assistant") {
+              continue;
+            }
+            if (this.config.streamMode === "single-turn" && msg.role === "tool") {
+              continue;
+            }
             if (msg.role === "assistant" && msg.tool_calls?.length && msg.tool_calls.every(
               (toolCall) => currentStreamToolCallIds.has(toolCall.id)
             )) {
@@ -2475,12 +2604,14 @@ ${this.dynamicContext}`.trim() : this.config.systemPrompt;
               toolCalls: msg.tool_calls,
               toolCallId: msg.tool_call_id,
               createdAt: /* @__PURE__ */ new Date(),
-              metadata
+              metadata,
+              ...insertChainParentId ? { parentId: insertChainParentId } : {}
             };
+            insertChainParentId = message.id;
             messagesToInsert.push(message);
           }
           if (messagesToInsert.length > 0) {
-            const currentMessages = this.state.messages;
+            const currentMessages = this._allMessages();
             const currentStreamIndex = this.streamState ? currentMessages.findIndex(
               (message) => message.id === this.streamState.messageId
             ) : -1;
@@ -2897,7 +3028,6 @@ var AbstractAgentLoop = class {
       return [];
     }
     this.abortController = new AbortController();
-    this._isCancelled = false;
     this._isProcessing = true;
     this.setIteration(this._iteration + 1);
     const results = await Promise.all(
@@ -2920,17 +3050,28 @@ var AbstractAgentLoop = class {
    */
   async executeSingleTool(toolCall) {
     const tool = this.getTool(toolCall.name);
-    const execution = {
-      id: toolCall.id,
-      toolCallId: toolCall.id,
-      name: toolCall.name,
-      args: toolCall.args,
-      status: "pending",
-      approvalStatus: "none",
-      startedAt: /* @__PURE__ */ new Date(),
-      hidden: tool?.hidden
-    };
-    this.addToolExecution(execution);
+    const existingExecution = this._toolExecutions.find(
+      (e) => e.id === toolCall.id
+    );
+    let execution;
+    if (existingExecution) {
+      execution = existingExecution;
+      this.updateToolExecution(toolCall.id, {
+        args: toolCall.args
+      });
+    } else {
+      execution = {
+        id: toolCall.id,
+        toolCallId: toolCall.id,
+        name: toolCall.name,
+        args: toolCall.args,
+        status: "pending",
+        approvalStatus: "none",
+        startedAt: /* @__PURE__ */ new Date(),
+        hidden: tool?.hidden
+      };
+      this.addToolExecution(execution);
+    }
     this.callbacks.onToolStart?.(execution);
     if (!tool) {
       const errorResult = {
@@ -3535,6 +3676,7 @@ var ChatWithTools = class {
       onCreateSession: config.onCreateSession,
       yourgptConfig: config.yourgptConfig,
       debug: config.debug,
+      streamMode: config.streamMode,
       initialMessages: config.initialMessages,
       state: config.state,
       transport: config.transport,
@@ -3575,7 +3717,8 @@ var ChatWithTools = class {
             (t) => t.name === info.name && t.location === "client"
           );
           if (isClientTool) {
-            this.debug("Skipping server tracking for client tool:", info.name);
+            this.debug("Tracking client tool for streaming render:", info.name);
+            this.agentLoop.addServerToolExecution(info);
             return;
           }
           this.debug("Server tool started:", info.name, {
@@ -3585,10 +3728,6 @@ var ChatWithTools = class {
           this.agentLoop.addServerToolExecution(info);
         },
         onServerToolArgs: (info) => {
-          const isClientTool = this.agentLoop.tools.some(
-            (t) => t.name === info.name && t.location === "client"
-          );
-          if (isClientTool) return;
           this.debug("Server tool args:", info.name, info.args);
           this.agentLoop.updateServerToolArgs(info.id, info.args ?? {});
         },
@@ -3636,6 +3775,10 @@ var ChatWithTools = class {
       try {
         const results = await this.agentLoop.executeToolCalls(toolCallInfos);
         this.debug("Tool results:", results);
+        if (this.agentLoop.isCancelled) {
+          this.debug("Skipping continueWithToolResults \u2014 loop was cancelled");
+          return;
+        }
         if (results.length > 0) {
           const toolResults = results.map((r) => ({
             toolCallId: r.toolCallId,
@@ -5079,7 +5222,7 @@ function useTools(tools) {
   const registeredToolsRef = useRef([]);
   const toolsRef = useRef(tools);
   toolsRef.current = tools;
-  const toolsKey = Object.keys(tools).sort().join(",");
+  const toolsKey = Object.entries(tools).sort(([a], [b]) => a.localeCompare(b)).map(([name, def]) => `${name}:${def.available ?? true}`).join(",");
   useEffect(() => {
     const currentTools = toolsRef.current;
     const toolNames = [];
@@ -5414,6 +5557,7 @@ function CopilotProvider(props) {
     onError,
     parseError,
     streaming,
+    streamMode,
     headers,
     body,
     debug = false,
@@ -5476,6 +5620,7 @@ function CopilotProvider(props) {
         yourgptConfig,
         initialMessages: uiInitialMessages,
         streaming,
+        streamMode,
         headers,
         body,
         parseError,
@@ -5954,5 +6099,5 @@ function useMCPTools(config) {
 }
 
 export { AbstractAgentLoop, AbstractChat, CopilotProvider, MessageHistoryContext, MessageTree, ReactChatState, SkillProvider, createReactChatState, defaultMessageHistoryConfig, initialAgentLoopState, isCompactionMarker, keepToolPairsAtomic, toDisplayMessage, toLLMMessage, toLLMMessages, useAIContext, useAIContexts, useCopilot, useMCPClient, useMCPTools, useMessageHistory, useMessageHistoryContext, useSkillContext, useTool, useTools };
-//# sourceMappingURL=chunk-ISOMZAYN.js.map
-//# sourceMappingURL=chunk-ISOMZAYN.js.map
+//# sourceMappingURL=chunk-RBULQ6EJ.js.map
+//# sourceMappingURL=chunk-RBULQ6EJ.js.map