@agent-native/core 0.118.1 → 0.119.0

package/src/client/chat-model-groups.ts

@@ -40,34 +40,64 @@ function addCurrentModel(
   return next;
 }
 
+const MODEL_COST_ORDER = [
+  "luna",
+  "terra",
+  "sol",
+  "haiku",
+  "sonnet",
+  "opus",
+  "fable",
+  "flash",
+  "pro",
+] as const;
+
+function modelCostRank(model: string): number {
+  const normalized = model.toLowerCase();
+  const rank = MODEL_COST_ORDER.findIndex((tier) => normalized.includes(tier));
+  return rank === -1 ? MODEL_COST_ORDER.length : rank;
+}
+
+function sortModelsByCost(models: readonly string[]): string[] {
+  return [...models].sort((a, b) => modelCostRank(a) - modelCostRank(b));
+}
+
 function groupBuilderModels(models: readonly string[]): EngineModelGroup[] {
-  const claude = models.filter((model) => model.startsWith("claude-"));
-  const openai = models.filter((model) => model.startsWith("gpt-"));
-  const gemini = models.filter((model) => model.startsWith("gemini-"));
-  const other = models.filter(
-    (model) =>
-      !model.startsWith("claude-") &&
-      !model.startsWith("gpt-") &&
-      !model.startsWith("gemini-"),
+  const claude = sortModelsByCost(
+    models.filter((model) => model.startsWith("claude-")),
+  );
+  const openai = sortModelsByCost(
+    models.filter((model) => model.startsWith("gpt-")),
+  );
+  const gemini = sortModelsByCost(
+    models.filter((model) => model.startsWith("gemini-")),
+  );
+  const other = sortModelsByCost(
+    models.filter(
+      (model) =>
+        !model.startsWith("claude-") &&
+        !model.startsWith("gpt-") &&
+        !model.startsWith("gemini-"),
+    ),
   );
 
   return [
-    ...(claude.length
+    ...(openai.length
       ? [
           {
             engine: "builder",
-            label: "Claude",
-            models: claude,
+            label: "OpenAI",
+            models: openai,
             configured: true,
           },
         ]
       : []),
-    ...(openai.length
+    ...(claude.length
       ? [
           {
             engine: "builder",
-            label: "OpenAI",
-            models: openai,
+            label: "Claude",
+            models: claude,
             configured: true,
           },
         ]
@@ -115,16 +145,24 @@ function shouldShowDirectEngine(
   return true;
 }
 
-function putOpenRouterLast(
+function modelPickerEngineRank(engine: ChatModelEngineEntry): number {
+  if (engine.name === "ai-sdk:openai" || engine.label === "OpenAI") return 0;
+  if (
+    engine.name === "anthropic" ||
+    engine.name === "ai-sdk:anthropic" ||
+    engine.label === "Claude"
+  ) {
+    return 1;
+  }
+  if (engine.name === "ai-sdk:openrouter") return 100;
+  return 2;
+}
+
+function sortModelPickerEngines(
   a: ChatModelEngineEntry,
   b: ChatModelEngineEntry,
 ): number {
-  const aIsOpenRouter = a.name === "ai-sdk:openrouter";
-  const bIsOpenRouter = b.name === "ai-sdk:openrouter";
-  if (aIsOpenRouter === bIsOpenRouter) return 0;
-  if (aIsOpenRouter) return 1;
-  if (bIsOpenRouter) return -1;
-  return 0;
+  return modelPickerEngineRank(a) - modelPickerEngineRank(b);
 }
 
 export function buildChatModelGroups({
@@ -150,17 +188,19 @@ export function buildChatModelGroups({
   return engines
     .filter((engine) => engine.packageInstalled !== false)
     .filter((engine) => shouldShowDirectEngine(engine, currentEngineName))
-    .sort(putOpenRouterLast)
+    .sort(sortModelPickerEngines)
     .map((engine) => {
       const requiredEnvVars = engine.requiredEnvVars ?? [];
       return {
         engine: engine.name,
         label: engine.label,
-        models: addCurrentModel(
-          engine.supportedModels ?? [],
-          engine.name,
-          currentEngineName,
-          currentModel,
+        models: sortModelsByCost(
+          addCurrentModel(
+            engine.supportedModels ?? [],
+            engine.name,
+            currentEngineName,
+            currentModel,
+          ),
         ),
         configured:
           requiredEnvVars.length === 0 ||

package/src/client/sharing/ShareButton.tsx

@@ -77,7 +77,7 @@ export interface ShareButtonProps {
   shareUrlPlacement?: "top" | "bottom";
   /** Whether to render copyable share URL fields. Defaults to true. */
   showShareLinks?: boolean;
-  /** Whether to render the bottom Done button. Defaults to true. */
+  /** @deprecated The Done action was removed; share popovers dismiss directly. */
   showDoneButton?: boolean;
   /** Optional placeholder shown in the share-URL slot when `shareUrl` is
    *  undefined. Use this to explain *why* there's no link yet (e.g. "Publish
@@ -301,7 +301,6 @@ function SharePanel(
   const {
     inviteEmail,
     setInviteEmail: onInviteEmailChange,
-    handleOpenChange,
     activeShareTab,
     handleShareTabChange,
     data,
@@ -326,7 +325,6 @@ function SharePanel(
     handleAdd,
     handleChangeRole,
     handleRemove,
-    handleDone,
   } = controller;
   const hasInviteEmail = inviteEmail.trim().length > 0;
 
@@ -367,7 +365,6 @@ function SharePanel(
     (Boolean(props.shareUrl) ||
       Boolean(props.shareUrlPlaceholder) ||
       Boolean(props.secondaryShareUrl));
-  const showDoneButton = props.showDoneButton ?? true;
   const shareUrlPlacement = props.shareUrlPlacement ?? "bottom";
   const extraTabs = props.shareTabs?.tabs ?? [];
   const hasTabs = extraTabs.length > 0;
@@ -392,17 +389,6 @@ function SharePanel(
       <div className="mb-4 h-7 rounded-md bg-muted animate-pulse" />
       <div className="mb-2 text-sm font-semibold">{generalAccessLabel}</div>
       <div className="mb-4 h-9 rounded-md bg-muted animate-pulse" />
-      {showDoneButton ? (
-        <div className="mt-2 flex justify-end">
-          <button
-            type="button"
-            onClick={() => handleOpenChange(false)}
-            className={BUTTON_PRIMARY_SM}
-          >
-            Done
-          </button>
-        </div>
-      ) : null}
     </div>
   ) : (
     <div>
@@ -579,18 +565,6 @@ function SharePanel(
       {showShareLinks && shareUrlPlacement === "bottom" ? shareLinks : null}
 
       {props.shareFooterContent}
-
-      {showDoneButton ? (
-        <div className="mt-2 flex justify-end">
-          <button
-            type="button"
-            onClick={handleDone}
-            className={BUTTON_PRIMARY_SM}
-          >
-            Done
-          </button>
-        </div>
-      ) : null}
     </div>
   );
 

package/src/client/sharing/ShareDialog.tsx

@@ -61,10 +61,6 @@ const BUTTON_OUTLINE_SM = cn(
   BUTTON_BASE,
   "!h-9 !px-3 border border-input bg-background hover:bg-accent hover:text-accent-foreground",
 );
-const BUTTON_PRIMARY_SM = cn(
-  BUTTON_BASE,
-  "!h-9 !px-4 bg-primary text-primary-foreground hover:bg-primary/90",
-);
 const BUTTON_GHOST_ICON = cn(
   BUTTON_BASE,
   "!h-8 !w-8 !p-0 text-muted-foreground hover:bg-accent hover:text-accent-foreground",
@@ -171,18 +167,6 @@ export function ShareDialog({
           ? (embedTabContent ?? <DefaultEmbedBody controller={controller} />)
           : null}
       </div>
-
-      <div className="flex justify-end border-t border-border px-5 py-3">
-        <ActionButton
-          type="button"
-          intent="primary"
-          emphasis="solid"
-          onPress={controller.close}
-          className={BUTTON_PRIMARY_SM}
-        >
-          {controller.labels.done}
-        </ActionButton>
-      </div>
     </DesignSystemDialog>
   );
 }

package/src/client/sharing/useShareButtonController.ts

@@ -105,7 +105,6 @@ export interface ShareButtonController {
   handleAdd: () => void;
   handleChangeRole: (share: ShareButtonShare, role: ShareButtonRole) => void;
   handleRemove: (share: ShareButtonShare) => void;
-  handleDone: () => void;
 }
 
 export function useShareButtonController(
@@ -547,11 +546,6 @@ export function useShareButtonController(
     ],
   );
 
-  const handleDone = useCallback(() => {
-    if (canManage && inviteEmail.trim()) handleAdd();
-    handleOpenChange(false);
-  }, [canManage, handleAdd, handleOpenChange, inviteEmail]);
-
   return {
     open,
     handleOpenChange,
@@ -585,7 +579,6 @@ export function useShareButtonController(
     handleAdd,
     handleChangeRole,
     handleRemove,
-    handleDone,
   };
 }
 

package/src/client/sharing/useShareDialogController.ts

@@ -71,7 +71,6 @@ export interface ShareDialogController {
   tabs: Array<{ value: ShareDialogTab; label: string }>;
   labels: {
     close: string;
-    done: string;
     shareOptions: string;
     generalAccess: string;
     shareLink: string;
@@ -407,7 +406,6 @@ export function useShareDialogController({
     ],
     labels: {
       close: t("share.close"),
-      done: t("share.done"),
       shareOptions: t("share.shareOptions"),
       generalAccess: t("share.generalAccess"),
       shareLink: t("share.shareLink"),

package/src/client/sse-event-processor.ts

@@ -1,5 +1,6 @@
 import type { ChatModelRunResult } from "@assistant-ui/react";
 
+import type { A2AAgentActivitySnapshot } from "../a2a/activity.js";
 import type { ActionChatUIConfig } from "../action-ui.js";
 import {
   LLM_MISSING_CREDENTIALS_ERROR_CODE,
@@ -74,6 +75,12 @@ export interface SSEEvent {
   seq?: number;
   agent?: string;
   status?: string;
+  state?: string;
+  elapsedSeconds?: number;
+  detail?: string;
+  agentCallId?: string;
+  durationMs?: number;
+  snapshot?: A2AAgentActivitySnapshot;
   reason?: string;
   // Agent task fields
   taskId?: string;
@@ -100,6 +107,12 @@ export type AgentAutoContinueReason =
 
 export type AgentActivityTrailEntry = { label: string; tool?: string };
 
+export interface AgentCallProgress {
+  state: string;
+  elapsedSeconds: number;
+  detail?: string;
+}
+
 export interface AgentAutoContinueErrorInfo {
   message: string;
   details?: string;
@@ -1365,7 +1378,7 @@ export function processEvent(
   if (ev.type === "agent_call") {
     const agentName = ev.agent ?? "agent";
     if (ev.status === "start") {
-      const toolCallId = `tc_${++toolCallCounter.value}`;
+      const toolCallId = ev.agentCallId ?? `tc_${++toolCallCounter.value}`;
       content.push({
         type: "tool-call",
         toolCallId,
@@ -1380,9 +1393,16 @@ export function processEvent(
         if (
           part.type === "tool-call" &&
           part.toolName === `agent:${agentName}` &&
+          (!ev.agentCallId || part.toolCallId === ev.agentCallId) &&
           part.result === undefined
         ) {
           part.result = ev.status === "error" ? "Error calling agent" : "Done";
+          part.structuredMeta = {
+            ...part.structuredMeta,
+            ...(ev.durationMs != null
+              ? { agentDurationMs: ev.durationMs }
+              : {}),
+          };
           break;
         }
       }
@@ -1401,6 +1421,7 @@ export function processEvent(
       if (
         part.type === "tool-call" &&
         part.toolName === `agent:${agentName}` &&
+        (!ev.agentCallId || part.toolCallId === ev.agentCallId) &&
         part.result === undefined
       ) {
         part.argsText += ev.text ?? "";
@@ -1413,6 +1434,69 @@ export function processEvent(
     };
   }
 
+  if (ev.type === "agent_call_progress") {
+    const agentName = ev.agent ?? "agent";
+    if (typeof ev.state !== "string") {
+      return { action: "continue" };
+    }
+    const elapsedSeconds =
+      typeof ev.elapsedSeconds === "number" &&
+      Number.isFinite(ev.elapsedSeconds) &&
+      ev.elapsedSeconds >= 0
+        ? ev.elapsedSeconds
+        : 0;
+    for (let i = content.length - 1; i >= 0; i--) {
+      const part = content[i];
+      if (
+        part.type === "tool-call" &&
+        part.toolName === `agent:${agentName}` &&
+        (!ev.agentCallId || part.toolCallId === ev.agentCallId) &&
+        part.result === undefined
+      ) {
+        part.structuredMeta = {
+          ...part.structuredMeta,
+          agentProgress: {
+            state: ev.state,
+            elapsedSeconds,
+            ...(ev.detail ? { detail: ev.detail } : {}),
+          } satisfies AgentCallProgress,
+        };
+        break;
+      }
+    }
+    return {
+      action: "yield",
+      result: { content: contentSnapshot(content) } as ChatModelRunResult,
+    };
+  }
+
+  if (ev.type === "agent_call_activity" && ev.snapshot) {
+    const agentName = ev.agent ?? "agent";
+    for (let i = content.length - 1; i >= 0; i--) {
+      const part = content[i];
+      if (
+        part.type === "tool-call" &&
+        part.toolName === `agent:${agentName}` &&
+        (!ev.agentCallId || part.toolCallId === ev.agentCallId)
+      ) {
+        const previous = part.structuredMeta?.agentActivity as
+          | A2AAgentActivitySnapshot
+          | undefined;
+        if (!previous || ev.snapshot.sequence >= previous.sequence) {
+          part.structuredMeta = {
+            ...part.structuredMeta,
+            agentActivity: ev.snapshot,
+          };
+        }
+        break;
+      }
+    }
+    return {
+      action: "yield",
+      result: { content: contentSnapshot(content) } as ChatModelRunResult,
+    };
+  }
+
   // ─── Agent task events (sub-agent chips) ─────────────────────────
   // These events are dispatched as CustomEvents so AgentTaskCard components
   // can listen for updates to their specific taskId.

package/src/localization/default-messages.ts

@@ -337,6 +337,12 @@ const messages = {
     configureProviderKeys: "Configure Anthropic, OpenAI, or another provider",
     checkingAiConnection: "Checking AI connection...",
     connectionUnavailable: "Unable to check AI connection. Click to retry.",
+    delegatedAgent: {
+      asking: "Asking {{name}}...",
+      asked: "Asked {{name}}",
+      error: "Error asking {{name}}",
+      elapsed: "{{duration}} elapsed",
+    },
     voiceMode: {
       entryButtonLabel: "Use microphone",
       promptTitle: "Use your voice",

package/src/scripts/agent-engines/list-agent-engines.ts

@@ -15,8 +15,6 @@ import {
   normalizeModelForEngine,
 } from "../../agent/engine/index.js";
 import type { ActionTool } from "../../agent/types.js";
-import { resolveHostedDefaultModelExperiment } from "../../observability/hosted-model-experiment.js";
-import { getRequestUserEmail } from "../../server/request-context.js";
 import { getSetting } from "../../settings/index.js";
 
 export const tool: ActionTool = {
@@ -91,15 +89,6 @@ export async function run(args: Record<string, string> = {}): Promise<string> {
           currentModelCandidate ?? currentEntry.defaultModel,
         )
       : (currentModelCandidate ?? DEFAULT_MODEL);
-  const hostedExperiment = currentEntry
-    ? resolveHostedDefaultModelExperiment({
-        userId: getRequestUserEmail(),
-        engineName: currentEntry.name,
-        isDefaultModelSelection: currentModelCandidate == null,
-        supportedModels: currentEntry.supportedModels,
-      })
-    : null;
-  const effectiveCurrentModel = hostedExperiment?.model ?? currentModel;
   const result = {
     engines: engines.map((e) => ({
       name: e.name,
@@ -116,13 +105,7 @@ export async function run(args: Record<string, string> = {}): Promise<string> {
       ? null
       : {
           engine: currentEngineName,
-          model: effectiveCurrentModel,
-          ...(hostedExperiment
-            ? {
-                modelSelectionSource: "experiment",
-                experimentAssignments: [hostedExperiment.assignment],
-              }
-            : {}),
+          model: currentModel,
         },
   };
 

package/src/scripts/call-agent.ts

@@ -1,5 +1,6 @@
 import { createHash, randomUUID } from "node:crypto";
 
+import { parseA2AAgentActivityPart } from "../a2a/activity.js";
 import {
   A2ATaskTimeoutError,
   callAgent,
@@ -271,8 +272,15 @@ export async function run(
       : undefined;
 
   if (action) {
+    const agentCallId = randomUUID();
+    const startedAt = Date.now();
     if (context?.send) {
-      context.send({ type: "agent_call", agent: agent.name, status: "start" });
+      context.send({
+        type: "agent_call",
+        agent: agent.name,
+        status: "start",
+        agentCallId,
+      });
     }
     try {
       const output = await invokeReadOnlyAppAction(
@@ -281,10 +289,24 @@ export async function run(
         input as Record<string, unknown>,
         buildDelegationCorrelation(context, selfAppId, randomUUID()),
       );
+      if (context?.send && output) {
+        context.send({
+          type: "agent_call_text",
+          agent: agent.name,
+          text: output,
+          agentCallId,
+        });
+      }
       return output;
     } finally {
       if (context?.send) {
-        context.send({ type: "agent_call", agent: agent.name, status: "done" });
+        context.send({
+          type: "agent_call",
+          agent: agent.name,
+          status: "done",
+          agentCallId,
+          durationMs: Date.now() - startedAt,
+        });
       }
     }
   }
@@ -363,6 +385,7 @@ export async function run(
 
       let responseText = "";
       let lastSentLength = 0;
+      const agentCallId = randomUUID();
       const existingContinuationText = taskId
         ? null
         : await formatExistingIntegrationContinuationIfRetry(agent, message);
@@ -372,6 +395,7 @@ export async function run(
         type: "agent_call",
         agent: agent.name,
         status: "start",
+        agentCallId,
       });
 
       const emitNewText = (newText: string) => {
@@ -380,6 +404,7 @@ export async function run(
             type: "agent_call_text",
             agent: agent.name,
             text: newText.slice(lastSentLength),
+            agentCallId,
           });
           lastSentLength = newText.length;
         }
@@ -395,9 +420,10 @@ export async function run(
       // time we get to the sync fallback, Lambda is dead and the second fetch
       // errors out as "fetch failed". Async+poll has its own short fetches
       // with their own budgets, so it works reliably across hosts. The
-      // trade-off is we lose progressive in-UI text streaming for cross-app
-      // A2A calls, but the receiving agent's full response still surfaces via
-      // the tool_result event below.
+      // trade-off is that cross-app activity arrives at the poll cadence rather
+      // than token-by-token. Agent Native peers attach their current reasoning,
+      // tool status, and response preview to each task checkpoint, and the
+      // receiver's full response still surfaces below.
       //
       // That trade-off has a second-order cost: callAgent()'s poll (see
       // A2AClient.sendAndWait in a2a/client.ts) can legitimately run for
@@ -450,8 +476,22 @@ export async function run(
       ]);
       const callStartedAt = Date.now();
       let lastProgressEmitAt = callStartedAt;
+      let lastActivitySequence = -1;
       const onRemotePollUpdate = (task: Task) => {
         const state = task?.status?.state;
+        const parts = task.status?.message?.parts;
+        const snapshot = Array.isArray(parts)
+          ? parts.map(parseA2AAgentActivityPart).find((value) => value !== null)
+          : undefined;
+        if (snapshot && snapshot.sequence > lastActivitySequence) {
+          lastActivitySequence = snapshot.sequence;
+          context.send!({
+            type: "agent_call_activity",
+            agent: agent.name,
+            agentCallId,
+            snapshot,
+          });
+        }
         if (!state || !ACTIVELY_WORKING_STATES.has(state)) return;
         const now = Date.now();
         if (now - lastProgressEmitAt < PROGRESS_MIN_INTERVAL_MS) return;
@@ -462,6 +502,7 @@ export async function run(
           agent: agent.name,
           state,
           elapsedSeconds: Math.round((now - callStartedAt) / 1000),
+          agentCallId,
           ...(detail ? { detail } : {}),
         });
       };
@@ -549,6 +590,8 @@ export async function run(
         type: "agent_call",
         agent: agent.name,
         status: "done",
+        agentCallId,
+        durationMs: Date.now() - callStartedAt,
       });
 
       return responseText || "(empty response)";
@@ -718,7 +761,7 @@ async function enqueueIntegrationContinuationIfPossible(
 const MAX_PROGRESS_DETAIL_CHARS = 200;
 function extractRemoteProgressDetail(task: Task): string | undefined {
   const parts = task.status?.message?.parts;
-  if (!parts) return undefined;
+  if (!Array.isArray(parts)) return undefined;
   const text = parts
     .filter((p): p is { type: "text"; text: string } => p.type === "text")
     .map((p) => p.text)