@agent-native/core 0.128.3 → 0.129.0

package/corpus/core/src/client/AgentPanel.tsx

@@ -95,6 +95,7 @@ import {
   AGENT_CHAT_VIEW_TRANSITION_CLASS,
   getAgentChatViewTransitionStyle,
 } from "./chat-view-transition.js";
+import { fetchBuilderStatus } from "./client-status-requests.js";
 import { RealtimeVoiceModeProvider } from "./composer/index.js";
 import {
   getFramePostMessageTargetOrigin,
@@ -481,13 +482,16 @@ function useBuilderConnectUrl() {
     // global), refresh fired again, and we'd loop forever.
     let lastConfigured = false;
     const refresh = () => {
-      fetch(agentNativePath("/_agent-native/builder/status"))
-        .then((res) => (res.ok ? res.json() : null))
+      fetchBuilderStatus<{
+        cliAuthUrl?: string;
+        connectUrl?: string;
+        configured?: boolean;
+      }>()
+        .then((result) => (result.state === "available" ? result.value : null))
         .then((data) => {
           if (cancelled || !data) return;
-          if (data.cliAuthUrl || data.connectUrl) {
-            setConnectUrl(data.cliAuthUrl || data.connectUrl);
-          }
+          const nextConnectUrl = data.cliAuthUrl || data.connectUrl;
+          if (nextConnectUrl) setConnectUrl(nextConnectUrl);
           const nextConfigured = !!data.configured;
           setConfigured(nextConfigured);
           if (nextConfigured && !lastConfigured) {

package/corpus/core/src/client/AssistantChat.tsx

@@ -24,6 +24,8 @@ import type {
 } from "@assistant-ui/react";
 import { CompositeAttachmentAdapter } from "@assistant-ui/react";
 import {
+  IconArrowUp,
+  IconClock,
   IconMessage,
   IconX,
   IconPlayerStopFilled,
@@ -223,7 +225,7 @@ export interface AssistantChatSendOptions {
   submitMessageId?: string;
 }
 
-function createUserMessageRunConfig(
+export function createUserMessageRunConfig(
   references?: Reference[],
   requestMode?: AgentRequestMode,
   recoveryAction?: AgentRecoveryAction,
@@ -231,6 +233,11 @@ function createUserMessageRunConfig(
   approvedToolCalls?: string[],
   queuedMessageId?: string,
   hideUserMessage?: boolean,
+  modelSnapshot?: {
+    model?: string;
+    engine?: string;
+    effort?: ReasoningEffort;
+  },
 ) {
   const custom: {
     references?: Reference[];
@@ -238,7 +245,13 @@ function createUserMessageRunConfig(
     trackInRunsTray?: boolean;
     agentNativeQueuedMessageId?: string;
     approvedToolCalls?: string[];
+    model?: string;
+    engine?: string;
+    effort?: ReasoningEffort;
   } = {};
+  if (modelSnapshot?.model) custom.model = modelSnapshot.model;
+  if (modelSnapshot?.engine) custom.engine = modelSnapshot.engine;
+  if (modelSnapshot?.effort) custom.effort = modelSnapshot.effort;
   if (references && references.length > 0) {
     custom.references = references;
   }
@@ -1650,8 +1663,27 @@ type QueuedMessage = {
   recoveryAction?: AgentRecoveryAction;
   trackInRunsTray?: boolean;
   hideUserMessage?: boolean;
+  /**
+   * Model/engine/effort snapshotted at enqueue time, for the same reason
+   * `requestMode` is: the picker is global and live, so a queue that flushes
+   * after the user switches models would otherwise silently run the message
+   * under a model it was never composed for. Entries persisted before this
+   * existed simply lack the fields and fall back to the live selection.
+   */
+  model?: string;
+  engine?: string;
+  effort?: ReasoningEffort;
 };
 
+export function hoistQueuedMessageToFront<T extends { id: string }>(
+  messages: readonly T[],
+  id: string,
+): T[] {
+  const target = messages.find((message) => message.id === id);
+  if (!target) return [...messages];
+  return [target, ...messages.filter((message) => message.id !== id)];
+}
+
 export function queuedMessageImageSources(
   message: Pick<QueuedMessage, "attachments" | "images">,
 ): string[] {
@@ -2241,6 +2273,7 @@ const AssistantChatInner = forwardRef<
     planModeDisabledReason,
     selectedModel,
     defaultModel,
+    selectedEngine,
     selectedEffort,
     availableModels,
     modelListLoading,
@@ -4170,6 +4203,11 @@ const AssistantChatInner = forwardRef<
               undefined,
               next.id,
               next.hideUserMessage,
+              {
+                model: next.model,
+                engine: next.engine,
+                effort: next.effort,
+              },
             ),
           } as Parameters<typeof threadRuntime.append>[0]);
           appended = true;
@@ -4493,6 +4531,22 @@ const AssistantChatInner = forwardRef<
   // Keep the ref current so addToQueue can call it without a stale closure.
   stopActiveRunRef.current = stopActiveRun;
 
+  // Explicit opt-in interrupt from a queued bubble: hoist the entry to the
+  // front and abort the active run, letting auto-dequeue re-send it once the
+  // run clears. Plain Enter still queues — this is the only send-now gesture.
+  const sendQueuedMessageNow = useCallback(
+    (id: string) => {
+      applyLocalQueuedMessages((prev) => hoistQueuedMessageToFront(prev, id));
+      stopActiveRunRef.current({ preserveQueuedMessages: true });
+    },
+    [applyLocalQueuedMessages],
+  );
+
+  const visibleQueuedMessages = useMemo(
+    () => queuedMessages.filter((message) => !message.hideUserMessage),
+    [queuedMessages],
+  );
+
   const addToQueue = useCallback(
     async (
       text: string,
@@ -4663,6 +4717,12 @@ const AssistantChatInner = forwardRef<
           : execMode === "build"
             ? "act"
             : undefined);
+      // Same reasoning for the model picker — see `QueuedMessage.model`.
+      const modelSnapshot = {
+        model: selectedModel,
+        engine: selectedEngine,
+        effort: selectedEffort,
+      };
       if (isRunning && intent === "immediate") {
         // Explicit interrupt path: abort the active server run, then let the
         // auto-dequeue path append this message once the run is clear. Normal
@@ -4683,6 +4743,7 @@ const AssistantChatInner = forwardRef<
             recoveryAction,
             trackInRunsTray,
             hideUserMessage,
+            ...modelSnapshot,
           },
         ]);
         stopActiveRunRef.current({ preserveQueuedMessages: true });
@@ -4703,6 +4764,7 @@ const AssistantChatInner = forwardRef<
             recoveryAction,
             trackInRunsTray,
             hideUserMessage,
+            ...modelSnapshot,
           },
         ]);
       } else {
@@ -4754,6 +4816,9 @@ const AssistantChatInner = forwardRef<
       markOptimisticRunning,
       appendThreadMessage,
       requestMissingKeySetup,
+      selectedEffort,
+      selectedEngine,
+      selectedModel,
       updateComposerContextItems,
     ],
   );
@@ -5539,52 +5604,79 @@ const AssistantChatInner = forwardRef<
                                   />
                                 </MessageScrollerItem>
                               )}
-                              {queuedMessages
-                                .filter((msg) => !msg.hideUserMessage)
-                                .map((msg) => {
-                                  const displayText =
-                                    displayableUserMessageText(msg.text);
-                                  const imageSources =
-                                    queuedMessageImageSources(msg);
-                                  return (
-                                    <MessageScrollerItem
-                                      key={msg.id}
-                                      messageId={msg.id}
-                                    >
-                                      <div className="group flex items-start justify-end gap-1.5">
-                                        <button
-                                          type="button"
-                                          onClick={() =>
-                                            applyLocalQueuedMessages((prev) =>
-                                              prev.filter(
-                                                (m) => m.id !== msg.id,
-                                              ),
-                                            )
-                                          }
-                                          aria-label="Remove from queue"
-                                          className="mt-1.5 flex h-5 w-5 items-center justify-center rounded-full border border-border bg-background text-muted-foreground opacity-0 shadow-sm transition-opacity hover:bg-accent hover:text-foreground focus-visible:opacity-100 group-hover:opacity-100"
-                                        >
-                                          <IconX className="h-3 w-3" />
-                                        </button>
-                                        <div className="max-w-[85%] rounded-lg bg-accent/50 px-3 py-2 text-sm leading-relaxed text-foreground/60 whitespace-pre-wrap break-words">
-                                          {displayText}
-                                          {imageSources.length > 0 && (
-                                            <div className="flex flex-wrap gap-1.5 mt-1.5">
-                                              {imageSources.map((img, j) => (
-                                                <img
-                                                  key={j}
-                                                  src={img}
-                                                  alt=""
-                                                  className="h-12 w-12 rounded object-cover border border-border/50"
-                                                />
-                                              ))}
-                                            </div>
-                                          )}
-                                        </div>
+                              {visibleQueuedMessages.length > 0 && (
+                                <MessageScrollerItem>
+                                  <div className="flex items-center justify-end gap-1.5 pr-0.5 text-xs text-muted-foreground">
+                                    <IconClock className="h-3 w-3" />
+                                    <span>
+                                      {visibleQueuedMessages.length} queued
+                                    </span>
+                                  </div>
+                                </MessageScrollerItem>
+                              )}
+                              {visibleQueuedMessages.map((msg) => {
+                                const displayText = displayableUserMessageText(
+                                  msg.text,
+                                );
+                                const imageSources =
+                                  queuedMessageImageSources(msg);
+                                return (
+                                  <MessageScrollerItem
+                                    key={msg.id}
+                                    messageId={msg.id}
+                                  >
+                                    <div className="group flex items-start justify-end gap-1.5">
+                                      {isRunning && (
+                                        <Tooltip>
+                                          <TooltipTrigger asChild>
+                                            <button
+                                              type="button"
+                                              onClick={() =>
+                                                sendQueuedMessageNow(msg.id)
+                                              }
+                                              aria-label="Send now"
+                                              className="mt-1.5 flex h-5 w-5 cursor-pointer items-center justify-center rounded-full border border-border bg-background text-muted-foreground opacity-0 shadow-sm transition-opacity hover:bg-accent hover:text-foreground focus-visible:opacity-100 group-hover:opacity-100"
+                                            >
+                                              <IconArrowUp className="h-3 w-3" />
+                                            </button>
+                                          </TooltipTrigger>
+                                          <TooltipContent>
+                                            Send now (stops the current
+                                            response)
+                                          </TooltipContent>
+                                        </Tooltip>
+                                      )}
+                                      <button
+                                        type="button"
+                                        onClick={() =>
+                                          applyLocalQueuedMessages((prev) =>
+                                            prev.filter((m) => m.id !== msg.id),
+                                          )
+                                        }
+                                        aria-label="Remove from queue"
+                                        className="mt-1.5 flex h-5 w-5 cursor-pointer items-center justify-center rounded-full border border-border bg-background text-muted-foreground opacity-0 shadow-sm transition-opacity hover:bg-accent hover:text-foreground focus-visible:opacity-100 group-hover:opacity-100"
+                                      >
+                                        <IconX className="h-3 w-3" />
+                                      </button>
+                                      <div className="max-w-[85%] rounded-lg bg-accent/50 px-3 py-2 text-sm leading-relaxed text-foreground/60 whitespace-pre-wrap break-words">
+                                        {displayText}
+                                        {imageSources.length > 0 && (
+                                          <div className="flex flex-wrap gap-1.5 mt-1.5">
+                                            {imageSources.map((img, j) => (
+                                              <img
+                                                key={j}
+                                                src={img}
+                                                alt=""
+                                                className="h-12 w-12 rounded object-cover border border-border/50"
+                                              />
+                                            ))}
+                                          </div>
+                                        )}
                                       </div>
-                                    </MessageScrollerItem>
-                                  );
-                                })}
+                                    </div>
+                                  </MessageScrollerItem>
+                                );
+                              })}
                               {resolvedThreadFooterSlot ? (
                                 <MessageScrollerItem>
                                   <div className="agent-thread-footer-slot">

package/corpus/core/src/client/MultiTabAssistantChat.tsx

@@ -41,6 +41,10 @@ import {
   type ChatHistoryItem,
   type ChatHistorySection,
 } from "./chat/ChatHistoryList.js";
+import {
+  fetchBuilderStatus,
+  fetchEnvironmentStatus,
+} from "./client-status-requests.js";
 import {
   Popover,
   PopoverAnchor,
@@ -1114,14 +1118,10 @@ export function MultiTabAssistantChat({
       callAction("manage-agent-engine" as any, { action: "list" } as any).catch(
         () => null,
       ),
-      fetch(agentNativePath("/_agent-native/env-status"))
-        .then((r) => (r.ok ? r.json() : []))
-        .catch(() => []),
-      fetch(agentNativePath("/_agent-native/builder/status"))
-        .then((r) => (r.ok ? r.json() : null))
-        .catch(() => null),
+      fetchEnvironmentStatus<Array<{ key: string; configured: boolean }>>(),
+      fetchBuilderStatus<{ configured?: boolean }>(),
     ])
-      .then(([enginesData, envKeys, builderStatus]) => {
+      .then(([enginesData, envResult, builderResult]) => {
         if (!enginesData?.engines) {
           // Leaves `availableModels` empty for the session, so an override with
           // no engine of its own has nothing to resolve against.
@@ -1130,10 +1130,16 @@ export function MultiTabAssistantChat({
           );
           return;
         }
+        if (
+          envResult.state !== "available" ||
+          builderResult.state !== "available"
+        ) {
+          return;
+        }
+        const envKeys = envResult.value;
+        const builderStatus = builderResult.value;
         const configuredKeys = new Set(
-          (envKeys as Array<{ key: string; configured: boolean }>)
-            .filter((k) => k.configured)
-            .map((k) => k.key),
+          envKeys.filter((k) => k.configured).map((k) => k.key),
         );
         const builderConnected = builderStatus?.configured === true;
         const currentEngineName: string | undefined =

package/corpus/core/src/client/agent-chat-adapter.ts

@@ -884,6 +884,9 @@ function lastCompletedTimeoutCandidateTool(
       part.activity !== true &&
       part.result !== undefined &&
       part.isError !== true &&
+      // A settled-interrupted tool has a result but an unknown outcome; claiming
+      // it completed is the same false-success this message exists to avoid.
+      part.outcome !== "unknown" &&
       isCompletedToolTimeoutCandidate(part)
     ) {
       return part;
@@ -1633,6 +1636,21 @@ export function createAgentChatAdapter(
             : execModeRef?.current === "build"
               ? "act"
               : undefined;
+      // Queued turns carry the model/engine/effort they were composed with.
+      // The refs track the live picker, so without this a queue that flushes
+      // after the user switches models runs under the wrong one.
+      const runConfigSelection = (key: "model" | "engine" | "effort") => {
+        const raw =
+          runConfig?.custom && typeof runConfig.custom === "object"
+            ? (runConfig.custom as Record<string, unknown>)[key]
+            : undefined;
+        return typeof raw === "string" && raw.length > 0 ? raw : undefined;
+      };
+      const model = runConfigSelection("model") ?? modelRef?.current;
+      const engine = runConfigSelection("engine") ?? engineRef?.current;
+      const effort =
+        (runConfigSelection("effort") as ReasoningEffort | undefined) ??
+        effortRef?.current;
 
       const withRequestModeMetadata = (
         result: ChatModelRunResult,
@@ -3181,9 +3199,9 @@ export function createAgentChatAdapter(
                     ? { internalContinuation: true }
                     : {}),
                   ...(requestMode ? { mode: requestMode } : {}),
-                  ...(modelRef?.current ? { model: modelRef.current } : {}),
-                  ...(engineRef?.current ? { engine: engineRef.current } : {}),
-                  ...(effortRef?.current ? { effort: effortRef.current } : {}),
+                  ...(model ? { model } : {}),
+                  ...(engine ? { engine } : {}),
+                  ...(effort ? { effort } : {}),
                   ...(browserTabId ? { browserTabId } : {}),
                   ...(scopeRef?.current ? { scope: scopeRef.current } : {}),
                   ...(includeAttachments ? { attachments } : {}),