@octavus/client-sdk 2.1.0 → 2.3.0

package/dist/index.js

@@ -161,7 +161,8 @@ function createEmptyStreamingState() {
     currentTextPartIndex: null,
     currentReasoningPartIndex: null,
     currentObjectPartIndex: null,
-    accumulatedJson: ""
+    accumulatedJson: "",
+    activeWorkers: /* @__PURE__ */ new Map()
   };
 }
 function buildMessageFromState(state, status) {
@@ -173,6 +174,36 @@ function buildMessageFromState(state, status) {
     createdAt: /* @__PURE__ */ new Date()
   };
 }
+function finalizeParts(parts, workerError) {
+  return parts.map((part) => {
+    if (part.type === "text" || part.type === "reasoning") {
+      if (part.status === "streaming") {
+        return { ...part, status: "done" };
+      }
+    }
+    if (part.type === "object" && part.status === "streaming") {
+      return { ...part, status: "done" };
+    }
+    if (part.type === "tool-call") {
+      if (part.status === "pending" || part.status === "running") {
+        return { ...part, status: "cancelled" };
+      }
+    }
+    if (part.type === "operation" && part.status === "running") {
+      return { ...part, status: "cancelled" };
+    }
+    if (part.type === "worker" && part.status === "running") {
+      return {
+        ...part,
+        status: "error",
+        error: workerError,
+        parts: finalizeParts(part.parts)
+        // Recursive for nested parts
+      };
+    }
+    return part;
+  });
+}
 var OctavusChat = class {
   // Private state
   _messages;
@@ -197,6 +228,9 @@ var OctavusChat = class {
   // Flag indicating automatic client tools have completed and are ready to continue
   // We wait for the finish event before actually continuing to avoid race conditions
   _readyToContinue = false;
+  // Flag indicating the finish event with client-tool-calls reason has been received
+  // Used to handle the race condition where finish arrives before async tools complete
+  _finishEventReceived = false;
   // Listener sets for reactive frameworks
   listeners = /* @__PURE__ */ new Set();
   constructor(options) {
@@ -350,6 +384,7 @@ var OctavusChat = class {
     this._serverToolResults = [];
     this._pendingExecutionId = null;
     this._readyToContinue = false;
+    this._finishEventReceived = false;
     this.updatePendingClientToolsCache();
     try {
       for await (const event of this.transport.trigger(triggerName, processedInput)) {
@@ -369,25 +404,7 @@ var OctavusChat = class {
         const messages = [...this._messages];
         const lastMsg = messages[messages.length - 1];
         if (state.parts.length > 0) {
-          const finalParts = state.parts.map((part) => {
-            if (part.type === "text" || part.type === "reasoning") {
-              if (part.status === "streaming") {
-                return { ...part, status: "done" };
-              }
-            }
-            if (part.type === "object" && part.status === "streaming") {
-              return { ...part, status: "done" };
-            }
-            if (part.type === "tool-call") {
-              if (part.status === "pending" || part.status === "running") {
-                return { ...part, status: "cancelled" };
-              }
-            }
-            if (part.type === "operation" && part.status === "running") {
-              return { ...part, status: "cancelled" };
-            }
-            return part;
-          });
+          const finalParts = finalizeParts(state.parts, "Stream error");
           const finalMessage = {
             id: state.messageId,
             role: "assistant",
@@ -464,7 +481,9 @@ var OctavusChat = class {
       result: error ? void 0 : result,
       error,
       outputVariable: pendingTool.outputVariable,
-      blockIndex: pendingTool.blockIndex
+      blockIndex: pendingTool.blockIndex,
+      thread: pendingTool.thread,
+      workerId: pendingTool.workerId
     };
     this._completedToolResults.push(toolResult);
     if (error) {
@@ -490,37 +509,12 @@ var OctavusChat = class {
     this._serverToolResults = [];
     this._pendingExecutionId = null;
     this._readyToContinue = false;
+    this._finishEventReceived = false;
     this.updatePendingClientToolsCache();
     this.transport.stop();
     const state = this.streamingState;
     if (state && state.parts.length > 0) {
-      const finalParts = state.parts.map((part) => {
-        if (part.type === "tool-call") {
-          const toolPart = part;
-          if (toolPart.status === "pending" || toolPart.status === "running") {
-            return { ...toolPart, status: "cancelled" };
-          }
-        }
-        if (part.type === "operation") {
-          const opPart = part;
-          if (opPart.status === "running") {
-            return { ...opPart, status: "cancelled" };
-          }
-        }
-        if (part.type === "text" || part.type === "reasoning") {
-          const textPart = part;
-          if (textPart.status === "streaming") {
-            return { ...textPart, status: "done" };
-          }
-        }
-        if (part.type === "object") {
-          const objPart = part;
-          if (objPart.status === "streaming") {
-            return { ...objPart, status: "done" };
-          }
-        }
-        return part;
-      });
+      const finalParts = finalizeParts(state.parts, "Stopped by user");
       const finalMessage = {
         id: state.messageId,
         role: "assistant",
@@ -547,8 +541,13 @@ var OctavusChat = class {
   handleStreamEvent(event, state) {
     switch (event.type) {
       case "start":
+        if (event.executionId) {
+          this.options.onStart?.(event.executionId);
+        }
         break;
       case "block-start": {
+        const workerId = event.workerId;
+        const workerState = workerId ? state.activeWorkers.get(workerId) : void 0;
         const block = {
           blockId: event.blockId,
           blockName: event.blockName,
@@ -575,7 +574,13 @@ var OctavusChat = class {
             status: "running",
             thread: threadForPart(thread)
           };
-          state.parts.push(operationPart);
+          if (workerState) {
+            const workerPart = state.parts[workerState.partIndex];
+            workerPart.parts.push(operationPart);
+            state.parts[workerState.partIndex] = { ...workerPart };
+          } else {
+            state.parts.push(operationPart);
+          }
         }
         state.currentTextPartIndex = null;
         state.currentReasoningPartIndex = null;
@@ -583,12 +588,26 @@ var OctavusChat = class {
         break;
       }
       case "block-end": {
-        const operationPartIndex = state.parts.findIndex(
-          (p) => p.type === "operation" && p.operationId === event.blockId
-        );
-        if (operationPartIndex >= 0) {
-          const part = state.parts[operationPartIndex];
-          state.parts[operationPartIndex] = { ...part, status: "done" };
+        const workerId = event.workerId;
+        const workerState = workerId ? state.activeWorkers.get(workerId) : void 0;
+        if (workerState) {
+          const workerPart = state.parts[workerState.partIndex];
+          const operationPartIndex = workerPart.parts.findIndex(
+            (p) => p.type === "operation" && p.operationId === event.blockId
+          );
+          if (operationPartIndex >= 0) {
+            const part = workerPart.parts[operationPartIndex];
+            workerPart.parts[operationPartIndex] = { ...part, status: "done" };
+            state.parts[workerState.partIndex] = { ...workerPart };
+          }
+        } else {
+          const operationPartIndex = state.parts.findIndex(
+            (p) => p.type === "operation" && p.operationId === event.blockId
+          );
+          if (operationPartIndex >= 0) {
+            const part = state.parts[operationPartIndex];
+            state.parts[operationPartIndex] = { ...part, status: "done" };
+          }
         }
         if (state.activeBlock?.blockId === event.blockId) {
           state.activeBlock = null;
@@ -597,31 +616,63 @@ var OctavusChat = class {
         break;
       }
       case "reasoning-start": {
+        const workerId = event.workerId;
+        const workerState = workerId ? state.activeWorkers.get(workerId) : void 0;
         const reasoningPart = {
           type: "reasoning",
           text: "",
           status: "streaming",
           thread: threadForPart(state.activeBlock?.thread)
         };
-        state.parts.push(reasoningPart);
-        state.currentReasoningPartIndex = state.parts.length - 1;
+        if (workerState) {
+          const workerPart = state.parts[workerState.partIndex];
+          workerPart.parts.push(reasoningPart);
+          workerState.currentReasoningPartIndex = workerPart.parts.length - 1;
+          state.parts[workerState.partIndex] = { ...workerPart };
+        } else {
+          state.parts.push(reasoningPart);
+          state.currentReasoningPartIndex = state.parts.length - 1;
+        }
         this.updateStreamingMessage();
         break;
       }
       case "reasoning-delta": {
-        if (state.currentReasoningPartIndex !== null) {
-          const part = state.parts[state.currentReasoningPartIndex];
-          part.text += event.delta;
-          state.parts[state.currentReasoningPartIndex] = { ...part };
-        }
-        if (state.activeBlock) {
-          state.activeBlock.reasoning += event.delta;
+        const workerId = event.workerId;
+        const workerState = workerId ? state.activeWorkers.get(workerId) : void 0;
+        if (workerState) {
+          if (workerState.currentReasoningPartIndex !== null) {
+            const workerPart = state.parts[workerState.partIndex];
+            const part = workerPart.parts[workerState.currentReasoningPartIndex];
+            part.text += event.delta;
+            workerPart.parts[workerState.currentReasoningPartIndex] = { ...part };
+            state.parts[workerState.partIndex] = { ...workerPart };
+          }
+        } else {
+          if (state.currentReasoningPartIndex !== null) {
+            const part = state.parts[state.currentReasoningPartIndex];
+            part.text += event.delta;
+            state.parts[state.currentReasoningPartIndex] = { ...part };
+          }
+          if (state.activeBlock) {
+            state.activeBlock.reasoning += event.delta;
+          }
         }
         this.updateStreamingMessage();
         break;
       }
       case "reasoning-end": {
-        if (state.currentReasoningPartIndex !== null) {
+        const workerId = event.workerId;
+        const workerState = workerId ? state.activeWorkers.get(workerId) : void 0;
+        if (workerState) {
+          if (workerState.currentReasoningPartIndex !== null) {
+            const workerPart = state.parts[workerState.partIndex];
+            const part = workerPart.parts[workerState.currentReasoningPartIndex];
+            part.status = "done";
+            workerPart.parts[workerState.currentReasoningPartIndex] = { ...part };
+            state.parts[workerState.partIndex] = { ...workerPart };
+            workerState.currentReasoningPartIndex = null;
+          }
+        } else if (state.currentReasoningPartIndex !== null) {
           const part = state.parts[state.currentReasoningPartIndex];
           part.status = "done";
           state.parts[state.currentReasoningPartIndex] = { ...part };
@@ -631,9 +682,11 @@ var OctavusChat = class {
         break;
       }
       case "text-start": {
+        const workerId = event.workerId;
+        const workerState = workerId ? state.activeWorkers.get(workerId) : void 0;
         const thread = threadForPart(state.activeBlock?.thread);
         const shouldAddPart = state.activeBlock?.outputToChat !== false || thread !== void 0;
-        if (shouldAddPart) {
+        if (workerState || shouldAddPart) {
           if (event.responseType) {
             const objectPart = {
               type: "object",
@@ -644,10 +697,19 @@ var OctavusChat = class {
               status: "streaming",
               thread
             };
-            state.parts.push(objectPart);
-            state.currentObjectPartIndex = state.parts.length - 1;
-            state.accumulatedJson = "";
-            state.currentTextPartIndex = null;
+            if (workerState) {
+              const workerPart = state.parts[workerState.partIndex];
+              workerPart.parts.push(objectPart);
+              workerState.currentObjectPartIndex = workerPart.parts.length - 1;
+              workerState.accumulatedJson = "";
+              workerState.currentTextPartIndex = null;
+              state.parts[workerState.partIndex] = { ...workerPart };
+            } else {
+              state.parts.push(objectPart);
+              state.currentObjectPartIndex = state.parts.length - 1;
+              state.accumulatedJson = "";
+              state.currentTextPartIndex = null;
+            }
           } else {
             const textPart = {
               type: "text",
@@ -655,36 +717,89 @@ var OctavusChat = class {
               status: "streaming",
               thread
             };
-            state.parts.push(textPart);
-            state.currentTextPartIndex = state.parts.length - 1;
-            state.currentObjectPartIndex = null;
+            if (workerState) {
+              const workerPart = state.parts[workerState.partIndex];
+              workerPart.parts.push(textPart);
+              workerState.currentTextPartIndex = workerPart.parts.length - 1;
+              workerState.currentObjectPartIndex = null;
+              state.parts[workerState.partIndex] = { ...workerPart };
+            } else {
+              state.parts.push(textPart);
+              state.currentTextPartIndex = state.parts.length - 1;
+              state.currentObjectPartIndex = null;
+            }
           }
         }
         this.updateStreamingMessage();
         break;
       }
       case "text-delta": {
-        if (state.currentObjectPartIndex !== null) {
-          state.accumulatedJson += event.delta;
-          const part = state.parts[state.currentObjectPartIndex];
-          const parsed = parsePartialJson(state.accumulatedJson);
-          if (parsed !== void 0) {
-            part.partial = parsed;
-            state.parts[state.currentObjectPartIndex] = { ...part };
+        const workerId = event.workerId;
+        const workerState = workerId ? state.activeWorkers.get(workerId) : void 0;
+        if (workerState) {
+          const workerPart = state.parts[workerState.partIndex];
+          if (workerState.currentObjectPartIndex !== null) {
+            workerState.accumulatedJson += event.delta;
+            const part = workerPart.parts[workerState.currentObjectPartIndex];
+            const parsed = parsePartialJson(workerState.accumulatedJson);
+            if (parsed !== void 0) {
+              part.partial = parsed;
+              workerPart.parts[workerState.currentObjectPartIndex] = { ...part };
+            }
+          } else if (workerState.currentTextPartIndex !== null) {
+            const part = workerPart.parts[workerState.currentTextPartIndex];
+            part.text += event.delta;
+            workerPart.parts[workerState.currentTextPartIndex] = { ...part };
+          }
+          state.parts[workerState.partIndex] = { ...workerPart };
+        } else {
+          if (state.currentObjectPartIndex !== null) {
+            state.accumulatedJson += event.delta;
+            const part = state.parts[state.currentObjectPartIndex];
+            const parsed = parsePartialJson(state.accumulatedJson);
+            if (parsed !== void 0) {
+              part.partial = parsed;
+              state.parts[state.currentObjectPartIndex] = { ...part };
+            }
+          } else if (state.currentTextPartIndex !== null) {
+            const part = state.parts[state.currentTextPartIndex];
+            part.text += event.delta;
+            state.parts[state.currentTextPartIndex] = { ...part };
+          }
+          if (state.activeBlock) {
+            state.activeBlock.text += event.delta;
           }
-        } else if (state.currentTextPartIndex !== null) {
-          const part = state.parts[state.currentTextPartIndex];
-          part.text += event.delta;
-          state.parts[state.currentTextPartIndex] = { ...part };
-        }
-        if (state.activeBlock) {
-          state.activeBlock.text += event.delta;
         }
         this.updateStreamingMessage();
         break;
       }
       case "text-end": {
-        if (state.currentObjectPartIndex !== null) {
+        const workerId = event.workerId;
+        const workerState = workerId ? state.activeWorkers.get(workerId) : void 0;
+        if (workerState) {
+          const workerPart = state.parts[workerState.partIndex];
+          if (workerState.currentObjectPartIndex !== null) {
+            const part = workerPart.parts[workerState.currentObjectPartIndex];
+            try {
+              const finalObject = JSON.parse(workerState.accumulatedJson);
+              part.object = finalObject;
+              part.partial = finalObject;
+              part.status = "done";
+            } catch {
+              part.status = "error";
+              part.error = "Failed to parse response as JSON";
+            }
+            workerPart.parts[workerState.currentObjectPartIndex] = { ...part };
+            workerState.currentObjectPartIndex = null;
+            workerState.accumulatedJson = "";
+          } else if (workerState.currentTextPartIndex !== null) {
+            const part = workerPart.parts[workerState.currentTextPartIndex];
+            part.status = "done";
+            workerPart.parts[workerState.currentTextPartIndex] = { ...part };
+            workerState.currentTextPartIndex = null;
+          }
+          state.parts[workerState.partIndex] = { ...workerPart };
+        } else if (state.currentObjectPartIndex !== null) {
           const part = state.parts[state.currentObjectPartIndex];
           try {
             const finalObject = JSON.parse(state.accumulatedJson);
@@ -708,6 +823,8 @@ var OctavusChat = class {
         break;
       }
       case "tool-input-start": {
+        const workerId = event.workerId;
+        const workerState = workerId ? state.activeWorkers.get(workerId) : void 0;
         const toolPart = {
           type: "tool-call",
           toolCallId: event.toolCallId,
@@ -717,24 +834,49 @@ var OctavusChat = class {
           status: "pending",
           thread: threadForPart(state.activeBlock?.thread)
         };
-        state.parts.push(toolPart);
-        if (state.activeBlock) {
-          state.activeBlock.toolCalls.set(event.toolCallId, toolPart);
+        if (workerState) {
+          const workerPart = state.parts[workerState.partIndex];
+          workerPart.parts.push(toolPart);
+          state.parts[workerState.partIndex] = { ...workerPart };
+        } else {
+          state.parts.push(toolPart);
+          if (state.activeBlock) {
+            state.activeBlock.toolCalls.set(event.toolCallId, toolPart);
+          }
         }
         this.updateStreamingMessage();
         break;
       }
       case "tool-input-delta": {
-        const toolPartIndex = state.parts.findIndex(
-          (p) => p.type === "tool-call" && p.toolCallId === event.toolCallId
-        );
-        if (toolPartIndex >= 0) {
-          try {
-            const part = state.parts[toolPartIndex];
-            part.args = JSON.parse(event.inputTextDelta);
-            state.parts[toolPartIndex] = { ...part };
-            this.updateStreamingMessage();
-          } catch {
+        const workerId = event.workerId;
+        const workerState = workerId ? state.activeWorkers.get(workerId) : void 0;
+        if (workerState) {
+          const workerPart = state.parts[workerState.partIndex];
+          const toolPartIndex = workerPart.parts.findIndex(
+            (p) => p.type === "tool-call" && p.toolCallId === event.toolCallId
+          );
+          if (toolPartIndex >= 0) {
+            try {
+              const part = workerPart.parts[toolPartIndex];
+              part.args = JSON.parse(event.inputTextDelta);
+              workerPart.parts[toolPartIndex] = { ...part };
+              state.parts[workerState.partIndex] = { ...workerPart };
+              this.updateStreamingMessage();
+            } catch {
+            }
+          }
+        } else {
+          const toolPartIndex = state.parts.findIndex(
+            (p) => p.type === "tool-call" && p.toolCallId === event.toolCallId
+          );
+          if (toolPartIndex >= 0) {
+            try {
+              const part = state.parts[toolPartIndex];
+              part.args = JSON.parse(event.inputTextDelta);
+              state.parts[toolPartIndex] = { ...part };
+              this.updateStreamingMessage();
+            } catch {
+            }
           }
         }
         break;
@@ -742,45 +884,98 @@ var OctavusChat = class {
       case "tool-input-end":
         break;
       case "tool-input-available": {
-        const toolPartIndex = state.parts.findIndex(
-          (p) => p.type === "tool-call" && p.toolCallId === event.toolCallId
-        );
-        if (toolPartIndex >= 0) {
-          const part = state.parts[toolPartIndex];
-          part.args = event.input;
-          part.status = "running";
-          state.parts[toolPartIndex] = { ...part };
-          this.updateStreamingMessage();
+        const workerId = event.workerId;
+        const workerState = workerId ? state.activeWorkers.get(workerId) : void 0;
+        if (workerState) {
+          const workerPart = state.parts[workerState.partIndex];
+          const toolPartIndex = workerPart.parts.findIndex(
+            (p) => p.type === "tool-call" && p.toolCallId === event.toolCallId
+          );
+          if (toolPartIndex >= 0) {
+            const part = workerPart.parts[toolPartIndex];
+            part.args = event.input;
+            part.status = "running";
+            workerPart.parts[toolPartIndex] = { ...part };
+            state.parts[workerState.partIndex] = { ...workerPart };
+            this.updateStreamingMessage();
+          }
+        } else {
+          const toolPartIndex = state.parts.findIndex(
+            (p) => p.type === "tool-call" && p.toolCallId === event.toolCallId
+          );
+          if (toolPartIndex >= 0) {
+            const part = state.parts[toolPartIndex];
+            part.args = event.input;
+            part.status = "running";
+            state.parts[toolPartIndex] = { ...part };
+            this.updateStreamingMessage();
+          }
         }
         break;
       }
       case "tool-output-available": {
-        const toolPartIndex = state.parts.findIndex(
-          (p) => p.type === "tool-call" && p.toolCallId === event.toolCallId
-        );
-        if (toolPartIndex >= 0) {
-          const part = state.parts[toolPartIndex];
-          part.result = event.output;
-          part.status = "done";
-          state.parts[toolPartIndex] = { ...part };
-          this.updateStreamingMessage();
+        const workerId = event.workerId;
+        const workerState = workerId ? state.activeWorkers.get(workerId) : void 0;
+        if (workerState) {
+          const workerPart = state.parts[workerState.partIndex];
+          const toolPartIndex = workerPart.parts.findIndex(
+            (p) => p.type === "tool-call" && p.toolCallId === event.toolCallId
+          );
+          if (toolPartIndex >= 0) {
+            const part = workerPart.parts[toolPartIndex];
+            part.result = event.output;
+            part.status = "done";
+            workerPart.parts[toolPartIndex] = { ...part };
+            state.parts[workerState.partIndex] = { ...workerPart };
+            this.updateStreamingMessage();
+          }
+        } else {
+          const toolPartIndex = state.parts.findIndex(
+            (p) => p.type === "tool-call" && p.toolCallId === event.toolCallId
+          );
+          if (toolPartIndex >= 0) {
+            const part = state.parts[toolPartIndex];
+            part.result = event.output;
+            part.status = "done";
+            state.parts[toolPartIndex] = { ...part };
+            this.updateStreamingMessage();
+          }
         }
         break;
       }
       case "tool-output-error": {
-        const toolPartIndex = state.parts.findIndex(
-          (p) => p.type === "tool-call" && p.toolCallId === event.toolCallId
-        );
-        if (toolPartIndex >= 0) {
-          const part = state.parts[toolPartIndex];
-          part.error = event.error;
-          part.status = "error";
-          state.parts[toolPartIndex] = { ...part };
-          this.updateStreamingMessage();
+        const workerId = event.workerId;
+        const workerState = workerId ? state.activeWorkers.get(workerId) : void 0;
+        if (workerState) {
+          const workerPart = state.parts[workerState.partIndex];
+          const toolPartIndex = workerPart.parts.findIndex(
+            (p) => p.type === "tool-call" && p.toolCallId === event.toolCallId
+          );
+          if (toolPartIndex >= 0) {
+            const part = workerPart.parts[toolPartIndex];
+            part.error = event.error;
+            part.status = "error";
+            workerPart.parts[toolPartIndex] = { ...part };
+            state.parts[workerState.partIndex] = { ...workerPart };
+            this.updateStreamingMessage();
+          }
+        } else {
+          const toolPartIndex = state.parts.findIndex(
+            (p) => p.type === "tool-call" && p.toolCallId === event.toolCallId
+          );
+          if (toolPartIndex >= 0) {
+            const part = state.parts[toolPartIndex];
+            part.error = event.error;
+            part.status = "error";
+            state.parts[toolPartIndex] = { ...part };
+            this.updateStreamingMessage();
+          }
         }
         break;
       }
       case "source": {
+        const workerId = event.workerId;
+        const workerState = workerId ? state.activeWorkers.get(workerId) : void 0;
         const thread = threadForPart(state.activeBlock?.thread);
         let sourcePart;
         if (event.sourceType === "url") {
@@ -803,11 +998,19 @@ var OctavusChat = class {
             thread
           };
         }
-        state.parts.push(sourcePart);
+        if (workerState) {
+          const workerPart = state.parts[workerState.partIndex];
+          workerPart.parts.push(sourcePart);
+          state.parts[workerState.partIndex] = { ...workerPart };
+        } else {
+          state.parts.push(sourcePart);
+        }
         this.updateStreamingMessage();
         break;
       }
       case "file-available": {
+        const workerId = event.workerId;
+        const workerState = workerId ? state.activeWorkers.get(workerId) : void 0;
         const filePart = {
           type: "file",
           id: event.id,
@@ -818,19 +1021,83 @@ var OctavusChat = class {
           toolCallId: event.toolCallId,
           thread: threadForPart(state.activeBlock?.thread)
         };
-        state.parts.push(filePart);
+        if (workerState) {
+          const workerPart = state.parts[workerState.partIndex];
+          workerPart.parts.push(filePart);
+          state.parts[workerState.partIndex] = { ...workerPart };
+        } else {
+          state.parts.push(filePart);
+        }
         this.updateStreamingMessage();
         break;
       }
       case "resource-update":
         this.options.onResourceUpdate?.(event.name, event.value);
         break;
+      case "worker-start": {
+        const existingIndex = state.parts.findIndex(
+          (p) => p.type === "worker" && p.workerId === event.workerId
+        );
+        let partIndex;
+        if (existingIndex !== -1) {
+          const existingPart = state.parts[existingIndex];
+          existingPart.status = "running";
+          partIndex = existingIndex;
+        } else {
+          const workerPart = {
+            type: "worker",
+            workerId: event.workerId,
+            workerSlug: event.workerSlug,
+            description: event.description,
+            parts: [],
+            status: "running"
+          };
+          state.parts.push(workerPart);
+          partIndex = state.parts.length - 1;
+        }
+        const workerState = {
+          partIndex,
+          currentTextPartIndex: null,
+          currentReasoningPartIndex: null,
+          currentObjectPartIndex: null,
+          accumulatedJson: ""
+        };
+        state.activeWorkers.set(event.workerId, workerState);
+        this.updateStreamingMessage();
+        break;
+      }
+      case "worker-result": {
+        const workerState = state.activeWorkers.get(event.workerId);
+        if (workerState !== void 0) {
+          const part = state.parts[workerState.partIndex];
+          part.output = event.output;
+          part.error = event.error;
+          part.status = event.error ? "error" : "done";
+          part.parts = part.parts.map((p) => {
+            if (p.type === "text" || p.type === "reasoning") {
+              if (p.status === "streaming") {
+                return { ...p, status: "done" };
+              }
+            }
+            if (p.type === "object" && p.status === "streaming") {
+              return { ...p, status: "done" };
+            }
+            return p;
+          });
+          state.parts[workerState.partIndex] = { ...part };
+          state.activeWorkers.delete(event.workerId);
+        }
+        this.updateStreamingMessage();
+        break;
+      }
       case "finish": {
         if (event.finishReason === "client-tool-calls") {
+          this._finishEventReceived = true;
           if (this._pendingToolsByCallId.size > 0) {
             this.setStatus("awaiting-input");
           } else if (this._readyToContinue) {
             this._readyToContinue = false;
+            this._finishEventReceived = false;
             void this.continueWithClientToolResults();
           }
           return;
@@ -987,7 +1254,9 @@ var OctavusChat = class {
           args: tc.args,
           source: tc.source,
           outputVariable: tc.outputVariable,
-          blockIndex: tc.blockIndex
+          blockIndex: tc.blockIndex,
+          thread: tc.thread,
+          workerId: tc.workerId
         };
         this._pendingToolsByCallId.set(tc.toolCallId, toolState);
         const existing = this._pendingToolsByName.get(tc.toolName) ?? [];
@@ -1019,7 +1288,9 @@ var OctavusChat = class {
             toolName: tc.toolName,
             result,
             outputVariable: tc.outputVariable,
-            blockIndex: tc.blockIndex
+            blockIndex: tc.blockIndex,
+            thread: tc.thread,
+            workerId: tc.workerId
           });
           this.emitToolOutputAvailable(tc.toolCallId, result);
         } catch (err) {
@@ -1029,7 +1300,9 @@ var OctavusChat = class {
             toolName: tc.toolName,
             error: errorMessage,
             outputVariable: tc.outputVariable,
-            blockIndex: tc.blockIndex
+            blockIndex: tc.blockIndex,
+            thread: tc.thread,
+            workerId: tc.workerId
           });
           this.emitToolOutputError(tc.toolCallId, errorMessage);
         }
@@ -1040,13 +1313,20 @@ var OctavusChat = class {
           toolName: tc.toolName,
           error: errorMessage,
           outputVariable: tc.outputVariable,
-          blockIndex: tc.blockIndex
+          blockIndex: tc.blockIndex,
+          thread: tc.thread,
+          workerId: tc.workerId
         });
         this.emitToolOutputError(tc.toolCallId, errorMessage);
       }
     }
     if (this._pendingToolsByCallId.size === 0 && this._completedToolResults.length > 0) {
       this._readyToContinue = true;
+      if (this._finishEventReceived) {
+        this._readyToContinue = false;
+        this._finishEventReceived = false;
+        void this.continueWithClientToolResults();
+      }
     }
   }
 };