@agent-native/core 0.126.0 → 0.127.1

package/dist/client/MultiTabAssistantChat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MultiTabAssistantChat.d.ts","sourceRoot":"","sources":["../../src/client/MultiTabAssistantChat.tsx"],"names":[],"mappings":"AACA,OAAO,KAAmD,MAAM,OAAO,CAAC;AA4BxE,OAAO,EAEL,KAAK,kBAAkB,EAExB,MAAM,oBAAoB,CAAC;AA0B5B,OAAO,EAEL,KAAK,eAAe,EAErB,MAAM,uBAAuB,CAAC;AA2a/B,MAAM,WAAW,OAAO;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,WAAW,CAAC;IACzC,uDAAuD;IACvD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,qEAAqE;IACrE,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAsGD,MAAM,WAAW,wBAAwB;IACvC,iFAAiF;IACjF,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;OAGG;IACH,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,8EAA8E;IAC9E,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,KAAK,MAAM,CAAC;IAC9C,+DAA+D;IAC/D,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,KAAK,IAAI,CAAC;CACpE;AAyED,MAAM,WAAW,gCAAgC;IAC/C,IAAI,EAAE,OAAO,EAAE,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,YAAY,EAAE,MAAM,IAAI,CAAC;IACzB,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,+BAA+B;IAC/B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;IAC3B,6EAA6E;IAC7E,QAAQ,EAAE,MAAM,CAAC;CAClB;AAID,MAAM,MAAM,0BAA0B,GAAG,IAAI,CAC3C,kBAAkB,EAClB,OAAO,GAAG,UAAU,CACrB,GAAG;IACF,sCAAsC;IACtC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,iDAAiD;IACjD,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,gCAAgC,KAAK,KAAK,CAAC,SAAS,CAAC;IAC5E,uEAAuE;IACvE,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,gCAAgC,KAAK,KAAK,CAAC,SAAS,CAAC;IAC7E,sGAAsG;IACtG,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,yFAAyF;IACzF,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,4EAA4E;IAC5E,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,mEAAmE;IACnE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;OAIG;IACH,aAAa,CAAC,EAAE,OAAO,GAAG,wBAAwB,CAAC;IACnD,2DAA2D;IAC3D,KAAK,CAAC,EAAE,eAAe,GAAG,IAAI,CAAC;IAC/B,iEAAiE;IACjE,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,wBAAgB,qBAAqB,CAAC,EACpC,UAAiB,EACjB,YAAY,EACZ,aAAa,EACb,aAAqB,EACrB,MAAqD,EACrD,UAAU,EACV,mBAA0B,EAC1B,YAAY,EACZ,aAAqB,EACrB,KAAY,EACZ,GAAG,KAAK,EACT,EAAE,0BAA0B,qBAg1D5B"}
+{"version":3,"file":"MultiTabAssistantChat.d.ts","sourceRoot":"","sources":["../../src/client/MultiTabAssistantChat.tsx"],"names":[],"mappings":"AACA,OAAO,KAAmD,MAAM,OAAO,CAAC;AA4BxE,OAAO,EAEL,KAAK,kBAAkB,EAExB,MAAM,oBAAoB,CAAC;AA0B5B,OAAO,EAEL,KAAK,eAAe,EAErB,MAAM,uBAAuB,CAAC;AA6a/B,MAAM,WAAW,OAAO;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,WAAW,CAAC;IACzC,uDAAuD;IACvD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,qEAAqE;IACrE,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAsGD,MAAM,WAAW,wBAAwB;IACvC,iFAAiF;IACjF,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;OAGG;IACH,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,8EAA8E;IAC9E,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,KAAK,MAAM,CAAC;IAC9C,+DAA+D;IAC/D,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,KAAK,IAAI,CAAC;CACpE;AAyED,MAAM,WAAW,gCAAgC;IAC/C,IAAI,EAAE,OAAO,EAAE,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,YAAY,EAAE,MAAM,IAAI,CAAC;IACzB,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,+BAA+B;IAC/B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;IAC3B,6EAA6E;IAC7E,QAAQ,EAAE,MAAM,CAAC;CAClB;AAID,MAAM,MAAM,0BAA0B,GAAG,IAAI,CAC3C,kBAAkB,EAClB,OAAO,GAAG,UAAU,CACrB,GAAG;IACF,sCAAsC;IACtC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,iDAAiD;IACjD,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,gCAAgC,KAAK,KAAK,CAAC,SAAS,CAAC;IAC5E,uEAAuE;IACvE,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,gCAAgC,KAAK,KAAK,CAAC,SAAS,CAAC;IAC7E,sGAAsG;IACtG,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,yFAAyF;IACzF,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,4EAA4E;IAC5E,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,mEAAmE;IACnE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;OAIG;IACH,aAAa,CAAC,EAAE,OAAO,GAAG,wBAAwB,CAAC;IACnD,2DAA2D;IAC3D,KAAK,CAAC,EAAE,eAAe,GAAG,IAAI,CAAC;IAC/B,iEAAiE;IACjE,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,wBAAgB,qBAAqB,CAAC,EACpC,UAAiB,EACjB,YAAY,EACZ,aAAa,EACb,aAAqB,EACrB,MAAqD,EACrD,UAAU,EACV,mBAA0B,EAC1B,YAAY,EACZ,aAAqB,EACrB,KAAY,EACZ,GAAG,KAAK,EACT,EAAE,0BAA0B,qBA82D5B"}

