@agent-native/core 0.84.23 → 0.84.25

package/dist/client/sse-event-processor.js

@@ -54,6 +54,14 @@ function isPreparingActionActivity(ev) {
     const label = (ev.label ?? "").trim().toLowerCase();
     return label.startsWith("preparing ") && label.includes(" action");
 }
+function isMeaningfulProgressEvent(ev, actionPreparationProgress) {
+    if (ev.type === "stream_keepalive")
+        return false;
+    if (ev.type === "activity" && isPreparingActionActivity(ev)) {
+        return actionPreparationProgress === true;
+    }
+    return true;
+}
 function baseActivityLabel(ev, tool) {
     return humanizeToolLabelText(ev.label ?? "Working", tool);
 }
@@ -110,16 +118,25 @@ function updatePreparingActionState(state, ev, now) {
     if (ev.type === "activity" && isPreparingActionActivity(ev)) {
         const tool = ev.tool?.trim() || undefined;
         if (!tool)
-            return;
+            return false;
         if (state.tool !== tool || state.startedAt === undefined) {
             state.tool = tool;
             state.startedAt = now;
+            state.lastProgressAt = undefined;
+            state.lastProgressBytes = undefined;
         }
-        // Every tool-input activity is a throttled proof the model is still
-        // streaming this action's argument. Treat it as progress so large inputs
-        // that take many seconds/minutes to stream are NOT flagged as stalled.
-        state.lastProgressAt = now;
-        return;
+        const progressBytes = activityProgressBytes(ev);
+        const previousBytes = state.lastProgressBytes ?? 0;
+        if (progressBytes !== undefined) {
+            state.lastProgressBytes = Math.max(previousBytes, progressBytes);
+        }
+        if (progressBytes !== undefined && progressBytes > previousBytes) {
+            // A byte increase is proof the model is still streaming this action's
+            // argument. Repeated zero-byte prep activity is only a heartbeat.
+            state.lastProgressAt = now;
+            return true;
+        }
+        return false;
     }
     if (ev.type === "clear" ||
         ev.type === "text" ||
@@ -131,7 +148,9 @@ function updatePreparingActionState(state, ev, now) {
         state.tool = undefined;
         state.startedAt = undefined;
         state.lastProgressAt = undefined;
+        state.lastProgressBytes = undefined;
     }
+    return undefined;
 }
 function hasStalledPreparingAction(state, now) {
     // Fire only when a tool input has gone SILENT — no further streaming deltas
@@ -140,8 +159,9 @@ function hasStalledPreparingAction(state, now) {
     // heartbeat, so an actively-streaming large output keeps resetting this and
     // survives; a genuinely stuck prep (keepalive-only, no deltas) trips it.
     return (state.tool !== undefined &&
-        state.lastProgressAt !== undefined &&
-        now - state.lastProgressAt >= SSE_ACTION_PREPARATION_STALL_TIMEOUT_MS);
+        state.startedAt !== undefined &&
+        now - (state.lastProgressAt ?? state.startedAt) >=
+            SSE_ACTION_PREPARATION_STALL_TIMEOUT_MS);
 }
 async function readChunkWithProgressTimeout(reader, lastMeaningfulEventAt) {
     const elapsed = Date.now() - lastMeaningfulEventAt;
@@ -284,6 +304,66 @@ function pendingToolNames(content) {
     }
     return { activity: [...activity], running: [...running] };
 }
+function contentSnapshot(content) {
+    return content.map((part) => {
+        if (part.type === "text")
+            return { ...part };
+        return {
+            ...part,
+            args: { ...part.args },
+            ...(part.mcpApp ? { mcpApp: { ...part.mcpApp } } : {}),
+            ...(part.chatUI ? { chatUI: { ...part.chatUI } } : {}),
+            ...(part.approval ? { approval: { ...part.approval } } : {}),
+            ...(part.structuredMeta
+                ? { structuredMeta: { ...part.structuredMeta } }
+                : {}),
+        };
+    });
+}
+function repeatSignatureValue(value) {
+    try {
+        return JSON.stringify(value);
+    }
+    catch {
+        return String(value ?? "");
+    }
+}
+function completedToolRepeatSignature(part) {
+    if (part.result === undefined ||
+        part.activity === true ||
+        part.approval ||
+        part.mcpApp ||
+        part.chatUI ||
+        part.structuredMeta) {
+        return null;
+    }
+    return [
+        part.toolName,
+        part.argsText,
+        repeatSignatureValue(part.args),
+        part.result,
+        part.isError === true ? "error" : "",
+        part.completedSideEffect === true ? "side-effect" : "",
+    ].join("\u0000");
+}
+function coalesceCompletedToolRepeat(content, completedIndex) {
+    const current = content[completedIndex];
+    const previous = content[completedIndex - 1];
+    if (!current ||
+        !previous ||
+        current.type !== "tool-call" ||
+        previous.type !== "tool-call") {
+        return;
+    }
+    const currentSignature = completedToolRepeatSignature(current);
+    if (!currentSignature ||
+        currentSignature !== completedToolRepeatSignature(previous)) {
+        return;
+    }
+    previous.repeatCount =
+        (previous.repeatCount ?? 1) + (current.repeatCount ?? 1);
+    content.splice(completedIndex, 1);
+}
 function formatToolNames(tools) {
     const names = tools.map(humanizeToolName);
     if (names.length === 0)
@@ -366,7 +446,7 @@ export function processEvent(ev, content, toolCallCounter, tabId, state) {
         }
         return {
             action: "yield",
-            result: { content: [...content] },
+            result: { content: contentSnapshot(content) },
         };
     }
     if (ev.type === "stream_keepalive") {
@@ -399,7 +479,7 @@ export function processEvent(ev, content, toolCallCounter, tabId, state) {
         }
         return {
             action: "yield",
-            result: { content: [...content] },
+            result: { content: contentSnapshot(content) },
         };
     }
     if (ev.type === "tool_start") {
@@ -449,7 +529,7 @@ export function processEvent(ev, content, toolCallCounter, tabId, state) {
         }
         return {
             action: "yield",
-            result: { content: [...content] },
+            result: { content: contentSnapshot(content) },
         };
     }
     if (ev.type === "approval_required") {
@@ -470,7 +550,7 @@ export function processEvent(ev, content, toolCallCounter, tabId, state) {
         }
         return {
             action: "yield",
-            result: { content: [...content] },
+            result: { content: contentSnapshot(content) },
         };
     }
     if (ev.type === "tool_done") {
@@ -506,11 +586,12 @@ export function processEvent(ev, content, toolCallCounter, tabId, state) {
                 if (part.activity !== true && part.isError !== true) {
                     markCompletedToolAfterAssistantText(state, part.toolName);
                 }
+                coalesceCompletedToolRepeat(content, doneIdx);
             }
         }
         return {
             action: "yield",
-            result: { content: [...content] },
+            result: { content: contentSnapshot(content) },
         };
     }
     if (ev.type === "agent_call") {
@@ -538,7 +619,7 @@ export function processEvent(ev, content, toolCallCounter, tabId, state) {
         }
         return {
             action: "yield",
-            result: { content: [...content] },
+            result: { content: contentSnapshot(content) },
         };
     }
     if (ev.type === "agent_call_text") {
@@ -555,7 +636,7 @@ export function processEvent(ev, content, toolCallCounter, tabId, state) {
         }
         return {
             action: "yield",
-            result: { content: [...content] },
+            result: { content: contentSnapshot(content) },
         };
     }
     // ─── Agent task events (sub-agent chips) ─────────────────────────
