@paymanai/payman-typescript-ask-sdk 1.2.2 → 1.2.4

package/dist/index.native.js

@@ -234,11 +234,25 @@ function processStreamEvent(event, state) {
     }
     state.activeThinkingText = void 0;
   }
-  if ((eventType === "COMPLETED" || eventType === "WORKFLOW_COMPLETED") && event.response !== void 0) {
-    const content = extractResponseContent(event.response);
+  if (eventType === "COMPLETED" || eventType === "WORKFLOW_COMPLETED") {
+    let content = extractResponseContent(event.response);
+    const trace = event.trace && typeof event.trace === "object" ? event.trace : null;
+    if (!content && trace?.workflowMsg && typeof trace.workflowMsg === "string") {
+      content = trace.workflowMsg;
+    }
+    if (!content && trace?.aggregator && typeof trace.aggregator === "object") {
+      const agg = trace.aggregator;
+      if (typeof agg.response === "string") content = agg.response;
+      else content = extractResponseContent(agg.response);
+    }
     if (content) {
       state.accumulatedContent = content;
-      state.finalData = event.response;
+      state.finalData = event.response ?? event.trace;
+      state.hasError = false;
+      state.errorMessage = "";
+    } else {
+      state.hasError = true;
+      state.errorMessage = "WORKFLOW_FAILED";
     }
   }
   if (eventType === "STARTED" || eventType === "WORKFLOW_STARTED") ; else if (eventType === "COMPLETED" || eventType === "WORKFLOW_COMPLETED") {
@@ -248,7 +262,6 @@ function processStreamEvent(event, state) {
       }
     });
   } else if (eventType === "INTENT_ERROR") {
-    state.hasError = true;
     state.errorMessage = message || event.errorMessage || "An error occurred";
     const intentStep = state.steps.find(
       (s) => s.eventType === "INTENT_STARTED" && s.status === "in_progress"
@@ -260,6 +273,7 @@ function processStreamEvent(event, state) {
     state.hasError = true;
     state.errorMessage = message || event.errorMessage || "An error occurred";
   } else if (eventType === "ORCHESTRATOR_COMPLETED") {
+    state.inOrchestratorPhase = false;
     const orchestratorStep = state.steps.find(
       (s) => s.eventType === "ORCHESTRATOR_THINKING" && s.status === "in_progress"
     );
@@ -286,6 +300,7 @@ function processStreamEvent(event, state) {
       }
     }
   } else if (eventType === "AGGREGATOR_COMPLETED") {
+    state.inAggregatorPhase = false;
     const aggregatorStep = state.steps.find(
       (s) => s.eventType === "AGGREGATOR_THINKING" && s.status === "in_progress"
     );
@@ -299,6 +314,12 @@ function processStreamEvent(event, state) {
       }
     }
   } else if (eventType === "ORCHESTRATOR_THINKING" || eventType === "INTENT_STARTED" || eventType === "INTENT_PROGRESS" || eventType === "AGGREGATOR_THINKING") {
+    if (eventType === "ORCHESTRATOR_THINKING") {
+      state.inOrchestratorPhase = true;
+    }
+    if (eventType === "AGGREGATOR_THINKING") {
+      state.inAggregatorPhase = true;
+    }
     if (eventType === "INTENT_PROGRESS") {
       const intentStep = state.steps.find(
         (s) => s.eventType === "INTENT_STARTED" && s.status === "in_progress"
@@ -447,8 +468,10 @@ function processStreamEvent(event, state) {
     } else {
       state.currentThinkingStepId = void 0;
     }
-    state.activeThinkingText = "";
     if (state.allThinkingText) state.allThinkingText += "\n\n";
+    if (!state.inOrchestratorPhase && !state.inAggregatorPhase) {
+      state.activeThinkingText = "";
+    }
   } else if (eventType === "INTENT_THINKING_CONT") {
     const delta = event.message || "";
     if (!delta) return state;
@@ -458,23 +481,22 @@ function processStreamEvent(event, state) {
         step.thinkingText = (step.thinkingText || "") + delta;
       }
     }
-    if (state.activeThinkingText == null) state.activeThinkingText = "";
-    state.activeThinkingText += delta;
     state.allThinkingText += delta;
+    if (!state.inOrchestratorPhase && !state.inAggregatorPhase) {
+      if (state.activeThinkingText == null) state.activeThinkingText = "";
+      state.activeThinkingText += delta;
+    }
   }
   return state;
 }
 
 // src/utils/messageStateManager.ts
