@parhelia/core 0.4.12796 → 0.4.12818

package/dist/editor/ai/terminal/useAgentDraftInitializer.js

@@ -1,6 +1,7 @@
-import { useCallback, useRef, } from "react";
+import { useCallback, useEffect, useRef, } from "react";
 import { sanitizeAgentMetadata } from "./agentSessionMetadata";
 import { normalizeAgentId } from "../agentMessageHelpers";
+import { toEditorContextSnapshot } from "./agentContextMerge";
 function getInitialProfileId(initialMetadata) {
     try {
         return initialMetadata?.additionalData?.profileId;
@@ -22,9 +23,9 @@ function getInitialProfileName(initialMetadata) {
 function mergeInitialMetadataWithLocalContext(input) {
     const { initialMetadata, localContext } = input;
     if (!initialMetadata) {
-        return localContext;
+        return localContext ? { ...localContext } : null;
     }
-    const base = { ...initialMetadata };
+    const base = { ...localContext, ...initialMetadata };
     if (!localContext) {
         return base;
     }
@@ -52,9 +53,11 @@ function mergeInitialMetadataWithLocalContext(input) {
     return base;
 }
 export function useAgentDraftInitializer(input) {
-    const { agentStub, initialMetadata, messagesRef, actions, setAgent, setAgentMetadata, setError, setPrompt, } = input;
+    const { agentStub, initialMetadata, profiles, profilesLoading = false, currentItemDescriptor, buildEditorContextPayload, onDraftMetadataUpdate, messagesRef, actions, setAgent, setAgentMetadata, setError, setPrompt, } = input;
     const initializedDraftAgentIdRef = useRef(null);
-    return useCallback(() => {
+    const creationContextRef = useRef(null);
+    const waitingForProfilesRef = useRef(false);
+    const initialize = useCallback(() => {
         const draftAgentId = normalizeAgentId(agentStub.id);
         const hasExistingMessages = messagesRef.current.some((message) => normalizeAgentId(message.agentId) === draftAgentId);
         if (agentStub.status !== "new" || agentStub.userId) {
@@ -74,9 +77,28 @@ export function useAgentDraftInitializer(input) {
             actions.finishReady();
             return true;
         }
+        // Freeze the launch context before profile loading or navigation can change
+        // the editor. Keep it local until we know whether the profile opts in.
+        if (creationContextRef.current?.agentId !== draftAgentId) {
+            creationContextRef.current = {
+                agentId: draftAgentId,
+                context: structuredClone(buildEditorContextPayload(currentItemDescriptor)),
+            };
+        }
+        if (profilesLoading) {
+            waitingForProfilesRef.current = true;
+            return true;
+        }
+        waitingForProfilesRef.current = false;
         initializedDraftAgentIdRef.current = draftAgentId;
-        const initialProfileId = getInitialProfileId(initialMetadata);
-        const initialProfileName = getInitialProfileName(initialMetadata);
+        const initialProfileId = getInitialProfileId(initialMetadata) || agentStub.profileId;
+        const initialProfileName = getInitialProfileName(initialMetadata) || agentStub.profileName;
+        const profile = profiles.find((candidate) => candidate.id?.toLowerCase() === initialProfileId?.toLowerCase());
+        const capturedContext = profile?.captureEditorContextOnCreate
+            ? (initialMetadata?.editorContext?.startedFrom ??
+                toEditorContextSnapshot(creationContextRef.current.context) ??
+                {})
+            : undefined;
         setAgent({
             ...agentStub,
             messages: [],
@@ -104,17 +126,22 @@ export function useAgentDraftInitializer(input) {
         actions.replaceTranscript([]);
         setError(null);
         actions.finishReady();
-        // Editor context is no longer auto-seeded on create. The user opts in to
-        // the currently viewed page/component/field via the "include currently
-        // viewed page" checkbox, or pins it explicitly. Only explicit invocation
-        // context carried on initialMetadata (e.g. a review comment or field) is
-        // kept here.
         const nextMetadata = mergeInitialMetadataWithLocalContext({
             initialMetadata,
-            localContext: null,
+            localContext: capturedContext ?? null,
         });
+        if (nextMetadata && capturedContext) {
+            nextMetadata.editorContext = {
+                ...nextMetadata.editorContext,
+                startedFrom: capturedContext,
+            };
+        }
         if (nextMetadata) {
-            setAgentMetadata(sanitizeAgentMetadata(nextMetadata));
+            const sanitizedMetadata = sanitizeAgentMetadata(nextMetadata);
+            setAgentMetadata(sanitizedMetadata);
+            if (capturedContext && sanitizedMetadata) {
+                onDraftMetadataUpdate?.(sanitizedMetadata);
+            }
             try {
                 const maybePrompt = nextMetadata?.additionalData
                     ?.initialPrompt;
@@ -129,6 +156,11 @@ export function useAgentDraftInitializer(input) {
         actions,
         agentStub,
         initialMetadata,
+        profiles,
+        profilesLoading,
+        currentItemDescriptor,
+        buildEditorContextPayload,
+        onDraftMetadataUpdate,
         initializedDraftAgentIdRef,
         messagesRef,
         setAgent,
@@ -136,5 +168,10 @@ export function useAgentDraftInitializer(input) {
         setError,
         setPrompt,
     ]);
+    useEffect(() => {
+        if (waitingForProfilesRef.current && !profilesLoading)
+            initialize();
+    }, [initialize, profilesLoading]);
+    return initialize;
 }
 //# sourceMappingURL=useAgentDraftInitializer.js.map

package/dist/editor/ai/terminal/useAgentDraftInitializer.js.map

@@ -1 +1 @@
-{"version":3,"file":"useAgentDraftInitializer.js","sourceRoot":"","sources":["../../../../src/editor/ai/terminal/useAgentDraftInitializer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useAgentDraftInitializer.js","sourceRoot":"","sources":["../../../../src/editor/ai/terminal/useAgentDraftInitializer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,SAAS,EACT,MAAM,GAGP,MAAM,OAAO,CAAC;AAQf,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAE/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAW9D,SAAS,mBAAmB,CAAC,eAA0C;IACrE,IAAI,CAAC;QACH,OAAQ,eAAuB,EAAE,cAAc,EAAE,SAC7B,CAAC;IACvB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED,SAAS,qBAAqB,CAAC,eAA0C;IACvE,IAAI,CAAC;QACH,OAAO,CACH,eAAuB,EAAE,cAAc,EAAE,WACtB;YACpB,eAAuB,EAAE,OAAO;YACjC,SAAS,CACV,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED,SAAS,oCAAoC,CAAC,KAG7C;IACC,MAAM,EAAE,eAAe,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC;IAEhD,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,OAAO,YAAY,CAAC,CAAC,CAAC,EAAE,GAAG,YAAY,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IACnD,CAAC;IAED,MAAM,IAAI,GAAkB,EAAE,GAAG,YAAY,EAAE,GAAG,eAAe,EAAE,CAAC;IAEpE,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,YAAY,CAAC,KAAK,IAAI,YAAY,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QACpD,MAAM,WAAW,GAAU,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5E,MAAM,YAAY,GAAG,IAAI,GAAG,CAC1B,WAAW,CAAC,GAAG,CACb,CAAC,IAAS,EAAE,EAAE,CACZ,GAAG,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,QAAQ,IAAI,EAAE,IAAI,IAAI,CAAC,OAAO,IAAI,EAAE,EAAE,CAC5D,CACF,CAAC;QACF,MAAM,SAAS,GAAG,YAAY,CAAC,KAAK,CAAC,MAAM,CACzC,CAAC,IAAS,EAAE,EAAE,CACZ,CAAC,YAAY,CAAC,GAAG,CACf,GAAG,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,QAAQ,IAAI,EAAE,IAAI,IAAI,CAAC,OAAO,IAAI,EAAE,EAAE,CAC1D,CACJ,CAAC;QACF,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;YACrB,IAAI,CAAC,KAAK,GAAG,CAAC,GAAG,WAAW,EAAE,GAAG,SAAS,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC;IAED,IAAI,YAAY,CAAC,UAAU,IAAI,YAAY,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;QAC9D,MAAM,iBAAiB,GAAU,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC;YAC7D,CAAC,CAAC,IAAI,CAAC,UAAU;YACjB,CAAC,CAAC,EAAE,CAAC;QACP,MAAM,WAAW,GAAG,IAAI,GAAG,CACzB,iBAAiB,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,WAAW,CAAC,CAC5D,CAAC;QACF,MAAM,SAAS,GAAG,YAAY,CAAC,UAAU,CAAC,MAAM,CAC9C,CAAC,SAAc,EAAE,EAAE,CACjB,CAAC,CAAC,SAAS,EAAE,WAAW,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,WAAW,CAAC,CACtE,CAAC;QACF,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;YACrB,IAAI,CAAC,UAAU,GAAG,CAAC,GAAG,iBAAiB,EAAE,GAAG,SAAS,CAAC,CAAC;QACzD,CAAC;IACH,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,YAAY,CAAC,KAAK,EAAE,CAAC;QACtC,IAAI,CAAC,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC;IAClC,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,KAgBxC;IACC,MAAM,EACJ,SAAS,EACT,eAAe,EACf,QAAQ,EACR,eAAe,GAAG,KAAK,EACvB,qBAAqB,EACrB,yBAAyB,EACzB,qBAAqB,EACrB,WAAW,EACX,OAAO,EACP,QAAQ,EACR,gBAAgB,EAChB,QAAQ,EACR,SAAS,GACV,GAAG,KAAK,CAAC;IACV,MAAM,0BAA0B,GAAG,MAAM,CAAgB,IAAI,CAAC,CAAC;IAC/D,MAAM,kBAAkB,GAAG,MAAM,CAGvB,IAAI,CAAC,CAAC;IAChB,MAAM,qBAAqB,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAE5C,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,EAAE;QAClC,MAAM,YAAY,GAAG,gBAAgB,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QACpD,MAAM,mBAAmB,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,CAClD,CAAC,OAAO,EAAE,EAAE,CAAC,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,YAAY,CAChE,CAAC;QACF,IAAI,SAAS,CAAC,MAAM,KAAK,KAAK,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;YACnD,0BAA0B,CAAC,OAAO,GAAG,IAAI,CAAC;YAC1C,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,mBAAmB;YAAE,OAAO,KAAK,CAAC;QAEtC,yEAAyE;QACzE,0EAA0E;QAC1E,0EAA0E;QAC1E,iDAAiD;QACjD,IAAI,0BAA0B,CAAC,OAAO,KAAK,YAAY,EAAE,CAAC;YACxD,yEAAyE;YACzE,oEAAoE;YACpE,0EAA0E;YAC1E,OAAO,CAAC,WAAW,EAAE,CAAC;YACtB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,4EAA4E;QAC5E,uEAAuE;QACvE,IAAI,kBAAkB,CAAC,OAAO,EAAE,OAAO,KAAK,YAAY,EAAE,CAAC;YACzD,kBAAkB,CAAC,OAAO,GAAG;gBAC3B,OAAO,EAAE,YAAY;gBACrB,OAAO,EAAE,eAAe,CACtB,yBAAyB,CAAC,qBAAqB,CAAC,CACjD;aACF,CAAC;QACJ,CAAC;QACD,IAAI,eAAe,EAAE,CAAC;YACpB,qBAAqB,CAAC,OAAO,GAAG,IAAI,CAAC;YACrC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,qBAAqB,CAAC,OAAO,GAAG,KAAK,CAAC;QACtC,0BAA0B,CAAC,OAAO,GAAG,YAAY,CAAC;QAElD,MAAM,gBAAgB,GACpB,mBAAmB,CAAC,eAAe,CAAC,IAAI,SAAS,CAAC,SAAS,CAAC;QAC9D,MAAM,kBAAkB,GACtB,qBAAqB,CAAC,eAAe,CAAC,IAAI,SAAS,CAAC,WAAW,CAAC;QAClE,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAC3B,CAAC,SAAS,EAAE,EAAE,CACZ,SAAS,CAAC,EAAE,EAAE,WAAW,EAAE,KAAK,gBAAgB,EAAE,WAAW,EAAE,CAClE,CAAC;QACF,MAAM,eAAe,GAAG,OAAO,EAAE,4BAA4B;YAC3D,CAAC,CAAC,CAAC,eAAe,EAAE,aAAa,EAAE,WAAW;gBAC5C,uBAAuB,CAAC,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC;gBAC3D,EAAE,CAAC;YACL,CAAC,CAAC,SAAS,CAAC;QAEd,QAAQ,CAAC;YACP,GAAG,SAAS;YACZ,QAAQ,EAAE,EAAE;YACZ,MAAM,EAAE,KAAK;YACb,WAAW,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YACrC,WAAW,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YACrC,EAAE,EAAE,SAAS,CAAC,EAAE;YAChB,IAAI,EAAE,SAAS,CAAC,IAAI;YACpB,KAAK,EAAE,EAAE;YACT,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,gBAAgB,IAAI,EAAE;YACjC,WAAW,EAAE,kBAAkB,IAAI,EAAE;YACrC,eAAe,EAAE,CAAC;YAClB,gBAAgB,EAAE,CAAC;YACnB,iBAAiB,EAAE,CAAC;YACpB,sBAAsB,EAAE,CAAC;YACzB,mBAAmB,EAAE,CAAC;YACtB,oBAAoB,EAAE,CAAC;YACvB,yBAAyB,EAAE,CAAC;YAC5B,cAAc,EAAE,CAAC;YACjB,SAAS,EAAE,CAAC;YACZ,YAAY,EAAE,CAAC;SAChB,CAAC,CAAC;QAEH,WAAW,CAAC,OAAO,GAAG,EAAE,CAAC;QACzB,OAAO,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC;QAC9B,QAAQ,CAAC,IAAI,CAAC,CAAC;QACf,OAAO,CAAC,WAAW,EAAE,CAAC;QAEtB,MAAM,YAAY,GAAG,oCAAoC,CAAC;YACxD,eAAe;YACf,YAAY,EAAE,eAAe,IAAI,IAAI;SACtC,CAAC,CAAC;QAEH,IAAI,YAAY,IAAI,eAAe,EAAE,CAAC;YACpC,YAAY,CAAC,aAAa,GAAG;gBAC3B,GAAG,YAAY,CAAC,aAAa;gBAC7B,WAAW,EAAE,eAAe;aAC7B,CAAC;QACJ,CAAC;QAED,IAAI,YAAY,EAAE,CAAC;YACjB,MAAM,iBAAiB,GAAG,qBAAqB,CAAC,YAAY,CAAC,CAAC;YAC9D,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;YACpC,IAAI,eAAe,IAAI,iBAAiB,EAAE,CAAC;gBACzC,qBAAqB,EAAE,CAAC,iBAAiB,CAAC,CAAC;YAC7C,CAAC;YAED,IAAI,CAAC;gBACH,MAAM,WAAW,GAAI,YAAoB,EAAE,cAAc;oBACvD,EAAE,aAAa,CAAC;gBAClB,IAAI,OAAO,WAAW,KAAK,QAAQ,IAAI,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC;oBAC1D,SAAS,CAAC,WAAW,CAAC,CAAC;gBACzB,CAAC;YACH,CAAC;YAAC,MAAM,CAAC,CAAA,CAAC;QACZ,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC,EAAE;QACD,OAAO;QACP,SAAS;QACT,eAAe;QACf,QAAQ;QACR,eAAe;QACf,qBAAqB;QACrB,yBAAyB;QACzB,qBAAqB;QACrB,0BAA0B;QAC1B,WAAW;QACX,QAAQ;QACR,gBAAgB;QAChB,QAAQ;QACR,SAAS;KACV,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,qBAAqB,CAAC,OAAO,IAAI,CAAC,eAAe;YAAE,UAAU,EAAE,CAAC;IACtE,CAAC,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC;IAElC,OAAO,UAAU,CAAC;AACpB,CAAC"}

package/dist/editor/ai/terminal/useAgentLoadPipeline.d.ts

@@ -12,6 +12,8 @@ export declare function useAgentLoadPipeline(input: {
     agentStub: DraftInput["agentStub"];
     initialMetadata: DraftInput["initialMetadata"];
     profiles: DraftInput["profiles"];
+    profilesLoading?: boolean;
+    onDraftMetadataUpdate?: DraftInput["onDraftMetadataUpdate"];
     currentItemDescriptor: DraftInput["currentItemDescriptor"];
     buildEditorContextPayload: DraftInput["buildEditorContextPayload"];
     messagesRef: DraftInput["messagesRef"];

package/dist/editor/ai/terminal/useAgentLoadPipeline.js

@@ -7,11 +7,13 @@ import { useAgentLoadLifecycle } from "./useAgentLoadLifecycle";
 import { useAgentOperationHistoryLoader } from "./useAgentOperationHistoryLoader";
 import { useAgentServerReconciler } from "./useAgentServerReconciler";
 export function useAgentLoadPipeline(input) {
-    const { agent, agentStub, initialMetadata, profiles, currentItemDescriptor, buildEditorContextPayload, messagesRef, sessionActions, setAgent, setAgentMetadata, setError, setPrompt, onAgentNotFound, isStoppingRef, isWaitingRef, setIsWaitingForResponse, setIsConnecting, setIsAgentThinking, seenMessageIdsRef, sanitizeAgentMetadata, effectiveIsVisible, sessionCostLimitExceeded, sessionLiveTotalCost, } = input;
+    const { agent, agentStub, initialMetadata, profiles, profilesLoading, onDraftMetadataUpdate, currentItemDescriptor, buildEditorContextPayload, messagesRef, sessionActions, setAgent, setAgentMetadata, setError, setPrompt, onAgentNotFound, isStoppingRef, isWaitingRef, setIsWaitingForResponse, setIsConnecting, setIsAgentThinking, seenMessageIdsRef, sanitizeAgentMetadata, effectiveIsVisible, sessionCostLimitExceeded, sessionLiveTotalCost, } = input;
     const initializeDraftAgent = useAgentDraftInitializer({
         agentStub,
         initialMetadata,
         profiles,
+        profilesLoading,
+        onDraftMetadataUpdate,
         currentItemDescriptor,
         buildEditorContextPayload,
         messagesRef,

package/dist/editor/ai/terminal/useAgentLoadPipeline.js.map

@@ -1 +1 @@
-{"version":3,"file":"useAgentLoadPipeline.js","sourceRoot":"","sources":["../../../../src/editor/ai/terminal/useAgentLoadPipeline.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,8BAA8B,EAAE,MAAM,kCAAkC,CAAC;AAClF,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAQtE,MAAM,UAAU,oBAAoB,CAAC,KAwBpC;IACC,MAAM,EACJ,KAAK,EACL,SAAS,EACT,eAAe,EACf,QAAQ,EACR,qBAAqB,EACrB,yBAAyB,EACzB,WAAW,EACX,cAAc,EACd,QAAQ,EACR,gBAAgB,EAChB,QAAQ,EACR,SAAS,EACT,eAAe,EACf,aAAa,EACb,YAAY,EACZ,uBAAuB,EACvB,eAAe,EACf,kBAAkB,EAClB,iBAAiB,EACjB,qBAAqB,EACrB,kBAAkB,EAClB,wBAAwB,EACxB,oBAAoB,GACrB,GAAG,KAAK,CAAC;IAEV,MAAM,oBAAoB,GAAG,wBAAwB,CAAC;QACpD,SAAS;QACT,eAAe;QACf,QAAQ;QACR,qBAAqB;QACrB,yBAAyB;QACzB,WAAW;QACX,OAAO,EAAE,cAAc;QACvB,QAAQ;QACR,gBAAgB;QAChB,QAAQ;QACR,SAAS;KACV,CAAC,CAAC;IACH,MAAM,kBAAkB,GAAG,0BAA0B,CAAC;QACpD,aAAa;QACb,YAAY;QACZ,uBAAuB;QACvB,eAAe;QACf,kBAAkB;KACnB,CAAC,CAAC;IACH,MAAM,eAAe,GAAG,wBAAwB,CAAC;QAC/C,OAAO,EAAE,SAAS,CAAC,EAAE;QACrB,WAAW;QACX,OAAO,EAAE,cAAc;QACvB,QAAQ;QACR,QAAQ;QACR,eAAe;KAChB,CAAC,CAAC;IACH,MAAM,SAAS,GAAG,cAAc,CAAC;QAC/B,SAAS;QACT,eAAe;QACf,OAAO,EAAE,cAAc;QACvB,WAAW;QACX,iBAAiB;QACjB,aAAa;QACb,oBAAoB;QACpB,kBAAkB;QAClB,qBAAqB;QACrB,eAAe;QACf,QAAQ;QACR,gBAAgB;QAChB,QAAQ;KACT,CAAC,CAAC;IACH,MAAM,uBAAuB,GAAG,wBAAwB,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAExE,qBAAqB,CAAC;QACpB,KAAK;QACL,OAAO,EAAE,SAAS,CAAC,EAAE;QACrB,kBAAkB;QAClB,SAAS;KACV,CAAC,CAAC;IAEH,8BAA8B,CAAC;QAC7B,KAAK;QACL,OAAO,EAAE,cAAc;KACxB,CAAC,CAAC;IAEH,wBAAwB,CAAC;QACvB,KAAK;QACL,wBAAwB;QACxB,oBAAoB;QACpB,OAAO,EAAE,cAAc;KACxB,CAAC,CAAC;IAEH,OAAO;QACL,SAAS;QACT,uBAAuB;KACxB,CAAC;AACJ,CAAC"}
+{"version":3,"file":"useAgentLoadPipeline.js","sourceRoot":"","sources":["../../../../src/editor/ai/terminal/useAgentLoadPipeline.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,8BAA8B,EAAE,MAAM,kCAAkC,CAAC;AAClF,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAQtE,MAAM,UAAU,oBAAoB,CAAC,KA0BpC;IACC,MAAM,EACJ,KAAK,EACL,SAAS,EACT,eAAe,EACf,QAAQ,EACR,eAAe,EACf,qBAAqB,EACrB,qBAAqB,EACrB,yBAAyB,EACzB,WAAW,EACX,cAAc,EACd,QAAQ,EACR,gBAAgB,EAChB,QAAQ,EACR,SAAS,EACT,eAAe,EACf,aAAa,EACb,YAAY,EACZ,uBAAuB,EACvB,eAAe,EACf,kBAAkB,EAClB,iBAAiB,EACjB,qBAAqB,EACrB,kBAAkB,EAClB,wBAAwB,EACxB,oBAAoB,GACrB,GAAG,KAAK,CAAC;IAEV,MAAM,oBAAoB,GAAG,wBAAwB,CAAC;QACpD,SAAS;QACT,eAAe;QACf,QAAQ;QACR,eAAe;QACf,qBAAqB;QACrB,qBAAqB;QACrB,yBAAyB;QACzB,WAAW;QACX,OAAO,EAAE,cAAc;QACvB,QAAQ;QACR,gBAAgB;QAChB,QAAQ;QACR,SAAS;KACV,CAAC,CAAC;IACH,MAAM,kBAAkB,GAAG,0BAA0B,CAAC;QACpD,aAAa;QACb,YAAY;QACZ,uBAAuB;QACvB,eAAe;QACf,kBAAkB;KACnB,CAAC,CAAC;IACH,MAAM,eAAe,GAAG,wBAAwB,CAAC;QAC/C,OAAO,EAAE,SAAS,CAAC,EAAE;QACrB,WAAW;QACX,OAAO,EAAE,cAAc;QACvB,QAAQ;QACR,QAAQ;QACR,eAAe;KAChB,CAAC,CAAC;IACH,MAAM,SAAS,GAAG,cAAc,CAAC;QAC/B,SAAS;QACT,eAAe;QACf,OAAO,EAAE,cAAc;QACvB,WAAW;QACX,iBAAiB;QACjB,aAAa;QACb,oBAAoB;QACpB,kBAAkB;QAClB,qBAAqB;QACrB,eAAe;QACf,QAAQ;QACR,gBAAgB;QAChB,QAAQ;KACT,CAAC,CAAC;IACH,MAAM,uBAAuB,GAAG,wBAAwB,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAExE,qBAAqB,CAAC;QACpB,KAAK;QACL,OAAO,EAAE,SAAS,CAAC,EAAE;QACrB,kBAAkB;QAClB,SAAS;KACV,CAAC,CAAC;IAEH,8BAA8B,CAAC;QAC7B,KAAK;QACL,OAAO,EAAE,cAAc;KACxB,CAAC,CAAC;IAEH,wBAAwB,CAAC;QACvB,KAAK;QACL,wBAAwB;QACxB,oBAAoB;QACpB,OAAO,EAAE,cAAc;KACxB,CAAC,CAAC;IAEH,OAAO;QACL,SAAS;QACT,uBAAuB;KACxB,CAAC;AACJ,CAAC"}

package/dist/editor/ai/terminal/useAgentProviderWait.d.ts

@@ -0,0 +1,18 @@
+import type { AgentStreamMessage } from "../../services/agentService";
+import type { useAgentSession } from "./useAgentSession";
+type AgentSessionActions = ReturnType<typeof useAgentSession>["actions"];
+/**
+ * Tracks whether the run is waiting on the model provider. The server emits a
+ * Heartbeat delta every few seconds while a provider request has produced no
+ * first chunk; the flag flips on at the first heartbeat and off again on the
+ * next real delta or status change. It never adds anything to the transcript:
+ * the live "Thinking" label reads it to switch its wording, and that is the
+ * whole surface.
+ */
+export declare function useAgentProviderWait(input: {
+    actions: AgentSessionActions;
+}): {
+    handleHeartbeatDelta: (_message: AgentStreamMessage) => void;
+    clearProviderWait: () => void;
+};
+export {};

package/dist/editor/ai/terminal/useAgentProviderWait.js

@@ -0,0 +1,23 @@
+import { useCallback } from "react";
+/**
+ * Tracks whether the run is waiting on the model provider. The server emits a
+ * Heartbeat delta every few seconds while a provider request has produced no
+ * first chunk; the flag flips on at the first heartbeat and off again on the
+ * next real delta or status change. It never adds anything to the transcript:
+ * the live "Thinking" label reads it to switch its wording, and that is the
+ * whole surface.
+ */
+export function useAgentProviderWait(input) {
+    const { actions } = input;
+    const handleHeartbeatDelta = useCallback((_message) => {
+        actions.patchRunState({ isWaitingForProvider: true });
+    }, [actions]);
+    const clearProviderWait = useCallback(() => {
+        actions.patchRunState({ isWaitingForProvider: false });
+    }, [actions]);
+    return {
+        handleHeartbeatDelta,
+        clearProviderWait,
+    };
+}
+//# sourceMappingURL=useAgentProviderWait.js.map

package/dist/editor/ai/terminal/useAgentProviderWait.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useAgentProviderWait.js","sourceRoot":"","sources":["../../../../src/editor/ai/terminal/useAgentProviderWait.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAMpC;;;;;;;GAOG;AACH,MAAM,UAAU,oBAAoB,CAAC,KAAuC;IAC1E,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAE1B,MAAM,oBAAoB,GAAG,WAAW,CACtC,CAAC,QAA4B,EAAE,EAAE;QAC/B,OAAO,CAAC,aAAa,CAAC,EAAE,oBAAoB,EAAE,IAAI,EAAE,CAAC,CAAC;IACxD,CAAC,EACD,CAAC,OAAO,CAAC,CACV,CAAC;IAEF,MAAM,iBAAiB,GAAG,WAAW,CAAC,GAAG,EAAE;QACzC,OAAO,CAAC,aAAa,CAAC,EAAE,oBAAoB,EAAE,KAAK,EAAE,CAAC,CAAC;IACzD,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAEd,OAAO;QACL,oBAAoB;QACpB,iBAAiB;KAClB,CAAC;AACJ,CAAC"}

package/dist/editor/ai/terminal/useAgentRunCompletionSocketHandler.d.ts

@@ -11,7 +11,7 @@ export declare function useAgentRunCompletionSocketHandler(input: {
     normalizeRunId: (value: unknown) => string | null;
     noteMissingRunId: (source: string) => void;
     settleCompletedRun: (finalStatus?: "completed" | "cancelled", runId?: string | null) => void;
-    clearHeartbeatMessages: () => void;
+    clearProviderWait: () => void;
     setError: StateSetter<string | null>;
     setAgent: StateSetter<AgentDetails | undefined>;
     setLastRunStatusReason: (reason: string | null) => void;

package/dist/editor/ai/terminal/useAgentRunCompletionSocketHandler.js

@@ -2,7 +2,7 @@ import { useCallback } from "react";
 import { toUserFacingAgentErrorMessage } from "../../services/agentErrorMessage";
 import { normalizeServerExecutionStatus } from "../agentMessageHelpers";
 export function useAgentRunCompletionSocketHandler(input) {
-    const { actions, currentRunIdRef, lastSettledRunIdRef, lastNonHeartbeatUpdateAtRef, isWaitingRef, normalizeRunId, noteMissingRunId, settleCompletedRun, clearHeartbeatMessages, setError, setAgent, setLastRunStatusReason, setIsWaitingForResponse, setIsConnecting, setIsAgentThinking, } = input;
+    const { actions, currentRunIdRef, lastSettledRunIdRef, lastNonHeartbeatUpdateAtRef, isWaitingRef, normalizeRunId, noteMissingRunId, settleCompletedRun, clearProviderWait, setError, setAgent, setLastRunStatusReason, setIsWaitingForResponse, setIsConnecting, setIsAgentThinking, } = input;
     return useCallback((messageType, payload) => {
         if (messageType === "agent:run:complete") {
             lastNonHeartbeatUpdateAtRef.current = Date.now();
@@ -37,7 +37,7 @@ export function useAgentRunCompletionSocketHandler(input) {
         }
         const errorMessage = toUserFacingAgentErrorMessage(payload?.error) ||
             "AI could not complete this request.";
-        clearHeartbeatMessages();
+        clearProviderWait();
         setLastRunStatusReason(null);
         setError(errorMessage);
         setAgent((prev) => prev ? { ...prev, status: "error", statusMessage: errorMessage } : prev);
@@ -48,7 +48,7 @@ export function useAgentRunCompletionSocketHandler(input) {
         return true;
     }, [
         actions,
-        clearHeartbeatMessages,
+        clearProviderWait,
         currentRunIdRef,
         isWaitingRef,
         lastNonHeartbeatUpdateAtRef,

package/dist/editor/ai/terminal/useAgentRunCompletionSocketHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"useAgentRunCompletionSocketHandler.js","sourceRoot":"","sources":["../../../../src/editor/ai/terminal/useAgentRunCompletionSocketHandler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useAgentRunCompletionSocketHandler.js","sourceRoot":"","sources":["../../../../src/editor/ai/terminal/useAgentRunCompletionSocketHandler.ts"],"names":[],"mappings":"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"}

package/dist/editor/ai/terminal/useAgentRunDeltaRouter.d.ts

@@ -3,11 +3,11 @@ import type { AgentChatMessage, AgentDetails, AgentStreamMessage } from "../../s
 export declare function useAgentRunDeltaRouter(input: {
     agent: AgentDetails | undefined;
     messagesRef: MutableRefObject<AgentChatMessage[]>;
-    clearHeartbeatMessages: () => void;
+    clearProviderWait: () => void;
     handleContentChunk: (message: AgentStreamMessage, agent: AgentDetails) => void;
     handleToolCall: (message: AgentStreamMessage, agent: AgentDetails) => void;
     handleToolResult: (message: AgentStreamMessage, agent: AgentDetails) => void;
-    handleHeartbeatMessage: (message: AgentStreamMessage) => void;
+    handleHeartbeatDelta: (message: AgentStreamMessage) => void;
     handleContextUpdate: (contextData: any) => void;
     appendToolUiEvent: (type: string, details?: string, seq?: number | null) => void;
 }): (delta: {

package/dist/editor/ai/terminal/useAgentRunDeltaRouter.js

@@ -1,6 +1,6 @@
 import { useCallback } from "react";
 export function useAgentRunDeltaRouter(input) {
-    const { agent, messagesRef, clearHeartbeatMessages, handleContentChunk, handleToolCall, handleToolResult, handleHeartbeatMessage, handleContextUpdate, appendToolUiEvent, } = input;
+    const { agent, messagesRef, clearProviderWait, handleContentChunk, handleToolCall, handleToolResult, handleHeartbeatDelta, handleContextUpdate, appendToolUiEvent, } = input;
     return useCallback((delta) => {
         if (!agent) {
             return;
@@ -18,7 +18,7 @@ export function useAgentRunDeltaRouter(input) {
             delta.type === "ToolResult" ||
             delta.type === "toolResult";
         if (shouldClearHeartbeat) {
-            clearHeartbeatMessages();
+            clearProviderWait();
         }
         if (delta.type === "ContentChunk" || delta.type === "contentChunk") {
             handleContentChunk(agentStreamMessage, agent);
@@ -32,7 +32,7 @@ export function useAgentRunDeltaRouter(input) {
             handleToolResult(agentStreamMessage, agent);
         }
         else if (delta.type === "Heartbeat" || delta.type === "heartbeat") {
-            handleHeartbeatMessage(agentStreamMessage);
+            handleHeartbeatDelta(agentStreamMessage);
         }
         else if (delta.type === "ContextUpdate" ||
             delta.type === "contextUpdate") {
@@ -41,10 +41,10 @@ export function useAgentRunDeltaRouter(input) {
     }, [
         agent,
         appendToolUiEvent,
-        clearHeartbeatMessages,
+        clearProviderWait,
         handleContentChunk,
         handleContextUpdate,
-        handleHeartbeatMessage,
+        handleHeartbeatDelta,
         handleToolCall,
         handleToolResult,
         messagesRef,

package/dist/editor/ai/terminal/useAgentRunDeltaRouter.js.map

@@ -1 +1 @@
-{"version":3,"file":"useAgentRunDeltaRouter.js","sourceRoot":"","sources":["../../../../src/editor/ai/terminal/useAgentRunDeltaRouter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useAgentRunDeltaRouter.js","sourceRoot":"","sources":["../../../../src/editor/ai/terminal/useAgentRunDeltaRouter.ts"],"names":[],"mappings":"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"}

package/dist/editor/ai/terminal/useAgentRunDeltaSocketHandler.js

@@ -8,16 +8,20 @@ export function useAgentRunDeltaSocketHandler(input) {
         if (!agent || isStoppingRef.current) {
             return true;
         }
+        const { seq, type, data, cost } = payload;
+        const isContextUpdate = type === "ContextUpdate" || type === "contextUpdate";
         const deltaRunId = normalizeRunId(payload?.runId);
-        if (deltaRunId === null) {
+        // Agent context updates also arrive between runs, on their own sequence.
+        const isAgentContextUpdate = deltaRunId === null && isContextUpdate;
+        if (deltaRunId === null && !isAgentContextUpdate) {
             noteMissingRunId("agent:run:delta");
         }
-        else if (currentRunIdRef.current !== null &&
+        else if (!isAgentContextUpdate &&
+            currentRunIdRef.current !== null &&
             deltaRunId !== currentRunIdRef.current) {
             appendToolUiEvent("ui:stream-runid-dropped", `agent:run:delta runId=${deltaRunId} currentRunId=${currentRunIdRef.current}`);
             return true;
         }
-        const { seq, type, data, cost } = payload;
         if ((!seq || seq === 0) && data?.messageId) {
             const replayMessageId = String(data.messageId).toLowerCase();
             if (lastResyncedMessageIdsRef.current.has(replayMessageId)) {
@@ -25,7 +29,6 @@ export function useAgentRunDeltaSocketHandler(input) {
                 return true;
             }
         }
-        const isContextUpdate = type === "ContextUpdate" || type === "contextUpdate";
         const isHeartbeat = type === "Heartbeat" || type === "heartbeat";
         const isRunning = agent.status === "running" || agent.status === 1;
         const hasStreaming = messagesRef.current.some((message) => !message.isCompleted && message.messageType === "streaming");
@@ -37,14 +40,15 @@ export function useAgentRunDeltaSocketHandler(input) {
             !hasMessageId) {
             return true;
         }
-        if (!acceptRunSequenceFrame({
-            eventName: "agent:run:delta",
-            runId: payload?.runId,
-            seq,
-        })) {
+        if (!isAgentContextUpdate &&
+            !acceptRunSequenceFrame({
+                eventName: "agent:run:delta",
+                runId: payload?.runId,
+                seq,
+            })) {
             return true;
         }
-        if (!isHeartbeat) {
+        if (!isHeartbeat && !isAgentContextUpdate) {
             lastNonHeartbeatUpdateAtRef.current = Date.now();
         }
         routeRunDelta({ type, data, cost, seq });

package/dist/editor/ai/terminal/useAgentRunDeltaSocketHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"useAgentRunDeltaSocketHandler.js","sourceRoot":"","sources":["../../../../src/editor/ai/terminal/useAgentRunDeltaSocketHandler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useAgentRunDeltaSocketHandler.js","sourceRoot":"","sources":["../../../../src/editor/ai/terminal/useAgentRunDeltaSocketHandler.ts"],"names":[],"mappings":"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"}

package/dist/editor/ai/terminal/useAgentRunMessagePipeline.d.ts

@@ -1,6 +1,6 @@
 import { useAgentContentChunkHandler } from "./useAgentContentChunkHandler";
 import { useAgentContextUpdateHandler } from "./useAgentContextUpdateHandler";
-import { useAgentHeartbeatMessages } from "./useAgentHeartbeatMessages";
+import { useAgentProviderWait } from "./useAgentProviderWait";
 import { useAgentRunSequenceGuard } from "./useAgentRunSequenceGuard";
 import { useAgentSettleCompletedRun } from "./useAgentSettleCompletedRun";
 import { useAgentStreamMessageFactory } from "./useAgentStreamMessageFactory";
@@ -9,7 +9,7 @@ import { useAgentToolResultHandler } from "./useAgentToolResultHandler";
 type StreamMessageFactoryInput = Parameters<typeof useAgentStreamMessageFactory>[0];
 type ContextUpdateInput = Parameters<typeof useAgentContextUpdateHandler>[0];
 type SequenceGuardInput = Parameters<typeof useAgentRunSequenceGuard>[0];
-type HeartbeatInput = Parameters<typeof useAgentHeartbeatMessages>[0];
+type ProviderWaitInput = Parameters<typeof useAgentProviderWait>[0];
 type SettleInput = Parameters<typeof useAgentSettleCompletedRun>[0];
 type ContentChunkInput = Parameters<typeof useAgentContentChunkHandler>[0];
 type ToolCallInput = Parameters<typeof useAgentToolCallHandler>[0];
@@ -18,15 +18,14 @@ export declare function useAgentRunMessagePipeline(input: {
     streamMessageFactory: StreamMessageFactoryInput;
     contextUpdate: ContextUpdateInput;
     sequenceGuard: SequenceGuardInput;
-    heartbeat: HeartbeatInput;
-    settle: Omit<SettleInput, "clearHeartbeatMessages">;
+    providerWait: ProviderWaitInput;
+    settle: Omit<SettleInput, "clearProviderWait">;
     contentChunk: Omit<ContentChunkInput, "createNewStreamMessage">;
     toolCall: Omit<ToolCallInput, "createNewStreamMessage">;
     toolResult: ToolResultInput;
 }): {
-    stripHeartbeatMessages: (list: import("../../services/agentService").AgentChatMessage[]) => import("../../services/agentService").AgentChatMessage[];
-    handleHeartbeatMessage: (message: import("../../services/agentService").AgentStreamMessage) => void;
-    clearHeartbeatMessages: () => void;
+    handleHeartbeatDelta: (_message: import("../../services/agentService").AgentStreamMessage) => void;
+    clearProviderWait: () => void;
     createNewStreamMessage: (messageId: string, agentData?: import("../../services/agentService").AgentDetails) => import("../../services/agentService").AgentChatMessage;
     handleContextUpdate: (contextData: any) => void;
     acceptRunSequenceFrame: (frame: {

package/dist/editor/ai/terminal/useAgentRunMessagePipeline.js

@@ -1,20 +1,20 @@
 import { useAgentContentChunkHandler } from "./useAgentContentChunkHandler";
 import { useAgentContextUpdateHandler } from "./useAgentContextUpdateHandler";
-import { useAgentHeartbeatMessages } from "./useAgentHeartbeatMessages";
+import { useAgentProviderWait } from "./useAgentProviderWait";
 import { useAgentRunSequenceGuard } from "./useAgentRunSequenceGuard";
 import { useAgentSettleCompletedRun } from "./useAgentSettleCompletedRun";
 import { useAgentStreamMessageFactory } from "./useAgentStreamMessageFactory";
 import { useAgentToolCallHandler } from "./useAgentToolCallHandler";
 import { useAgentToolResultHandler } from "./useAgentToolResultHandler";
 export function useAgentRunMessagePipeline(input) {
-    const { streamMessageFactory, contextUpdate, sequenceGuard, heartbeat, settle, contentChunk, toolCall, toolResult, } = input;
+    const { streamMessageFactory, contextUpdate, sequenceGuard, providerWait, settle, contentChunk, toolCall, toolResult, } = input;
     const createNewStreamMessage = useAgentStreamMessageFactory(streamMessageFactory);
     const handleContextUpdate = useAgentContextUpdateHandler(contextUpdate);
     const acceptRunSequenceFrame = useAgentRunSequenceGuard(sequenceGuard);
-    const heartbeatHandlers = useAgentHeartbeatMessages(heartbeat);
+    const providerWaitHandlers = useAgentProviderWait(providerWait);
     const settleCompletedRun = useAgentSettleCompletedRun({
         ...settle,
-        clearHeartbeatMessages: heartbeatHandlers.clearHeartbeatMessages,
+        clearProviderWait: providerWaitHandlers.clearProviderWait,
     });
     const handleContentChunk = useAgentContentChunkHandler({
         ...contentChunk,
@@ -29,7 +29,7 @@ export function useAgentRunMessagePipeline(input) {
         createNewStreamMessage,
         handleContextUpdate,
         acceptRunSequenceFrame,
-        ...heartbeatHandlers,
+        ...providerWaitHandlers,
         settleCompletedRun,
         handleContentChunk,
         handleToolCall,

package/dist/editor/ai/terminal/useAgentRunMessagePipeline.js.map

@@ -1 +1 @@
-{"version":3,"file":"useAgentRunMessagePipeline.js","sourceRoot":"","sources":["../../../../src/editor/ai/terminal/useAgentRunMessagePipeline.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAaxE,MAAM,UAAU,0BAA0B,CAAC,KAS1C;IACC,MAAM,EACJ,oBAAoB,EACpB,aAAa,EACb,aAAa,EACb,SAAS,EACT,MAAM,EACN,YAAY,EACZ,QAAQ,EACR,UAAU,GACX,GAAG,KAAK,CAAC;IAEV,MAAM,sBAAsB,GAC1B,4BAA4B,CAAC,oBAAoB,CAAC,CAAC;IACrD,MAAM,mBAAmB,GAAG,4BAA4B,CAAC,aAAa,CAAC,CAAC;IACxE,MAAM,sBAAsB,GAAG,wBAAwB,CAAC,aAAa,CAAC,CAAC;IACvE,MAAM,iBAAiB,GAAG,yBAAyB,CAAC,SAAS,CAAC,CAAC;IAC/D,MAAM,kBAAkB,GAAG,0BAA0B,CAAC;QACpD,GAAG,MAAM;QACT,sBAAsB,EAAE,iBAAiB,CAAC,sBAAsB;KACjE,CAAC,CAAC;IACH,MAAM,kBAAkB,GAAG,2BAA2B,CAAC;QACrD,GAAG,YAAY;QACf,sBAAsB;KACvB,CAAC,CAAC;IACH,MAAM,cAAc,GAAG,uBAAuB,CAAC;QAC7C,GAAG,QAAQ;QACX,sBAAsB;KACvB,CAAC,CAAC;IACH,MAAM,gBAAgB,GAAG,yBAAyB,CAAC,UAAU,CAAC,CAAC;IAE/D,OAAO;QACL,sBAAsB;QACtB,mBAAmB;QACnB,sBAAsB;QACtB,GAAG,iBAAiB;QACpB,kBAAkB;QAClB,kBAAkB;QAClB,cAAc;QACd,gBAAgB;KACjB,CAAC;AACJ,CAAC"}
+{"version":3,"file":"useAgentRunMessagePipeline.js","sourceRoot":"","sources":["../../../../src/editor/ai/terminal/useAgentRunMessagePipeline.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAaxE,MAAM,UAAU,0BAA0B,CAAC,KAS1C;IACC,MAAM,EACJ,oBAAoB,EACpB,aAAa,EACb,aAAa,EACb,YAAY,EACZ,MAAM,EACN,YAAY,EACZ,QAAQ,EACR,UAAU,GACX,GAAG,KAAK,CAAC;IAEV,MAAM,sBAAsB,GAC1B,4BAA4B,CAAC,oBAAoB,CAAC,CAAC;IACrD,MAAM,mBAAmB,GAAG,4BAA4B,CAAC,aAAa,CAAC,CAAC;IACxE,MAAM,sBAAsB,GAAG,wBAAwB,CAAC,aAAa,CAAC,CAAC;IACvE,MAAM,oBAAoB,GAAG,oBAAoB,CAAC,YAAY,CAAC,CAAC;IAChE,MAAM,kBAAkB,GAAG,0BAA0B,CAAC;QACpD,GAAG,MAAM;QACT,iBAAiB,EAAE,oBAAoB,CAAC,iBAAiB;KAC1D,CAAC,CAAC;IACH,MAAM,kBAAkB,GAAG,2BAA2B,CAAC;QACrD,GAAG,YAAY;QACf,sBAAsB;KACvB,CAAC,CAAC;IACH,MAAM,cAAc,GAAG,uBAAuB,CAAC;QAC7C,GAAG,QAAQ;QACX,sBAAsB;KACvB,CAAC,CAAC;IACH,MAAM,gBAAgB,GAAG,yBAAyB,CAAC,UAAU,CAAC,CAAC;IAE/D,OAAO;QACL,sBAAsB;QACtB,mBAAmB;QACnB,sBAAsB;QACtB,GAAG,oBAAoB;QACvB,kBAAkB;QAClB,kBAAkB;QAClB,cAAc;QACd,gBAAgB;KACjB,CAAC;AACJ,CAAC"}

package/dist/editor/ai/terminal/useAgentRunStatusSocketHandler.d.ts

@@ -22,7 +22,7 @@ export declare function useAgentRunStatusSocketHandler(input: {
         seq: number | undefined;
     }) => boolean;
     clearStopGuard: () => void;
-    clearHeartbeatMessages: () => void;
+    clearProviderWait: () => void;
     schedulePendingDialogReplay: (targetAgentId: string, callbackId: string, dialogType?: string | null) => void;
     settleCompletedRun: (finalStatus?: "completed" | "cancelled", runId?: string | null) => void;
     setAgent: StateSetter<AgentDetails | undefined>;

package/dist/editor/ai/terminal/useAgentRunStatusSocketHandler.js

@@ -7,33 +7,40 @@ import { hasNonZeroLiveTotals, liveTotalsFromToolResultData, liveTotalsFromStatu
 import { markStaleRunningLoadSuppressed } from "./useAgentSessionSync";
 import { isBrowserCaptureDialogType } from "../dialogs/agentDialogTypes";
 export function useAgentRunStatusSocketHandler(input) {
-    const { agent, agentStubId, actions, currentRunIdRef, isStoppingRef, isWaitingRef, messagesRef, shouldCreateNewMessageRef, lastNonHeartbeatUpdateAtRef, reconcileServerStateRef, normalizeRunId, noteMissingRunId, appendToolUiEvent, acceptRunSequenceFrame, clearStopGuard, clearHeartbeatMessages, schedulePendingDialogReplay, settleCompletedRun, setAgent, setAgentMetadata, setError, setLastRunStatusReason, setIsConnecting, setIsWaitingForResponse, setIsAgentThinking, } = input;
+    const { agent, agentStubId, actions, currentRunIdRef, isStoppingRef, isWaitingRef, messagesRef, shouldCreateNewMessageRef, lastNonHeartbeatUpdateAtRef, reconcileServerStateRef, normalizeRunId, noteMissingRunId, appendToolUiEvent, acceptRunSequenceFrame, clearStopGuard, clearProviderWait, schedulePendingDialogReplay, settleCompletedRun, setAgent, setAgentMetadata, setError, setLastRunStatusReason, setIsConnecting, setIsWaitingForResponse, setIsAgentThinking, } = input;
     return useCallback((messageType, payload) => {
         if (messageType !== "agent:run:status") {
             return false;
         }
         const agentId = payload?.agentId;
+        const { seq, data: statusData } = payload;
         // Drop stale-run status — see matching block in agent:run:delta handler.
         const statusRunId = normalizeRunId(payload?.runId);
-        if (statusRunId === null) {
+        // Context can change between runs (for example, task todo backfill).
+        // Such updates have no run ID and do not belong to the run's sequence.
+        const isAgentContextUpdate = statusRunId === null && statusData?.state === "contextChanged";
+        if (statusRunId === null && !isAgentContextUpdate) {
             noteMissingRunId("agent:run:status");
         }
-        else if (currentRunIdRef.current !== null &&
+        else if (!isAgentContextUpdate &&
+            currentRunIdRef.current !== null &&
             statusRunId !== currentRunIdRef.current) {
             appendToolUiEvent("ui:stream-runid-dropped", `agent:run:status runId=${statusRunId} currentRunId=${currentRunIdRef.current}`);
             return true;
         }
-        const { seq, data: statusData } = payload;
-        if (!acceptRunSequenceFrame({
-            eventName: "agent:run:status",
-            runId: payload?.runId,
-            seq,
-        })) {
+        if (!isAgentContextUpdate &&
+            !acceptRunSequenceFrame({
+                eventName: "agent:run:status",
+                runId: payload?.runId,
+                seq,
+            })) {
             return true;
         }
-        // Status events never carry a "Heartbeat" payload — heartbeats are deltas. Any
-        // status update is meaningful progress for the watchdog.
-        lastNonHeartbeatUpdateAtRef.current = Date.now();
+        // Run status updates count as progress for the watchdog. Agent context
+        // changes can arrive independently and do not show that the run is alive.
+        if (!isAgentContextUpdate) {
+            lastNonHeartbeatUpdateAtRef.current = Date.now();
+        }
         // Route based on statusData.state
         try {
             // Normalize various status shapes and handle Cancelled uniformly
@@ -54,7 +61,7 @@ export function useAgentRunStatusSocketHandler(input) {
                 actions.runStatus("idle", statusReason);
                 setError(null);
                 // Stop indicators and mark any in-progress streaming messages as completed
-                clearHeartbeatMessages();
+                clearProviderWait();
                 setAgent((prev) => (prev ? { ...prev, status: "idle" } : prev));
                 isWaitingRef.current = false;
                 shouldCreateNewMessageRef.current = false;
@@ -294,7 +301,7 @@ export function useAgentRunStatusSocketHandler(input) {
                     return true;
                 }
                 if (statusReason === MACHINE_CAPACITY_REASON) {
-                    clearHeartbeatMessages();
+                    clearProviderWait();
                     setLastRunStatusReason(statusReason);
                     setAgent((prev) => prev
                         ? {
@@ -331,7 +338,7 @@ export function useAgentRunStatusSocketHandler(input) {
                 const errorMsg = toUserFacingAgentErrorMessage(statusData?.statusMessage ??
                     statusData?.message ??
                     statusData?.error) || "Unknown error";
-                clearHeartbeatMessages();
+                clearProviderWait();
                 setError(errorMsg);
                 setAgent((prev) => prev ? { ...prev, status: "error", statusMessage: errorMsg } : prev);
                 setIsWaitingForResponse(false);
@@ -351,7 +358,7 @@ export function useAgentRunStatusSocketHandler(input) {
         agent,
         agentStubId,
         appendToolUiEvent,
-        clearHeartbeatMessages,
+        clearProviderWait,
         clearStopGuard,
         currentRunIdRef,
         isStoppingRef,