@agent-native/core 0.84.12 → 0.84.14

package/corpus/core/src/agent/run-store.ts

@@ -116,6 +116,7 @@ async function ensureRunTables(): Promise<void> {
           turn_id TEXT,
           error_code TEXT,
           error_detail TEXT,
+          terminal_reason TEXT,
           dispatch_mode TEXT,
           diag_stage TEXT
         )
@@ -187,6 +188,7 @@ async function ensureRunTables(): Promise<void> {
           ["turn_id", "TEXT"],
           ["error_code", "TEXT"],
           ["error_detail", "TEXT"],
+          ["terminal_reason", "TEXT"],
           ["dispatch_mode", "TEXT"],
           ["diag_stage", "TEXT"],
           ["worker_stage", "TEXT"],
@@ -264,6 +266,7 @@ async function ensureRunTables(): Promise<void> {
         "turn_id",
         "error_code",
         "error_detail",
+        "terminal_reason",
         "dispatch_mode",
         "diag_stage",
         "worker_stage",
@@ -621,6 +624,28 @@ export async function setRunError(
   }
 }
 
+/**
+ * Record why a run reached its terminal status. Unlike error_code/error_detail,
+ * this is set for successful checkpoint boundaries too (for example
+ * status='completed' + terminal_reason='run_timeout').
+ */
+export async function setRunTerminalReason(
+  runId: string,
+  terminalReason: string | undefined,
+): Promise<void> {
+  if (!terminalReason) return;
+  try {
+    await ensureRunTables();
+    const client = getDbExec();
+    await client.execute({
+      sql: `UPDATE agent_runs SET terminal_reason = ? WHERE id = ?`,
+      args: [terminalReason.slice(0, 200), runId],
+    });
+  } catch {
+    // Diagnostics are best-effort; never let them break completion.
+  }
+}
+
 /**
  * Diagnostic stage names recorded onto a background run as it moves through the
  * `_process-run` worker pipeline. Each value is the LAST stage successfully
@@ -765,7 +790,8 @@ export async function reapIfStale(
           SET status = 'errored',
               completed_at = ?,
               error_code = ?,
-              error_detail = ?
+              error_detail = ?,
+              terminal_reason = ?
           WHERE id = ?
             AND status = 'running'
             AND ${staleClause}`,
@@ -773,6 +799,7 @@ export async function reapIfStale(
       completedAt,
       STALE_RUN_ERROR_EVENT.errorCode,
       STALE_RUN_ERROR_EVENT.details,
+      STALE_RUN_ERROR_EVENT.errorCode,
       runId,
       ...staleArgs,
     ],
@@ -821,7 +848,8 @@ export async function reapUnclaimedBackgroundRun(
           SET status = 'errored',
               completed_at = ?,
               error_code = ?,
-              error_detail = ?
+              error_detail = ?,
+              terminal_reason = ?
           WHERE id = ?
             AND status = 'running'
             AND dispatch_mode = 'background'
@@ -830,6 +858,7 @@ export async function reapUnclaimedBackgroundRun(
       completedAt,
       UNCLAIMED_BACKGROUND_RUN_ERROR_EVENT.errorCode,
       UNCLAIMED_BACKGROUND_RUN_ERROR_EVENT.details,
+      UNCLAIMED_BACKGROUND_RUN_ERROR_EVENT.errorCode,
       runId,
       cutoff,
     ],
@@ -902,8 +931,8 @@ export async function markRunAborted(
   await ensureRunTables();
   const client = getDbExec();
   await client.execute({
-    sql: `UPDATE agent_runs SET status = 'aborted', abort_reason = ?, completed_at = ? WHERE id = ?`,
-    args: [reason ?? "user", Date.now(), runId],
+    sql: `UPDATE agent_runs SET status = 'aborted', abort_reason = ?, completed_at = ?, terminal_reason = ? WHERE id = ?`,
+    args: [reason ?? "user", Date.now(), `aborted:${reason ?? "user"}`, runId],
   });
   await safeAppendTerminalRunEvent(runId, { type: "done" }, "mark-aborted");
 }
@@ -1005,13 +1034,14 @@ export async function getRunByThread(
   completedAt: number | null;
   lastProgressAt: number | null;
   dispatchMode: string | null;
+  terminalReason: string | null;
   diagStage: string | null;
 } | null> {
   await ensureRunTables();
   const client = getDbExec();
   const sql = options?.includeTerminal
-    ? `SELECT id, thread_id, turn_id, status, started_at, heartbeat_at, completed_at, last_progress_at, dispatch_mode, diag_stage FROM agent_runs WHERE thread_id = ? ORDER BY started_at DESC LIMIT 1`
-    : `SELECT id, thread_id, turn_id, status, started_at, heartbeat_at, completed_at, last_progress_at, dispatch_mode, diag_stage FROM agent_runs WHERE thread_id = ? AND status = 'running' ORDER BY started_at DESC LIMIT 1`;
+    ? `SELECT id, thread_id, turn_id, status, started_at, heartbeat_at, completed_at, last_progress_at, dispatch_mode, terminal_reason, diag_stage FROM agent_runs WHERE thread_id = ? ORDER BY started_at DESC LIMIT 1`
+    : `SELECT id, thread_id, turn_id, status, started_at, heartbeat_at, completed_at, last_progress_at, dispatch_mode, terminal_reason, diag_stage FROM agent_runs WHERE thread_id = ? AND status = 'running' ORDER BY started_at DESC LIMIT 1`;
   const { rows } = await client.execute({ sql, args: [threadId] });
   if (rows.length === 0) return null;
   const r = rows[0] as {
@@ -1024,6 +1054,7 @@ export async function getRunByThread(
     completed_at: number | string | null;
     last_progress_at: number | string | null;
     dispatch_mode?: string | null;
+    terminal_reason?: string | null;
     diag_stage?: string | null;
   };
   return {
@@ -1037,6 +1068,7 @@ export async function getRunByThread(
     lastProgressAt:
       r.last_progress_at == null ? null : Number(r.last_progress_at),
     dispatchMode: r.dispatch_mode ?? null,
+    terminalReason: r.terminal_reason ?? null,
     diagStage: r.diag_stage ?? null,
   };
 }
@@ -1053,6 +1085,7 @@ export interface AgentRunSummary {
   errorCode: string | null;
   abortReason: string | null;
   dispatchMode: string | null;
+  terminalReason: string | null;
   /** Last reached `_process-run` worker stage (JSON `{stage,detail?,at}`). */
   diagStage: string | null;
 }
