@agent-native/core 0.114.16 → 0.115.1

package/agent-native.eject.json

@@ -61,6 +61,7 @@
         "gmail",
         "google_drive",
         "hubspot",
+        "salesforce",
         "jira",
         "sentry",
         "granola",
@@ -98,6 +99,7 @@
         "granola",
         "grafana",
         "hubspot",
+        "salesforce",
         "jira",
         "mixpanel",
         "notion",

package/corpus/README.md

@@ -28,6 +28,6 @@ rg -n "defineAction|useActionQuery" node_modules/@agent-native/core/corpus
 
 ## Generated Counts
 
-- core files: 1521
-- toolkit files: 137
-- template files: 6194
+- core files: 1527
+- toolkit files: 144
+- template files: 6367

package/corpus/core/CHANGELOG.md

@@ -1,5 +1,34 @@
 # @agent-native/core
 
+## 0.115.1
+
+### Patch Changes
+
+- 321567c: Add `app-branding` and `app-permissions` to the default framework skill set. `app-branding` is layout-aware — it handles both the centralized `app/lib/app-config.ts` source-of-truth layout and the inlined layout where the name/title live across `package.json`, route `meta()`, and `app/root.tsx`. Generated apps using `frameworkSkills: "default"` now receive both skills on scaffold and `skills update`.
+
+## 0.115.0
+
+### Minor Changes
+
+- 0341a7d: Allow the published CLI to scaffold the hidden CRM template explicitly, and include factory-backed actions in production static registries.
+- 0341a7d: Pass trusted trigger automation lineage and a stored policy id to action runs.
+- 0341a7d: Add reusable per-app dashboard storage factories, bounded revision history, and provider-neutral panel source resolvers.
+- 0341a7d: Add Salesforce workspace connections and CRM reader metadata for template-owned integrations.
+
+### Patch Changes
+
+- 0341a7d: Allow hosted authenticated requests to use deployment-level transactional email configuration.
+- 0341a7d: Keep Netlify-hosted apps and their databases warm with site-local scheduled health checks.
+- 0341a7d: Prevent duplicate Thinking statuses and scroll bounce during streamed reasoning, while giving active tool rows a clear live state and new tool rows a subtle entrance.
+- 0341a7d: Require an explicit workspace connection when making Salesforce provider API requests, so each request uses a matched instance URL and OAuth account.
+- 0341a7d: Prevent model gateways from breaking extension edits by using a compact required update contract and normalizing optional placeholder arguments before validation.
+- 0341a7d: Fix Salesforce token refresh when configured with Consumer Key/Secret.
+- 0341a7d: Allow recurring jobs to bind an explicit MCP tool allowlist and resolve those connected capabilities with the job's existing user/org OAuth context.
+- 0341a7d: Teach the agent-native-docs skill to reuse node_modules reference source with rg and cp: version-matched installed source beats web docs, and every first-party template's corpus is fair game to copy and adapt, not just runtime internals that need the customizing-agent-native ladder.
+- 0341a7d: Make the missing-AI composer state visibly actionable with a Connect AI button.
+- Updated dependencies [0341a7d]
+  - @agent-native/toolkit@0.9.0
+
 ## 0.114.16
 
 ### Patch Changes

package/corpus/core/agent-native.eject.json

@@ -61,6 +61,7 @@
         "gmail",
         "google_drive",
         "hubspot",
+        "salesforce",
         "jira",
         "sentry",
         "granola",
@@ -98,6 +99,7 @@
         "granola",
         "grafana",
         "hubspot",
+        "salesforce",
         "jira",
         "mixpanel",
         "notion",

package/corpus/core/docs/content/agent-native-toolkit.mdx

@@ -112,6 +112,22 @@ being rebuilt in slightly different ways every time.
   keep an independent lifecycle manifest, dependency graph, and release cadence.
 - Dispatch remains a **separate product**, not a Toolkit capability module.
 
+## Dashboard kit {#dashboard-kit}
+
+`@agent-native/toolkit/dashboard` is an ejectable, presentation-only unit for
+metric and stats cards, data tables, date-range controls, panel ordering and
+layout, and generic chart rendering. It receives rows and callbacks from an
+app-owned adapter: it never fetches data, resolves credentials, or owns a
+dashboard's state.
+
+Use `agent-native eject inspect toolkit/dashboard` before applying
+`toolkit/dashboard` to an app. Keep durable dashboards in that app with
+`@agent-native/core/dashboard-storage`: instantiate its access-scoped schema
+and store per app, not in a cross-app dashboard table. Panel data flows through
+a `PanelSourceResolver`; the built-in `program` source runs an app-owned data
+program and is the canonical no-provider default. Provider resolvers belong in
+the app that owns their connection and query policy.
+
 ## Implementation Boundary {#implementation-boundary}
 
 Toolkit docs are organized by reusable product capability, not npm package.