@@ -591,7 +672,7 @@ export function processEvent(ev, content, toolCallCounter, tabId, state) {
         return {
             action: "missing_api_key",
             result: {
-                content: [...content],
+                content: contentSnapshot(content),
                 status: { type: "incomplete", reason: "error" },
                 metadata: { custom: { runError } },
             },
@@ -693,7 +774,7 @@ export function processEvent(ev, content, toolCallCounter, tabId, state) {
         return {
             action: "error",
             result: {
-                content: [...content],
+                content: contentSnapshot(content),
                 status: { type: "incomplete", reason: "error" },
                 metadata: { custom: { runError } },
             },
@@ -726,7 +807,7 @@ export function processEvent(ev, content, toolCallCounter, tabId, state) {
             return {
                 action: "error",
                 result: {
-                    content: [...content],
+                    content: contentSnapshot(content),
                     status: { type: "incomplete", reason: "error" },
                     metadata: { custom: { runError } },
                 },
@@ -743,7 +824,7 @@ export function processEvent(ev, content, toolCallCounter, tabId, state) {
             return {
                 action: "done",
                 result: {
-                    content: [...content],
+                    content: contentSnapshot(content),
                     status: { type: "complete", reason: "stop" },
                     metadata: {
                         custom: {
@@ -759,7 +840,7 @@ export function processEvent(ev, content, toolCallCounter, tabId, state) {
         }
         return {
             action: "done",
-            result: { content: [...content] },
+            result: { content: contentSnapshot(content) },
         };
     }
     return { action: "continue" };
@@ -813,13 +894,28 @@ export async function* readSSEStream(body, content, toolCallCounter, tabId, onSe
     };
     try {
         while (true) {
-            const { done, value } = await readChunkWithProgressTimeout(reader, lastMeaningfulEventAt);
+            let readResult;
+            try {
+                readResult = await readChunkWithProgressTimeout(reader, lastMeaningfulEventAt);
+            }
+            catch (err) {
+                if (err instanceof AgentAutoContinueSignal) {
+                    throw new AgentAutoContinueSignal({
+                        reason: err.reason,
+                        maxIterations: err.maxIterations,
+                        activityTrail: [...activityTrail],
+                        errorInfo: err.errorInfo,
+                    });
+                }
+                throw err;
+            }
+            const { done, value } = readResult;
             if (done)
                 break;
             buf += decoder.decode(value, { stream: true });
             const lines = buf.split("\n");
             buf = lines.pop() ?? "";
-            let sawDataEvent = false;
+            let sawProgressEvent = false;
             for (const line of lines) {
                 if (!line.startsWith("data: "))
                     continue;
@@ -833,10 +929,12 @@ export async function* readSSEStream(body, content, toolCallCounter, tabId, onSe
                 catch {
                     continue;
                 }
-                sawDataEvent = true;
                 const now = Date.now();
-                lastMeaningfulEventAt = now;
-                updatePreparingActionState(preparingActionState, ev, now);
+                const actionPreparationProgress = updatePreparingActionState(preparingActionState, ev, now);
+                if (isMeaningfulProgressEvent(ev, actionPreparationProgress)) {
+                    sawProgressEvent = true;
+                    lastMeaningfulEventAt = now;
+                }
                 // Track sequence number for reconnection
                 if (ev.seq !== undefined && onSeq) {
                     onSeq(ev.seq);
@@ -886,9 +984,12 @@ export async function* readSSEStream(body, content, toolCallCounter, tabId, onSe
                     return;
                 }
             }
-            if (!sawDataEvent &&
+            if (!sawProgressEvent &&
                 Date.now() - lastMeaningfulEventAt >= SSE_NO_PROGRESS_TIMEOUT_MS) {
-                throw new AgentAutoContinueSignal({ reason: "no_progress" });
+                throw new AgentAutoContinueSignal({
+                    reason: "no_progress",
+                    activityTrail: [...activityTrail],
+                });
             }
         }
     }
@@ -933,14 +1034,28 @@ export async function readSSEStreamRaw(body, content, toolCallCounter, tabId, on
     let emittedLatestContent = false;
     try {
         while (true) {
-            const { done, value } = await readChunkWithProgressTimeout(reader, lastMeaningfulEventAt);
+            let readResult;
+            try {
+                readResult = await readChunkWithProgressTimeout(reader, lastMeaningfulEventAt);
+            }
+            catch (err) {
+                if (err instanceof AgentAutoContinueSignal) {
+                    throw new AgentAutoContinueSignal({
+                        reason: err.reason,
+                        maxIterations: err.maxIterations,
+                        activityTrail: [...activityTrail],
+                        errorInfo: err.errorInfo,
+                    });
+                }
+                throw err;
+            }
+            const { done, value } = readResult;
             if (done)
                 break;
             buf += decoder.decode(value, { stream: true });
             const lines = buf.split("\n");
             buf = lines.pop() ?? "";
-            let updated = false;
-            let sawDataEvent = false;
+            let sawProgressEvent = false;
             for (const line of lines) {
                 if (!line.startsWith("data: "))
                     continue;
@@ -954,10 +1069,12 @@ export async function readSSEStreamRaw(body, content, toolCallCounter, tabId, on
                 catch {
                     continue;
                 }
-                sawDataEvent = true;
                 const now = Date.now();
-                lastMeaningfulEventAt = now;
-                updatePreparingActionState(preparingActionState, ev, now);
+                const actionPreparationProgress = updatePreparingActionState(preparingActionState, ev, now);
+                if (isMeaningfulProgressEvent(ev, actionPreparationProgress)) {
+                    sawProgressEvent = true;
+                    lastMeaningfulEventAt = now;
+                }
                 if (ev.seq !== undefined && onSeq) {
                     onSeq(ev.seq);
                 }
@@ -991,16 +1108,18 @@ export async function readSSEStreamRaw(body, content, toolCallCounter, tabId, on
                     action === "done" ||
                     action === "error" ||
                     action === "missing_api_key") {
-                    updated = true;
+                    onUpdate(contentSnapshot(content));
+                    emittedLatestContent = true;
                 }
                 if (action === "auto_continue") {
-                    onUpdate([...content]);
+                    onUpdate(contentSnapshot(content));
+                    emittedLatestContent = true;
                     throw new AgentAutoContinueSignal(autoContinue
                         ? { ...autoContinue, activityTrail: [...activityTrail] }
                         : { reason: "stream_ended", activityTrail: [...activityTrail] });
                 }
                 if (hasStalledPreparingAction(preparingActionState, Date.now())) {
-                    onUpdate([...content]);
+                    onUpdate(contentSnapshot(content));
                     throw new AgentAutoContinueSignal({
                         reason: "no_progress",
                         activityTrail: [...activityTrail],
@@ -1009,17 +1128,15 @@ export async function readSSEStreamRaw(body, content, toolCallCounter, tabId, on
                 if (action === "done" ||
                     action === "error" ||
                     action === "missing_api_key") {
-                    onUpdate([...content]);
                     return;
                 }
             }
-            if (updated) {
-                onUpdate([...content]);
-                emittedLatestContent = true;
-            }
-            if (!sawDataEvent &&
+            if (!sawProgressEvent &&
                 Date.now() - lastMeaningfulEventAt >= SSE_NO_PROGRESS_TIMEOUT_MS) {
-                throw new AgentAutoContinueSignal({ reason: "no_progress" });
+                throw new AgentAutoContinueSignal({
+                    reason: "no_progress",
+                    activityTrail: [...activityTrail],
+                });
             }
         }
     }
@@ -1031,8 +1148,9 @@ export async function readSSEStreamRaw(body, content, toolCallCounter, tabId, on
             // See readSSEStream: cancellation may race lock release in browsers.
         }
     }
-    if (content.length > 0 && !emittedLatestContent)
-        onUpdate([...content]);
+    if (content.length > 0 && !emittedLatestContent) {
+        onUpdate(contentSnapshot(content));
+    }
     throw new AgentAutoContinueSignal({ reason: "stream_ended" });
 }
 //# sourceMappingURL=sse-event-processor.js.map