+var FRIENDLY_ERROR_MESSAGE = "Oops, something went wrong. Please try again.";
 function createStreamingMessageUpdate(state) {
   const hasCompletedContent = state.accumulatedContent && state.finalData !== void 0;
   return {
-    streamingContent: state.hasError ? `Oops, something went wrong. Please try again.
-
-${state.errorMessage}` : hasCompletedContent ? state.accumulatedContent : "",
-    content: state.hasError ? `Oops, something went wrong. Please try again.
-
-${state.errorMessage}` : "",
+    streamingContent: state.hasError ? FRIENDLY_ERROR_MESSAGE : hasCompletedContent ? state.accumulatedContent : "",
+    content: state.hasError ? FRIENDLY_ERROR_MESSAGE : "",
     currentMessage: state.hasError ? void 0 : state.currentMessage,
     streamProgress: state.hasError ? "error" : "processing",
     isError: state.hasError,
@@ -497,9 +519,7 @@ function createErrorMessageUpdate(error, state) {
     isError: !isAborted,
     isCancelled: isAborted,
     errorDetails: isAborted ? void 0 : error.message,
-    content: isAborted ? state.accumulatedContent || "" : state.accumulatedContent || `Oops, something went wrong. Please try again.
-
-${error.message}`,
+    content: isAborted ? state.accumulatedContent || "" : state.accumulatedContent || FRIENDLY_ERROR_MESSAGE,
     // Preserve currentMessage when cancelled so UI can show it
     currentMessage: isAborted ? state.currentMessage || "Thinking..." : void 0,
     steps: [...state.steps].map((step) => {
@@ -516,9 +536,7 @@ function createFinalMessage(streamingId, state) {
     id: streamingId,
     sessionId: state.sessionId,
     role: "assistant",
-    content: state.hasError ? `Oops, something went wrong. Please try again.
-
-${state.errorMessage}` : state.accumulatedContent || "",
+    content: state.hasError ? FRIENDLY_ERROR_MESSAGE : state.accumulatedContent || "",
     timestamp: (/* @__PURE__ */ new Date()).toISOString(),
     isStreaming: false,
     streamProgress: state.hasError ? "error" : "completed",
@@ -646,7 +664,9 @@ function useStreamManager(config, callbacks, setMessages, setIsWaitingForRespons
         userActionRequest: void 0,
         userActionPending: false,
         userActionResult: void 0,
-        allThinkingText: ""
+        allThinkingText: "",
+        inOrchestratorPhase: false,
+        inAggregatorPhase: false
       };
       const THROTTLE_MS = 120;
       const CHARS_PER_TICK = 10;
@@ -727,7 +747,7 @@ function useStreamManager(config, callbacks, setMessages, setIsWaitingForRespons
             }
             const isIntentThinkingEvent = eventType === "INTENT_THINKING" || eventType === "INTENT_THINKING_CONT";
             const rawMessage = event.message?.trim() || event.errorMessage?.trim();
-            const currentMessage = isIntentThinkingEvent ? getActiveStepMessage() || "Thinking..." : rawMessage || (event.eventType?.startsWith("USER_ACTION_") ? getEventMessage(event) : void 0);
+            const currentMessage = isIntentThinkingEvent ? getActiveStepMessage() || "Thinking..." : rawMessage || (event.eventType?.startsWith("USER_ACTION_") ? getEventMessage(event) : getActiveStepMessage() || getEventMessage(event));
             const displayThinking = state.activeThinkingText != null ? state.activeThinkingText.slice(0, displayedLengthRef.current) : state.activeThinkingText;
             setMessages(
               (prev) => prev.map(