package/corpus/core/docs/content/recurring-jobs.mdx

@@ -60,9 +60,37 @@ That's it. The body is a prompt the agent runs at each scheduled firing. The age
 | `lastStatus` | `"success"` \| `"error"` \| … | _(managed)_  | Latest outcome.                                                                                        |
 | `lastError`  | string                        | _(managed)_  | Error message if the last run failed.                                                                  |
 | `nextRun`    | ISO timestamp                 | _(managed)_  | Computed from `schedule`; used by the scheduler to decide when to fire next.                           |
+| `mcpTools`   | array of MCP tool names       | _(none)_     | Optional explicit allowlist such as `mcp__server__tool`; credentials stay in the connected MCP grant.  |
 
 The `last*` and `nextRun` fields are written by the scheduler. You can read them to see the history, but don't edit them by hand — the next run will overwrite.
 
+## Connecting MCP tools to a job {#connected-mcps}
+
+Recurring jobs can use remote or local MCP tools that are already connected to
+the app. Ask the agent to discover the exact names with `tool-search`, then
+bind only the tools that job needs with `mcpTools`:
+
+```md
+---
+schedule: "0 * * * *"
+enabled: true
+mcpTools:
+  ["mcp__meeting-notes__list_recordings", "mcp__meeting-notes__get_transcript"]
+---
+
+Find new recordings since the last successful run. Extract only actionable
+follow-ups, then call the app's bounded import action once with stable source
+and external ids, a short citation, and the recording URL. Do not import the
+full transcript.
+```
+
+The job stores tool names, not MCP URLs, access tokens, or OAuth refresh
+tokens. At run time, the framework resolves the connected grant in the job's
+creator or organization request context and exposes only the allowlisted
+tools. Keep the list narrow, and use an idempotent app action for the final
+import so overlapping runs do not create duplicates. See [MCP Clients](/docs/mcp-clients)
+for connection and OAuth setup.
+
 ## Cron syntax {#cron}
 
 Standard 5-field cron (minute, hour, day-of-month, month, day-of-week):
@@ -191,12 +219,12 @@ The scheduler is a framework plugin (the internal `processRecurringJobs()` routi
 
 A single `manage-jobs` tool is registered in every template. The `action` parameter selects the operation:
 
-| Action   | Parameters                                                                 | Purpose                                                      |
-| -------- | -------------------------------------------------------------------------- | ------------------------------------------------------------ |
-| `create` | `name`, `schedule`, `instructions` (required); `scope`, `runAs`, `model`   | Create a new recurring job                                   |
-| `list`   | `scope` (`personal`, `shared`, or all)                                     | List all jobs with status (schedule, enabled, last/next run) |
-| `update` | `name` (required); `schedule`, `instructions`, `enabled`, `runAs`, `model` | Edit an existing job                                         |
-| `delete` | `name` (required)                                                          | Delete a job — always confirm with the user first            |
+| Action   | Parameters                                                                             | Purpose                                                      |
+| -------- | -------------------------------------------------------------------------------------- | ------------------------------------------------------------ |
+| `create` | `name`, `schedule`, `instructions` (required); `scope`, `runAs`, `model`, `mcpTools`   | Create a new recurring job                                   |
+| `list`   | `scope` (`personal`, `shared`, or all)                                                 | List all jobs with status (schedule, enabled, last/next run) |
+| `update` | `name` (required); `schedule`, `instructions`, `enabled`, `runAs`, `model`, `mcpTools` | Edit an existing job                                         |
+| `delete` | `name` (required)                                                                      | Delete a job — always confirm with the user first            |
 
 `model` is optional on both `create` and `update` — pass a model id to override the channel/app/engine default for that one routine.
 
@@ -216,4 +244,5 @@ Recurring jobs are "how do I make the agent act on its own?" The scheduling pack
 - [**Automations**](/docs/automations) — add event triggers and conditions to the same `jobs/` format
 - [**Agent Resources**](/docs/workspace) — where jobs live alongside skills, memory, and custom agents
 - [**Actions**](/docs/actions) — the tools a job calls
+- [**MCP Clients**](/docs/mcp-clients) — connect remote or local MCP tools and OAuth grants
 - [**Agent Teams**](/docs/agent-teams) — jobs often spawn sub-agents to do parallel work

package/corpus/core/export-snapshot.json

@@ -144,6 +144,10 @@
       "dist/data-programs/index.d.ts",
       "dist/data-programs/index.js"
     ],