package/dist/client/MultiTabAssistantChat.js

@@ -78,19 +78,27 @@ function writeStoredModelSelection(key, selection) {
 function resolveModelSelection(selection, groups) {
     if (!selection?.model)
         return undefined;
-    if (groups.length === 0) {
-        return {
-            model: selection.model,
-            effort: resolveReasoningEffortSelection(selection.model, selection.effort),
-        };
-    }
-    const preferredGroup = groups.find((group) => group.engine === selection.engine &&
-        group.models.includes(selection.model));
-    const fallbackGroup = groups.find((group) => group.models.includes(selection.model));
-    if (groups.length > 0 && !preferredGroup && !fallbackGroup) {
-        return undefined;
-    }
-    const engine = preferredGroup?.engine ?? fallbackGroup?.engine ?? selection.engine;
+    // Engine precedence turns on whether the catalog OFFERS the supplied engine,
+    // not on whether that engine advertises this model:
+    //   offered      → honor it. A gateway's advertised list is its built-in
+    //                  catalog, not what the endpoint serves, and one model id
+    //                  sits under several groups (claude-sonnet-5 under both
+    //                  anthropic and builder) — so a model-only match would
+    //                  reroute the turn to a different provider and bill it there.
+    //   not offered  → heal to a group that serves the model. A selection left
+    //                  on `builder` after disconnecting it must still run on the
+    //                  user's own key; the same model through another configured
+    //                  provider is the point of bring-your-own-key.
+    // `builder` is in the catalog exactly when Builder is connected, so this is a
+    // real availability signal rather than a guess.
+    const suppliedEngine = selection.engine?.trim()
+        ? selection.engine
+        : undefined;
+    const engine = (groups.some((group) => group.engine === suppliedEngine)
+        ? suppliedEngine
+        : undefined) ??
+        groups.find((group) => group.models.includes(selection.model))?.engine ??
+        suppliedEngine;
     if (!engine && groups.length > 0)
         return undefined;
     const effort = resolveReasoningEffortSelection(selection.model, selection.effort);
@@ -644,8 +652,12 @@ export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderO
                 .catch(() => null),
         ])
             .then(([enginesData, envKeys, builderStatus]) => {
-            if (!enginesData?.engines)
+            if (!enginesData?.engines) {
+                // Leaves `availableModels` empty for the session, so an override with
+                // no engine of its own has nothing to resolve against.
+                console.warn("[agent-chat] no engine list; model overrides cannot be catalog-resolved");
                 return;
+            }
             const configuredKeys = new Set(envKeys
                 .filter((k) => k.configured)
                 .map((k) => k.key));
@@ -1094,7 +1106,7 @@ export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderO
             // Dedup the live post against the cold-start replay; first one wins.
             if (!claimAgentChatSubmit(parsed.submitMessageId))
                 return;
-            const { message, context, openSidebar, model, effort, newTab, background, submit, images, submitMessageId, } = parsed;
+            const { message, context, openSidebar, model, engine, effort, newTab, background, submit, images, submitMessageId, } = parsed;
             const requestedTabId = parsed.tabId;
             const requestMode = parsed.requestMode ?? requestModeFromExecMode(props.execMode);
             // Make sure the sidebar is visible to show the response, unless the
@@ -1119,28 +1131,37 @@ export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderO
                 ...(requestMode ? { requestMode } : {}),
                 ...(submitMessageId ? { submitMessageId } : {}),
             };
+            // Resolved once, up front, and carried with the send until a thread
+            // exists to key it by. Applying it only when `model` matched
+            // `availableModels` dropped every override that arrived before the
+            // engines fetch resolved — and the cold-start replay below runs at mount,
+            // when that list is always still empty.
+            let modelOverride;
+            if (model) {
+                const catalogEngine = availableModels.find((g) => g.models.includes(model))?.engine;
+                const overrideEngine = engine ?? catalogEngine;
+                if (!overrideEngine && availableModels.length > 0) {
+                    console.warn(`[agent-chat] model override "${model}" is in no engine group and carries no engine; the server will substitute its default`);
+                }
+                modelOverride = {
+                    model,
+                    ...(overrideEngine ? { engine: overrideEngine } : {}),
+                    effort: resolveReasoningEffortSelection(model, isReasoningEffort(effort) ? effort : undefined),
+                };
+            }
             const sendToTab = (threadId) => {
                 if (isAgentChatSubmitCancelled(submitMessageId))
                     return;
-                // If a model override was specified, apply it only if we recognize it
-                if (model) {
-                    const matchedGroup = availableModels.find((g) => g.models.includes(model));
-                    if (matchedGroup) {
-                        const selectedEffort = resolveReasoningEffortSelection(model, isReasoningEffort(effort) ? effort : undefined);
-                        threadModelRef.current.set(threadId, {
-                            model,
-                            engine: matchedGroup.engine,
-                            effort: selectedEffort,
-                        });
-                        bumpModelSelectionVersion();
-                    }
+                if (modelOverride) {
+                    threadModelRef.current.set(threadId, modelOverride);
+                    bumpModelSelectionVersion();
                 }
                 const ref = chatRefs.current.get(threadId);
                 if (ref) {
                     deliverPendingSend(ref, send);
                 }
                 else {
-                    pendingDeliveries.current.push({ threadId, send });
+                    pendingDeliveries.current.push({ threadId, send, modelOverride });
                 }
             };
             if (newTab) {
@@ -1178,7 +1199,11 @@ export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderO
                 else {
                     // Cold start: no thread yet. Queue for the first active thread (the
                     // bootstrap effect creates it) rather than racing a second create.
-                    pendingDeliveries.current.push({ threadId: null, send });
+                    pendingDeliveries.current.push({
+                        threadId: null,
+                        send,
+                        modelOverride,
+                    });
                 }
             }
         };
@@ -1230,17 +1255,21 @@ export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderO
                 continue;
             const threadId = delivery.threadId ?? active ?? null;
             const ref = threadId ? chatRefs.current.get(threadId) : null;
+            if (threadId && delivery.modelOverride) {
+                threadModelRef.current.set(threadId, delivery.modelOverride);
+                bumpModelSelectionVersion();
+            }
             if (threadId && ref) {
                 const { send } = delivery;
                 setTimeout(() => deliverPendingSend(ref, send), 50);
             }
             else {
                 // Not ready — keep it, pinning the resolved threadId once known.
-                remaining.push(threadId ? { threadId, send: delivery.send } : delivery);
+                remaining.push(threadId ? { ...delivery, threadId, send: delivery.send } : delivery);
             }
         }
         pendingDeliveries.current = remaining;
-    }, [openTabIds, activeThreadId]);
+    }, [openTabIds, activeThreadId, bumpModelSelectionVersion]);
     // Listen for chatRunning completion events
     useEffect(() => {
         const handler = (e) => {