@@ -1065,7 +1098,7 @@ export async function listRunsForThread(
   const limit = Math.min(Math.max(options.limit ?? 10, 1), 50);
   const client = getDbExec();
   const { rows } = await client.execute({
-    sql: `SELECT id, thread_id, turn_id, status, started_at, heartbeat_at, completed_at, last_progress_at, error_code, abort_reason, dispatch_mode, diag_stage
+    sql: `SELECT id, thread_id, turn_id, status, started_at, heartbeat_at, completed_at, last_progress_at, error_code, abort_reason, dispatch_mode, terminal_reason, diag_stage
           FROM agent_runs
           WHERE thread_id = ?
           ORDER BY started_at DESC
@@ -1085,6 +1118,7 @@ export async function listRunsForThread(
       error_code?: string | null;
       abort_reason?: string | null;
       dispatch_mode?: string | null;
+      terminal_reason?: string | null;
       diag_stage?: string | null;
     };
     return {
@@ -1100,6 +1134,7 @@ export async function listRunsForThread(
       errorCode: row.error_code ?? null,
       abortReason: row.abort_reason ?? null,
       dispatchMode: row.dispatch_mode ?? null,
+      terminalReason: row.terminal_reason ?? null,
       diagStage: row.diag_stage ?? null,
     };
   });
@@ -1183,13 +1218,15 @@ export async function reapAllStaleRuns(): Promise<number> {
           SET status = 'errored',
               completed_at = ?,
               error_code = ?,
-              error_detail = ?
+              error_detail = ?,
+              terminal_reason = ?
           WHERE status = 'running'
             AND ${livenessBasisSql()} < ${backgroundAwareStaleCutoffSql()}`,
     args: [
       completedAt,
       STALE_RUN_ERROR_EVENT.errorCode,
       STALE_RUN_ERROR_EVENT.details,
+      STALE_RUN_ERROR_EVENT.errorCode,
       completedAt,
     ],
   });
@@ -1241,12 +1278,14 @@ export async function cleanupOldRuns(
           SET status = 'errored',
               completed_at = ?,
               error_code = ?,
-              error_detail = ?
+              error_detail = ?,
+              terminal_reason = ?
           WHERE status = 'running' AND started_at < ?`,
     args: [
       completedAt,
       STALE_RUN_ERROR_EVENT.errorCode,
       STALE_RUN_ERROR_EVENT.details,
+      STALE_RUN_ERROR_EVENT.errorCode,
       cutoff,
     ],
   });
@@ -1257,13 +1296,15 @@ export async function cleanupOldRuns(
           SET status = 'errored',
               completed_at = ?,
               error_code = ?,
-              error_detail = ?
+              error_detail = ?,
+              terminal_reason = ?
           WHERE status = 'running'
             AND ${livenessBasisSql()} < ${backgroundAwareStaleCutoffSql()}`,
     args: [
       completedAt,
       STALE_RUN_ERROR_EVENT.errorCode,
       STALE_RUN_ERROR_EVENT.details,
+      STALE_RUN_ERROR_EVENT.errorCode,
       completedAt,
     ],
   });
@@ -1312,6 +1353,7 @@ export async function listErroredRuns(options?: {
     status: string;
     errorCode: string | null;
     errorDetail: string | null;
+    terminalReason: string | null;
     startedAt: number;
     completedAt: number | null;
     durationMs: number | null;
@@ -1323,7 +1365,7 @@ export async function listErroredRuns(options?: {
   const since =
     options?.sinceMs && options.sinceMs > 0 ? Date.now() - options.sinceMs : 0;
   const { rows } = await client.execute({
-    sql: `SELECT id, thread_id, turn_id, status, error_code, error_detail, started_at, completed_at
+    sql: `SELECT id, thread_id, turn_id, status, error_code, error_detail, terminal_reason, started_at, completed_at
           FROM agent_runs
           WHERE status IN ('errored', 'aborted')
             AND COALESCE(completed_at, started_at) >= ?
@@ -1339,6 +1381,7 @@ export async function listErroredRuns(options?: {
       status: string;
       error_code: string | null;
       error_detail: string | null;
+      terminal_reason: string | null;
       started_at: number | string;
       completed_at: number | string | null;
     };
@@ -1352,6 +1395,7 @@ export async function listErroredRuns(options?: {
       status: row.status,
       errorCode: row.error_code ?? null,
       errorDetail: row.error_detail ?? null,
+      terminalReason: row.terminal_reason ?? null,
       startedAt,
       completedAt,
       durationMs: completedAt == null ? null : completedAt - startedAt,

package/corpus/core/src/chat-threads/store.ts

@@ -712,6 +712,7 @@ export interface UpdateThreadDataOptions {
   preserveExistingQueuedMessages?: boolean;
   preserveExistingTopLevelKeys?: boolean;
   maxAttempts?: number;
+  ignoreConflicts?: boolean;
 }
 
 function parseThreadData(value: string): any {
@@ -792,6 +793,7 @@ export async function updateThreadData(
   }
 
   if (lastConflict) {
+    if (options.ignoreConflicts) return;
     throw new Error(
       `Failed to update chat thread ${id} after concurrent write conflicts.`,
     );

package/corpus/core/src/cli/skills.ts

@@ -329,15 +329,18 @@ iteration, or a human-in-the-loop choice among design directions.
   overview board and renders an inline chat choice with one button per screen
   name. After the user picks, delete the unchosen variant screens and continue
   from the kept screen by first calling \`get-design-snapshot\` with that
-  screen's \`fileId\`, then making a bounded single-file pass.
+  screen's \`fileId\`, then calling \`edit-design\` on that same \`fileId\` in a
+  bounded single-file pass. Use \`mode: "replace-file"\` when expanding the
+  representative placeholder into the full chosen direction. Do not call
+  \`generate-design\` after a variant pick.
 - If the chat choice buttons are not available in the host, ask the user to
   tell you the screen name they prefer. The variants are already real screens
   on the board, so do not ask them to paste HTML or copy a generated handoff
   summary.
 - For direct refinements to an already chosen direction, call
   \`get-design-snapshot\`, edit from the current tuned HTML, and use
-  \`edit-design\` for surgical changes. Use \`generate-design\` for new files
-  or larger structural rewrites.
+  \`edit-design\` for surgical changes or \`mode: "replace-file"\` for a bounded
+  selected-file replacement. Use \`generate-design\` for new files only.
 - Use \`export-coding-handoff\` when the user wants to implement the chosen
   design in a codebase.
 
@@ -353,9 +356,10 @@ iteration, or a human-in-the-loop choice among design directions.
 5. After \`present-design-variants\`, wait for the user's pick before
    generating the next version. Keep the chosen screen, delete the other
    variant screens, call \`get-design-snapshot\` with \`fileId\` for the kept
-   screen, then continue from that single file in a bounded pass. Prefer
-   \`edit-design\`; if \`generate-design\` is needed, update only the kept file
-   compactly and stop after the first successful save.
+   screen, then call \`edit-design\` on that same \`fileId\` in a bounded pass.
+   Use \`mode: "replace-file"\` when expanding the representative placeholder
+   into the full chosen direction. Do not call \`generate-design\` after a
+   variant pick. Stop after the first successful \`edit-design\` save.
 
 ## Design Quality Bar
 

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

@@ -601,6 +601,31 @@ export function resolveAssistantChatSubmitIntent({
   return requestedIntent ?? "immediate";
 }
 
+export function resolveAssistantChatRunningState({
+  forceStopped,
+  isRuntimeRunning,
+  isReconnecting,
+  optimisticRunning,
+  isAutoResuming,
+}: {
+  forceStopped: boolean;
+  isRuntimeRunning: boolean;
+  isReconnecting: boolean;
+  optimisticRunning: boolean;
+  isAutoResuming: boolean;
+}): { isRunning: boolean; showRunningInUI: boolean } {
+  const isRunning =
+    !forceStopped && (isRuntimeRunning || isReconnecting || optimisticRunning);
+  return {
+    isRunning,
+    // During auto-continuation, assistant-ui can briefly mark the message done
+    // between chunks even though the adapter is about to POST the next run.
+    // Keep the visible chat state running so the latest assistant message shows
+    // Thinking/Resuming and does not expose footer actions prematurely.
+    showRunningInUI: !forceStopped && (isRunning || isAutoResuming),
+  };
+}
+
 type QueuedMessage = {
   id: string;
   text: string;
@@ -1378,14 +1403,17 @@ const AssistantChatInner = forwardRef<
   // queueing forever" state where isReconnecting or isRuntimeRunning gets
   // wedged (e.g. after a tab refresh + stop during reconnect).
   const [forceStopped, setForceStopped] = useState(false);
-  // Real running state — drives submission/queue gating. Treat reconnecting
-  // to an active run the same as running, UNLESS the user has explicitly
-  // clicked stop (forceStopped).
-  const isRunning =
-    !forceStopped && (isRuntimeRunning || isReconnecting || optimisticRunning);
-  const textStreaming = isRunning || externalStreaming;
-  // UI-only running state — drives the stop button and thinking indicator.
-  const showRunningInUI = isRunning;
+  // Real running state drives submission/queue gating; UI running also covers
+  // short auto-continuation gaps so the latest assistant message does not flash
+  // into a done state while the agent is still working.
+  const { isRunning, showRunningInUI } = resolveAssistantChatRunningState({
+    forceStopped,
+    isRuntimeRunning,
+    isReconnecting,
+    optimisticRunning,
+    isAutoResuming,
+  });
+  const textStreaming = showRunningInUI || externalStreaming;
   // A revealed activity label wins; otherwise stay a steady "Thinking" by
   // default. We only surface "Reconnecting" while we are actively replaying
   // recovered content (reconnectContent populated). A bare reconnect with no
@@ -2265,6 +2293,8 @@ const AssistantChatInner = forwardRef<
 
   useEffect(() => {
     if (!authError) return;
+    const shouldCaptureStuckAuthCard =
+      authSessionAvailable || authError.sessionExpired;
     // Auto-recovery (`checkAuthSession`) runs immediately + at 250ms. If the
     // card is still showing 3 seconds later, recovery failed and the user
     // is about to hit "Refresh chat" — that's the "Reload UI required"
@@ -2273,6 +2303,7 @@ const AssistantChatInner = forwardRef<
       void (async () => {
         const hasSession = await checkAuthSession();
         if (hasSession) return;
+        if (!shouldCaptureStuckAuthCard) return;
         captureError(new Error("agent-chat:auth_error_card_stuck"), {
           tags: {
             context: "agent-native-chat",
@@ -3211,7 +3242,7 @@ const AssistantChatInner = forwardRef<
     <CheckpointContext.Provider value={checkpointCtx}>
       <MessageActionsContext.Provider value={messageActionsCtx}>
         <ApprovalContext.Provider value={approvalCtx}>
-          <ChatRunningContext.Provider value={isRunning}>
+          <ChatRunningContext.Provider value={showRunningInUI}>
             <TextStreamingContext.Provider value={textStreaming}>
               <div
                 data-agent-empty-state={

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

@@ -807,6 +807,21 @@ function lastActivityTool(
   return undefined;
 }
 
+function formatActivityTrail(
+  trail: readonly AgentActivityTrailEntry[],
+): string | undefined {
+  const items = trail
+    .slice(-8)
+    .map((entry) => {
+      const label = entry.label.replace(/\s+/g, " ").trim();
+      const tool = entry.tool?.replace(/\s+/g, " ").trim();
+      if (label && tool && label !== tool) return `${label} (${tool})`;
+      return label || tool || "";
+    })
+    .filter(Boolean);
+  return items.length > 0 ? items.join(" > ") : undefined;
+}
+
 function lastUnresolvedToolActivity(
   content: ContentPart[],
 ): string | undefined {
@@ -928,9 +943,9 @@ function incrementalActionGuidance(tool: string): string | undefined {
       return "create a compact working v1 with `create-extension`, then use focused `update-extension` edits for refinements";
     case "generate-design":
     case "update-design":
-      return "persist a minimal first version (fewer files) with `generate-design`, then refine individual files with `edit-design` search/replace instead of resending everything";
+      return 'if an existing design file or snapshot is already in history, especially after a Design variant pick, stop retrying `generate-design`: call `get-design-snapshot` for the selected file, then call `edit-design` once on that same `fileId` (`mode: "replace-file"` for a compact full-file replacement, or search/replace for smaller edits). Use `generate-design` only for a brand-new compact first file when no target file exists yet';
     case "present-design-variants":
-      return "call `present-design-variants` with concise labels, descriptions, accent colors, and feature bullets; omit large `content` HTML when needed so the action can render compact representative screens, then refine the chosen direction with `generate-design` or `edit-design`";
+      return 'call `present-design-variants` with concise labels, descriptions, accent colors, and feature bullets; omit large `content` HTML when needed so the action can render compact representative screens. After the user picks a direction, delete unchosen screens, snapshot the selected `fileId`, and refine that same file with `edit-design` (`mode: "replace-file"` for placeholder expansion). Do not call `generate-design` after the variant pick';
     case "create-visual-plan":
     case "create-ui-plan":
     case "create-plan-design":
@@ -1439,14 +1454,36 @@ export function createAgentChatAdapter(
       let visibleContinuationPrefix: ContentPart[] = [];
       let lastAutoContinueReason: string | null = null;
       let lastRecoverableRunError: AgentAutoContinueErrorInfo | null = null;
+      let lastActivityTrail: AgentActivityTrailEntry[] = [];
       const attemptedRunIds: string[] = [];
       let authRecoveryAttempted = false;
       let continuationToolCallCounter = 0;
       const nextContinuationToolCallId = () =>
         `continuation_tc_${++continuationToolCallCounter}`;
 
+      const runDebugContextDetails = (): string => {
+        const pageOrigin =
+          typeof window !== "undefined" && window.location?.origin
+            ? window.location.origin
+            : "";
+        return [
+          `api_url: ${apiUrl}`,
+          pageOrigin ? `page_origin: ${pageOrigin}` : "",
+          tabId ? `tab_id: ${tabId}` : "",
+          threadId ? `thread_id: ${threadId}` : "",
+          `turn_id: ${turnId}`,
+          runId ? `current_run: ${runId}` : "",
+          attemptedRunIds.length > 0
+            ? `attempted_runs: ${attemptedRunIds.join(", ")}`
+            : "",
+        ]
+          .filter(Boolean)
+          .join("\n");
+      };
+
       const connectionRecoveryDetails = (): string => {
         return [
+          runDebugContextDetails(),
           lastAutoContinueReason
             ? `last_auto_continue_reason: ${lastAutoContinueReason}`
             : "",
@@ -1468,10 +1505,10 @@ export function createAgentChatAdapter(
           lastPreparingToolName
             ? `last_preparing_tool: ${lastPreparingToolName}`
             : "",
-          `total_transient_continuations: ${totalTransientContinuationAttempts}`,
-          attemptedRunIds.length > 0
-            ? `attempted_runs: ${attemptedRunIds.join(", ")}`
+          formatActivityTrail(lastActivityTrail)
+            ? `activity_trail: ${formatActivityTrail(lastActivityTrail)}`
             : "",
+          `total_transient_continuations: ${totalTransientContinuationAttempts}`,
         ]
           .filter(Boolean)
           .join("\n");
@@ -1559,6 +1596,7 @@ export function createAgentChatAdapter(
             lastSeq,
             contentParts: content.length,
             attemptedRunIds: [...attemptedRunIds],
+            activityTrail: [...lastActivityTrail],
             startupRecoveryAttempts,
             staleRunContinuationAttempts,
             stalledTransientContinuationAttempts,
@@ -1867,6 +1905,7 @@ export function createAgentChatAdapter(
           completedToolName?: string;
         } => {
           lastAutoContinueReason = signal.reason;
+          lastActivityTrail = [...signal.activityTrail];
           if (signal.errorInfo) {
             lastRecoverableRunError = signal.errorInfo;
           }

package/corpus/core/src/client/blocks/library/diagram.tsx

@@ -291,7 +291,7 @@ function PositionedDiagram({
               return (
                 <span
                   key={`${edge.from}-${edge.to}-${index}-label`}
-                  className="absolute z-10 max-w-[130px] -translate-x-1/2 -translate-y-1/2 rounded-full border border-border bg-background px-2 py-0.5 text-center text-[11px] font-semibold text-muted-foreground shadow-sm"
+                  className="absolute z-10 max-w-[130px] -translate-x-1/2 -translate-y-1/2 break-words rounded-full border border-border bg-background px-2 py-0.5 text-center text-[11px] font-semibold text-muted-foreground shadow-sm [overflow-wrap:anywhere]"
                   style={{
                     left: `${(from.displayX + to.displayX) / 2}%`,
                     top: `${(from.displayY + to.displayY) / 2}%`,
@@ -305,7 +305,7 @@ function PositionedDiagram({
           {displayNodesForDirection.map((node, index) => (
             <article
               key={node.id}
-              className="absolute z-20 -translate-x-1/2 -translate-y-1/2 rounded-xl border-2 border-border bg-background p-3 text-foreground shadow-sm"
+              className="absolute z-20 -translate-x-1/2 -translate-y-1/2 break-words rounded-xl border-2 border-border bg-background p-3 text-foreground shadow-sm [overflow-wrap:anywhere]"
               style={{
                 left: `${node.displayX}%`,
                 top: `${node.displayY}%`,
@@ -485,7 +485,7 @@ function SequenceDiagram({
               {next && (
                 <div className="grid min-w-[72px] justify-items-center gap-1 text-muted-foreground">
                   {edge?.label && (
-                    <span className="max-w-[96px] truncate rounded-full border border-border px-2 py-0.5 text-[11px] font-semibold">
+                    <span className="max-w-[96px] whitespace-normal break-words rounded-full border border-border px-2 py-0.5 text-center text-[11px] font-semibold [overflow-wrap:anywhere]">
                       {edge.label}
                     </span>
                   )}

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

@@ -784,19 +784,31 @@ function assistantMessageStatusIsTerminal(message: {
   return statusType === "complete" || statusType === "incomplete";
 }
 
+export function assistantMessageHasUnresolvedTool(content: unknown): boolean {
+  if (!Array.isArray(content)) return false;
+  return content.some((part): boolean => {
+    if (!part || typeof part !== "object") return false;
+    const record = part as { type?: unknown; result?: unknown };
+    return record.type === "tool-call" && record.result === undefined;
+  });
+}
+
 export function shouldShowAssistantMessageFooter({
   isLast,
   chatRunning,
   hasRenderableContent,
   statusIsTerminal,
+  hasUnresolvedTool,
 }: {
   isLast: boolean;
   chatRunning: boolean;
   hasRenderableContent: boolean;
   statusIsTerminal: boolean;
+  hasUnresolvedTool?: boolean;
 }): boolean {
   if (!hasRenderableContent) return false;
   if (!isLast) return true;
+  if (hasUnresolvedTool) return false;
   return !chatRunning && statusIsTerminal;
 }
 
@@ -813,11 +825,13 @@ export function AssistantMessage() {
     thread.messages.length > 0 &&
     thread.messages[thread.messages.length - 1].id === msg.id;
   const hasRenderableContent = assistantMessageHasRenderableContent(msg);
+  const hasUnresolvedTool = assistantMessageHasUnresolvedTool(msg.content);
   const isComplete = shouldShowAssistantMessageFooter({
     isLast,
     chatRunning,
     hasRenderableContent,
     statusIsTerminal: assistantMessageStatusIsTerminal(msg),
+    hasUnresolvedTool,
   });
   const cpCtx = React.useContext(CheckpointContext);
 
@@ -907,6 +921,9 @@ export function AssistantMessage() {
         {isComplete && hasCodeAgentTools && msgContent && (
           <FilesChangedSummary parts={msgContent} />
         )}
+        {isLast && hasUnresolvedTool && !chatRunning && (
+          <RunningActivityStatus label="Thinking" />
+        )}
       </div>
       {isComplete && (
         <div className="mt-1 flex items-center justify-between">