+    "./dashboard-storage": [
+      "dist/dashboard-storage/index.d.ts",
+      "dist/dashboard-storage/index.js"
+    ],
     "./data-widgets": ["dist/data-widgets/index.js"],
     "./db": ["dist/db/index.js"],
     "./db-admin": ["dist/db-admin/index.js"],

package/corpus/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-native/core",
-  "version": "0.114.16",
+  "version": "0.115.1",
   "description": "Framework for agent-native application development — where AI agents and UI share SQL state, actions, and context",
   "homepage": "https://github.com/BuilderIO/agent-native#readme",
   "bugs": {
@@ -276,6 +276,10 @@
       "types": "./dist/data-programs/index.d.ts",
       "default": "./dist/data-programs/index.js"
     },
+    "./dashboard-storage": {
+      "types": "./dist/dashboard-storage/index.d.ts",
+      "default": "./dist/dashboard-storage/index.js"
+    },
     "./local-artifacts": {
       "types": "./dist/local-artifacts/index.d.ts",
       "default": "./dist/local-artifacts/index.js"

package/corpus/core/src/action.ts

@@ -27,8 +27,27 @@ import type { ActionAuditConfig } from "./audit/types.js";
  * - `"a2a"` — a direct, explicitly exposed read-only A2A action dispatch.
  *   Natural-language A2A delegation still runs through the agent loop and its
  *   selected actions are attributed as `"tool"`.
+ * - `"automation"` — an event-triggered automation dispatched from a stored
+ *   workspace trigger with trusted trigger lineage.
  */
-export type ActionCaller = "tool" | "http" | "frontend" | "cli" | "mcp" | "a2a";
+export type ActionCaller =
+  | "tool"
+  | "http"
+  | "frontend"
+  | "cli"
+  | "mcp"
+  | "a2a"
+  | "automation";
+
+/**
+ * Trusted automation lineage added by the trigger dispatcher. Action inputs
+ * must never be used to create or override this context.
+ */
+export interface ActionAutomationContext {
+  triggerId: string;
+  triggerName: string;
+  policyId?: string;
+}
 
 /**
  * Context passed as the optional second argument to an action's `run`.
@@ -56,6 +75,8 @@ export interface ActionRunContext {
   orgId?: string | null;
   /** How this action was invoked. */
   caller: ActionCaller;
+  /** Present only for trigger-dispatched automation calls. */
+  automation?: ActionAutomationContext;
   /** Verified network lineage for direct delegated action calls. */
   networkProtocol?: "a2a" | "mcp" | "provider-api";
   networkId?: string;

package/corpus/core/src/agent/production-agent.ts

@@ -8,7 +8,11 @@ import {
 } from "h3";
 import type { EventHandler as H3EventHandler } from "h3";
 
-import { isAgentActionStopError, type ActionCaller } from "../action.js";
+import {
+  isAgentActionStopError,
+  type ActionAutomationContext,
+  type ActionCaller,
+} from "../action.js";
 import { readAppState } from "../application-state/script-helpers.js";
 import { isReadOnlyShellCommand } from "../coding-tools/index.js";
 import { extensionIdFromPathname } from "../extensions/path.js";
@@ -3107,6 +3111,91 @@ const rawToolInputAjv = new Ajv({
 
 const rawToolInputValidatorCache = new WeakMap<object, ValidateFunction>();
 
+const optionalPlaceholderAjv = new Ajv({
+  strict: false,
+  allErrors: false,
+  coerceTypes: false,
+  useDefaults: false,
+  removeAdditional: false,
+});
+
+const optionalPlaceholderValidatorCache = new WeakMap<
+  object,
+  ValidateFunction
+>();
+
+function isStructurallyEmptyToolValue(value: unknown): boolean {
+  if (value === false) return true;
+  if (value === null) return true;
+  if (typeof value === "string") return value.trim().length === 0;
+  if (Array.isArray(value)) {
+    return (
+      value.length === 0 ||
+      value.every(
+        (item) =>
+          item !== null &&
+          typeof item === "object" &&
+          !Array.isArray(item) &&
+          Object.keys(item).length === 0,
+      )
+    );
+  }
+  return (
+    typeof value === "object" &&
+    value !== null &&
+    Object.keys(value).length === 0
+  );
+}
+
+function schemaAcceptsToolValue(schema: object, value: unknown): boolean {
+  let validator = optionalPlaceholderValidatorCache.get(schema);
+  if (!validator) {
+    try {
+      validator = optionalPlaceholderAjv.compile(schema);
+      optionalPlaceholderValidatorCache.set(schema, validator);
+    } catch {
+      return false;
+    }
+  }
+  return Boolean(validator(value));
+}
+
+/**
+ * Some model gateways fill every optional tool field with an empty sentinel
+ * instead of omitting it. One schema-invalid empty value proves that pattern;
+ * only then strip the other optional empty/default sentinels from the call.
+ * Calls whose empty values are all schema-valid keep their intentional clears.
+ */
+function normalizeOptionalToolPlaceholders(
+  schema: RawJsonSchema | undefined,
+  input: unknown,
+): { input: unknown; changed: boolean } {
+  if (!schema?.properties || !input || typeof input !== "object") {
+    return { input, changed: false };
+  }
+  if (Array.isArray(input)) return { input, changed: false };
+
+  const required = new Set(
+    Array.isArray(schema.required) ? schema.required : [],
+  );
+  const placeholders: string[] = [];
+  let hasSchemaInvalidPlaceholder = false;
+  for (const [key, value] of Object.entries(input as Record<string, unknown>)) {
+    if (required.has(key) || !isStructurallyEmptyToolValue(value)) continue;
+    const propertySchema = schema.properties[key];
+    if (!propertySchema || typeof propertySchema !== "object") continue;
+    placeholders.push(key);
+    if (!schemaAcceptsToolValue(propertySchema, value)) {
+      hasSchemaInvalidPlaceholder = true;
+    }
+  }
+  if (!hasSchemaInvalidPlaceholder) return { input, changed: false };
+
+  const normalized = { ...(input as Record<string, unknown>) };
+  for (const key of placeholders) delete normalized[key];
+  return { input: normalized, changed: true };
+}
+
 function getRawToolInputValidator(schema: RawJsonSchema): ValidateFunction {
   const cached = rawToolInputValidatorCache.get(schema);
   if (cached) return cached;
@@ -3163,6 +3252,8 @@ export async function runAgentLoop(opts: {
   orgId?: string | null;
   /** Action invocation attribution. Defaults to the normal agent tool loop. */
   actionCaller?: ActionCaller;
+  /** Trusted trigger lineage for automation-dispatched action calls. */
+  automation?: ActionAutomationContext;
   /** Concrete execution id used for cross-app trace correlation. */
   runId?: string;
   /** Verified/telemetry-only delegated lineage supplied by the transport. */
@@ -4068,11 +4159,20 @@ export async function runAgentLoop(opts: {
     const runToolCall = async (
       toolCall: import("./engine/types.js").EngineToolCallPart,
     ): Promise<EngineContentPart> => {
+      const actionEntry = actions[toolCall.name];
+      const placeholderNormalization = actionEntry
+        ? normalizeOptionalToolPlaceholders(
+            actionEntry.tool.parameters,
+            toolCall.input,
+          )
+        : { input: toolCall.input, changed: false };
+      if (placeholderNormalization.changed) {
+        toolCall = { ...toolCall, input: placeholderNormalization.input };
+      }
       const wireToolInput = JSON.stringify(toolCall.input ?? {});
       const normalizedToolInput = normalizeToolCallInputForHistory(
         toolCall.input,
       );
-      const actionEntry = actions[toolCall.name];
       const sourceSweepGuard = shouldGuardRepeatedSourceSweep({
         toolName: toolCall.name,
         entry: actionEntry,
@@ -4227,6 +4327,7 @@ export async function runAgentLoop(opts: {
                     userEmail: getRequestUserEmail(),
                     orgId: getRequestOrgId() ?? null,
                     caller: opts.actionCaller ?? "tool",
+                    automation: opts.automation,
                     networkProtocol: opts.networkProtocol,
                     networkId: opts.networkId,
                     networkPeer: opts.networkPeer,
@@ -4490,7 +4591,7 @@ export async function runAgentLoop(opts: {
       });
 
       const toolCallSchemaError = toolCallErrors.get(toolCall.id);
-      if (toolCallSchemaError) {
+      if (toolCallSchemaError && !placeholderNormalization.changed) {
         const result = finalizeToolErrorResult(
           toolInputSchemaErrorResult(
             toolCall.name,
@@ -4663,6 +4764,7 @@ export async function runAgentLoop(opts: {
           userEmail: actionUserEmail ?? undefined,
           orgId: actionOrgId,
           caller: opts.actionCaller ?? "tool",
+          automation: opts.automation,
           networkProtocol: opts.networkProtocol,
           networkId: opts.networkId,
           networkPeer: opts.networkPeer,

package/corpus/core/src/cli/templates-meta.ts

@@ -228,6 +228,18 @@ export const TEMPLATES: TemplateMeta[] = [
     hidden: true,
     core: false,
   },
+  {
+    name: "crm",
+    label: "CRM",
+    hint: "Agent-native CRM companion with scoped HubSpot intelligence, workflows, and write proposals",
+    icon: "Users",
+    color: "#2563EB",
+    colorRgb: "37 99 235",
+    devPort: 8107,
+    hidden: true,
+    defaultMode: "dev",
+    core: false,
+  },
   {
     name: "macros",
     label: "Macros",

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

@@ -1591,6 +1591,15 @@ export function shouldShowGlobalRunningStatus({
   ) {
     return false;
   }
+  // The reasoning cell already owns the generic Thinking state. Activity
+  // events can briefly reassert that same label between reasoning deltas;
+  // rendering both makes a second Thinking row flash beneath the thought.
+  if (
+    runningActivityLabel === "Thinking" &&
+    (latestMessageHasReasoning || contentHasVisibleReasoning(reconnectContent))
+  ) {
+    return false;
+  }
   if (runningActivityLabel) return true;
 
   return (
@@ -1598,6 +1607,16 @@ export function shouldShowGlobalRunningStatus({
   );
 }
 
+export function assistantChatAutoscrollStatusKey({
+  showGlobalRunningStatus,
+  runningStatusLabel,
+}: {
+  showGlobalRunningStatus: boolean;
+  runningStatusLabel: string;
+}): string {
+  return showGlobalRunningStatus ? runningStatusLabel : "idle";
+}
+
 type QueuedMessage = {
   id: string;
   text: string;
@@ -4804,11 +4823,28 @@ const AssistantChatInner = forwardRef<
         adapterHandoffPending || reconnectTailOnlyRef.current,
     },
   );
+  const latestMessage = messages[messages.length - 1];
+  const reconnectStatusContent =
+    visibleReconnectContent.length > 0
+      ? visibleReconnectContent
+      : reconnectContent.length === 0
+        ? reconnectActivityContent
+        : [];
+  const showGlobalRunningStatus = shouldShowGlobalRunningStatus({
+    showRunningInUI,
+    runningActivityLabel,
+    runningActivityTool,
+    latestMessage,
+    reconnectContent: reconnectStatusContent,
+  });
   const autoscrollFollowKey = [
     messages.map(messageFollowKey).join(";"),
     `q:${queuedMessages.map(queuedMessageFollowKey).join("|")}`,
     `r:${reconnectContentFollowKey(visibleReconnectContent)}`,
-    `status:${showRunningInUI ? runningStatusLabel : "idle"}`,
+    `status:${assistantChatAutoscrollStatusKey({
+      showGlobalRunningStatus,
+      runningStatusLabel,
+    })}`,
   ].join(";;");
   const {
     scrollRef,
@@ -4882,21 +4918,7 @@ const AssistantChatInner = forwardRef<
     () => latestNonRecoveryUserMessageText(messages),
     [messages],
   );
-  const latestMessage = messages[messages.length - 1];
   const latestMessageRole = latestMessage?.role;
-  const reconnectStatusContent =
-    visibleReconnectContent.length > 0
-      ? visibleReconnectContent
-      : reconnectContent.length === 0
-        ? reconnectActivityContent
-        : [];
-  const showGlobalRunningStatus = shouldShowGlobalRunningStatus({
-    showRunningInUI,
-    runningActivityLabel,
-    runningActivityTool,
-    latestMessage,
-    reconnectContent: reconnectStatusContent,
-  });
   const latestAssistantWasPlan =
     latestMessageRole === "assistant" &&
     getRequestModeMetadata(latestMessage) === "plan";
@@ -5535,18 +5557,23 @@ const AssistantChatInner = forwardRef<
                               className="agent-composer-missing-key-trigger"
                               aria-label="Connect AI to start chatting"
                             >
-                              <span className="agent-composer-missing-key-copy">
-                                <span className="agent-composer-missing-key-title">
-                                  {missingApiKeySetupLayout === "sidebar"
-                                    ? "Connect AI to chat"
-                                    : "Connect AI to start chatting"}
-                                </span>
-                                {missingApiKeySetupLayout !== "sidebar" ? (
-                                  <span className="agent-composer-missing-key-description">
-                                    Builder.io includes free credits, or use
-                                    your own API key.
+                              <span className="agent-composer-missing-key-content">
+                                <span className="agent-composer-missing-key-copy">
+                                  <span className="agent-composer-missing-key-title">
+                                    {missingApiKeySetupLayout === "sidebar"
+                                      ? "Connect AI to chat"
+                                      : "Connect AI to start chatting"}
                                   </span>
-                                ) : null}
+                                  {missingApiKeySetupLayout !== "sidebar" ? (
+                                    <span className="agent-composer-missing-key-description">
+                                      Builder.io includes free credits, or use
+                                      your own API key.
+                                    </span>
+                                  ) : null}
+                                </span>
+                                <span className="agent-composer-missing-key-cta">
+                                  Connect AI
+                                </span>
                               </span>
                             </button>
                           </PopoverTrigger>

package/corpus/core/src/client/agent-page/AgentJobsTab.tsx

@@ -432,6 +432,25 @@ export function AgentJobsTab({ canManageOrg = false }: AgentPageTabProps) {
               <p className="mt-1 whitespace-pre-wrap text-sm text-muted-foreground">
                 {detailsTarget.instructions}
               </p>
+              {detailsTarget.mcpTools.length > 0 ? (
+                <div className="mt-4">
+                  <p className="text-xs font-medium text-foreground">
+                    {t("jobs.mcpTools", {
+                      defaultValue: "Connected MCP tools",
+                    })}
+                  </p>
+                  <div className="mt-1 flex flex-wrap gap-1.5">
+                    {detailsTarget.mcpTools.map((toolName) => (
+                      <code
+                        key={toolName}
+                        className="rounded bg-muted px-1.5 py-0.5 text-[11px] text-muted-foreground"
+                      >
+                        {toolName}
+                      </code>
+                    ))}
+                  </div>
+                </div>
+              ) : null}
             </div>
           ) : null}
         </DialogContent>

package/corpus/core/src/client/agent-page/use-jobs.ts

@@ -18,6 +18,7 @@ export interface RecurringJob {
   lastError: string | null;
   nextRun: string | null;
   createdBy: string | null;
+  mcpTools: string[];
   canUpdate: boolean;
 }
 

package/corpus/core/src/client/chat/message-components.tsx

@@ -859,6 +859,27 @@ export function assistantMessageHasUnresolvedTool(content: unknown): boolean {
   });
 }
 
+// Only the last assistant message may shimmer as "the currently running
+// tool" — an older message's dangling unresolved tool-call must never
+// shimmer once a later run is active.
+export function computeLatestRunningToolCallId(
+  content: ContentPart[] | undefined,
+  { chatRunning, isLast }: { chatRunning: boolean; isLast: boolean },
+): string | null {
+  if (!isLast) return null;
+  return (
+    content?.reduce(
+      (latestToolCallId, part) =>
+        part.type === "tool-call" &&
+        part.result === undefined &&
+        (chatRunning || part.activity === true)
+          ? part.toolCallId
+          : latestToolCallId,
+      null as string | null,
+    ) ?? null
+  );
+}
+
 export function shouldShowAssistantMessageFooter({
   isLast,
   chatRunning,
@@ -1157,6 +1178,10 @@ export function AssistantMessage() {
         (p.type !== "tool-call" || p.activity !== true) &&
         isCollapsibleAssistantWorkPart(p),
     );
+  const latestRunningToolCallId = computeLatestRunningToolCallId(msgContent, {
+    chatRunning,
+    isLast,
+  });
 
   if (!hasRenderableContent) return null;
 
@@ -1201,7 +1226,16 @@ export function AssistantMessage() {
               case "reasoning":
                 return <ReasoningMessagePart />;
               case "tool-call":
-                return part.toolUI ?? <ToolCallFallback {...part} />;
+                return (
+                  part.toolUI ?? (
+                    <ToolCallFallback
+                      {...part}
+                      isLatestRunning={
+                        part.toolCallId === latestRunningToolCallId
+                      }
+                    />
+                  )
+                );
               default:
                 return null;
             }