@agent-native/core 0.115.3 → 0.116.0

package/docs/content/recurring-jobs.mdx

@@ -9,7 +9,7 @@ A **recurring job** is a prompt that runs on a cron schedule. It's how the agent
 
 Recurring jobs fire on a clock. To react to _events_ (a booking created, an email received) — same `jobs/` file format plus conditions — see [Automations](/docs/automations).
 
-Jobs live in [Agent Resources](/docs/workspace) at `jobs/<name>.md` — just a Markdown file with YAML frontmatter. No registration, no wiring. Drop the file in and the framework picks it up.
+Jobs live in [Agent Resources](/docs/agent-resources) at `jobs/<name>.md` — just a Markdown file with YAML frontmatter. No registration, no wiring. Drop the file in and the framework picks it up.
 
 ## A job file {#job-file}
 
@@ -40,12 +40,12 @@ Jobs live in [Agent Resources](/docs/workspace) at `jobs/<name>.md` — just a M
     {
       lines: "7-12",
       label: "The prompt",
-      note: "The body is just a prompt — the agent runs it at each firing with all its normal tools and workspace context.",
+      note: "The body is just a prompt — the agent runs it at each firing with all its normal tools and agent context.",
     },
   ]}
 />
 
-That's it. The body is a prompt the agent runs at each scheduled firing. The agent has access to all the same tools and workspace context it has in an interactive chat — actions, skills, memory, connected MCP servers, sub-agents.
+That's it. The body is a prompt the agent runs at each scheduled firing. The agent has access to all the same tools and agent context it has in an interactive chat — actions, skills, memory, connected MCP servers, sub-agents.
 
 ## Frontmatter {#frontmatter}
 
@@ -54,7 +54,7 @@ That's it. The body is a prompt the agent runs at each scheduled firing. The age
 | `schedule`   | cron expression               | _(required)_ | Standard 5-field cron. `"0 7 * * *"` = every day at 07:00; `"0 */4 * * *"` = every 4 hours.            |
 | `enabled`    | boolean                       | `true`       | Flip to `false` to pause without deleting the job.                                                     |
 | `runAs`      | `"creator"` \| `"shared"`     | `"creator"`  | `"creator"` runs with the job owner's identity and `ANTHROPIC_API_KEY`. `"shared"` uses the org's key. |
-| `createdBy`  | email                         | _(auto)_     | Populated when the job is created through the workspace UI or by the agent.                            |
+| `createdBy`  | email                         | _(auto)_     | Populated when the job is created through the Agent Resources UI or by the agent.                      |
 | `orgId`      | string                        | _(auto)_     | Org scope; inherited from the creator's active org.                                                    |
 | `lastRun`    | ISO timestamp                 | _(managed)_  | Written by the scheduler after each run.                                                               |
 | `lastStatus` | `"success"` \| `"error"` \| … | _(managed)_  | Latest outcome.                                                                                        |
@@ -211,7 +211,7 @@ The scheduler is a framework plugin (the internal `processRecurringJobs()` routi
 
 ## Debugging a job {#debugging}
 
-- Open `jobs/<name>.md` in the workspace — the frontmatter shows `lastRun`, `lastStatus`, `lastError`, `nextRun`.
+- Open `jobs/<name>.md` in Agent Resources — the frontmatter shows `lastRun`, `lastStatus`, `lastError`, `nextRun`.
 - **Test it without waiting:** there's no force-fire tool. To exercise the same work on demand, either paste the job's prompt into the agent chat and let it run there, or temporarily set the schedule to the next minute so the scheduler picks it up on the next tick (then restore the real cron).
 - **Pause it:** flip `enabled: false`. The file stays put, just stops running.
 
@@ -234,7 +234,7 @@ A single `manage-jobs` tool is registered in every template. The `action` parame
 
 Don't confuse recurring jobs with `@agent-native/scheduling`:
 
-- **Recurring jobs (this page)** — cron-scheduled _prompts_ the agent runs in the background. Framework-level. Lives in the workspace. Runs on any agent-native app.
+- **Recurring jobs (this page)** — cron-scheduled _prompts_ the agent runs in the background. Framework-level. Lives in Agent Resources. Runs on any agent-native app.
 - **`@agent-native/scheduling`** — a reusable domain package for building calendar/booking features (event types, availability windows, bookings). Powers the `calendar` template and custom scheduling surfaces.
 
 Recurring jobs are "how do I make the agent act on its own?" The scheduling package is "how do I build a calendar app?" Different concerns.
@@ -242,7 +242,7 @@ Recurring jobs are "how do I make the agent act on its own?" The scheduling pack
 ## What's next
 
 - [**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
+- [**Agent Resources**](/docs/agent-resources) — 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/docs/content/skills-guide.mdx

@@ -141,7 +141,7 @@ Create a skill when:
 Don't create a skill when:
 
 - The guidance already exists in another skill — extend it instead
-- The guidance is a one-off — put it in `AGENTS.md` or workspace memory instead
+- The guidance is a one-off — put it in `AGENTS.md` or agent memory instead
 
 ## Skill format {#skill-format}
 
@@ -299,11 +299,11 @@ This replaces the old hack of relying on Claude Code only reading `.claude/skill
 
 </Callout>
 
-If the knowledge applies to _everyone_ working in the app ("always prefer CTEs over subqueries"), it's a skill or shared `LEARNINGS.md`. If it's about _this particular user_ ("Steve likes concise answers"), it belongs in `memory/MEMORY.md`. See [Agent Resources — Memory](/docs/workspace#memory) for the full treatment.
+If the knowledge applies to _everyone_ working in the app ("always prefer CTEs over subqueries"), it's a skill or shared `LEARNINGS.md`. If it's about _this particular user_ ("Steve likes concise answers"), it belongs in `memory/MEMORY.md`. See [Agent Resources — Memory](/docs/agent-resources#memory) for the full treatment.
 
 ## Skills vs SQL resources {#skills-vs-resources}
 
-This page frames a skill as a file at `.agents/skills/<name>/SKILL.md`. [Agent Resources](/docs/workspace#skills) frames the same skill as a SQL resource at path `skills/<slug>/SKILL.md`, scoped workspace/shared/personal. These are the same concept from two angles: Code mode reads and writes the file directly; App mode stores it as a resource row so it works without a filesystem. Author the content using this page's format either way.
+This page frames a skill as a file at `.agents/skills/<name>/SKILL.md`. [Agent Resources](/docs/agent-resources#skills) frames the same skill as a SQL resource at path `skills/<slug>/SKILL.md`, scoped workspace/shared/personal. These are the same concept from two angles: Code mode reads and writes the file directly; App mode stores it as a resource row so it works without a filesystem. Author the content using this page's format either way.
 
 ## App-backed skills — full details {#app-backed-skills-full}
 
@@ -428,6 +428,6 @@ the same instructions without maintaining a second copy.
 ## What's next {#whats-next}
 
 - [**Writing Agent Instructions**](/docs/writing-agent-instructions) — word skill descriptions and split guidance across AGENTS.md, skills, and memory
-- [**Agent Resources**](/docs/workspace#skills) — where skills live as SQL resources in App mode
+- [**Agent Resources**](/docs/agent-resources#skills) — where skills live as SQL resources in App mode
 - [**Agent Mentions**](/docs/agent-mentions) — the `/`-command trigger that invokes a skill in chat
 - [**Plan plugin & marketplace**](/docs/plan-plugin) — a real app-backed skill's end-to-end install and auto-update flow

package/docs/content/template-brain.mdx

@@ -549,7 +549,7 @@ Ask the agent to make changes for you — it can edit its own source. See
 
 - [**Dispatch**](/docs/dispatch) — the workspace control plane
 - [**Dispatch template**](/docs/template-dispatch) — the scaffolded coordination app
-- [**Agent Resources**](/docs/workspace) — shared resources across apps
+- [**Agent Resources**](/docs/agent-resources) — shared resources across apps
 - [**A2A Protocol**](/docs/a2a-protocol) — cross-app delegation
 - [**Templates**](/docs/cloneable-saas) — the clone-and-own model, and every other domain template to start from
 - [**Getting Started**](/docs/getting-started) — the framework fundamentals: actions, application state, and live sync

package/docs/content/toolkit-collaboration.mdx

@@ -38,7 +38,7 @@ operations.
 import { createCollabPlugin } from "@agent-native/core/server";
 
 export default createCollabPlugin({
-  resourceType: "document",
+  access: { mode: "resource", resourceType: "document" },
   table: "documents",
   contentColumn: "content",
 });

package/docs/content/using-your-agent.mdx

@@ -89,7 +89,7 @@ The agent isn't a separate app you tab over to. It ships as a handful of React c
 
 ## You can go UI-light {#ui-light}
 
-Not every app needs a full dashboard. When the agent _is_ the product, you can skip most of the custom UI: open the app, ask for what you want, and let the agent do the rest. The agent still has its management surface — history, workspace, settings — but the primary interaction is conversation rather than clicks.
+Not every app needs a full dashboard. When the agent _is_ the product, you can skip most of the custom UI: open the app, ask for what you want, and let the agent do the rest. The agent still has its management surface — history, agent resources, settings — but the primary interaction is conversation rather than clicks.
 
 ## You co-edit with it {#you-co-edit}
 

package/docs/content/what-is-agent-native.mdx

@@ -289,7 +289,7 @@ When the agent creates a draft email, it appears in the UI. When you click "Send
 
 The reason tools like Claude Code feel so powerful isn't the model — it's the **customization layer**: per-project instructions, skills, memory, sub-agents, connected services. You can shape the agent to your codebase, your preferences, your team.
 
-Agent-native gives every user that same customization layer — without ever leaving the app. Each app comes with a personal **workspace** where you (or anyone on your team) can:
+Agent-native gives every user that same customization layer — without ever leaving the app. Each app comes with personal **agent resources** that you (or anyone on your team) can use to:
 
 - Edit team-wide rules everyone's agent reads
 - Let the agent remember preferences automatically as you correct it
@@ -298,9 +298,9 @@ Agent-native gives every user that same customization layer — without ever lea
 - Schedule jobs to run on a cron (e.g. "every Monday morning, summarize last week")
 - Connect external services (Gmail, Stripe, Slack, internal APIs) via per-user MCP servers
 
-The twist: it's all stored in the database, not the filesystem. There's no dev environment to spin up, no container per user. Every user gets their own full workspace — personal memory, personal connections, personal skills — for essentially free, because it's all rows in a table. That's what makes Claude-Code-level flexibility viable inside a real multi-tenant SaaS product.
+The twist: it's all stored in the database, not the filesystem. There's no dev environment to spin up, no container per user. Every user gets their own full set of agent resources — personal memory, personal connections, personal skills — for essentially free, because it's all rows in a table. That's what makes Claude-Code-level flexibility viable inside a real multi-tenant SaaS product.
 
-See [Agent Resources](/docs/workspace) for the full concept.
+See [Agent Resources](/docs/agent-resources) for the full concept.
 
 ## What makes it different {#what-makes-it-different}
 
@@ -396,7 +396,7 @@ One action, many surfaces: the agent calls it as a tool, the UI calls it as a ty
 - [**Agent Surfaces**](/docs/agent-surfaces) — choose chat, native inline UI, full app pages, embedded sidecar, automation, or external agent access
 - [**Key Concepts**](/docs/key-concepts) — the architecture: SQL, actions, polling sync, context awareness, portability
 - [**Templates**](/docs/cloneable-saas) — templates as complete products you own
-- [**Agent Resources**](/docs/workspace) — the per-user customization layer (skills, memory, instructions, MCP) backed by SQL, not files
+- [**Agent Resources**](/docs/agent-resources) — the per-user customization layer (skills, memory, instructions, MCP) backed by SQL, not files
 - [**Dispatch**](/docs/dispatch) — the workspace control plane: secrets vault, Slack/email inbox, cross-app delegation
 - [**Extensions**](/docs/extensions) — sandboxed mini-apps the agent creates instantly without code changes
 - [**Drop-in Agent**](/docs/drop-in-agent) — mount `<AgentPanel>` into any React app

package/docs/content/workspace-management.mdx

@@ -7,7 +7,7 @@ description: "Branching, CODEOWNERS, PR review, and how Dispatch handles runtime
 
 <Callout tone="info">
 
-**Which workspace doc?** This page covers **governance** — who reviews, approves, and owns what across many apps in one repo. For the agent customization layer (Agent Resources: `AGENTS.md`, memory, skills, custom agents) see [Agent Resources](/docs/workspace); for the deployment shape (one monorepo, many apps) see [Multi-App Workspaces](/docs/multi-app-workspace).
+**Which workspace doc?** This page covers **governance** — who reviews, approves, and owns what across many apps in one repo. For the agent customization layer (Agent Resources: `AGENTS.md`, memory, skills, custom agents) see [Agent Resources](/docs/agent-resources); for the deployment shape (one monorepo, many apps) see [Multi-App Workspaces](/docs/multi-app-workspace).
 
 </Callout>
 
@@ -211,7 +211,7 @@ The [Dispatch](/docs/dispatch) app is the workspace's runtime control plane. It
 
 Dispatch manages: vault secrets, reusable workspace connections, workspace resources (skills, instructions, agent profiles, MCP servers), approvals, and audit logs. For public app route configuration (`workspaceApp.audience` / `publicPaths` / `protectedPaths`), see [Multi-App Workspaces — Public app routes](/docs/multi-app-workspace#deployment).
 
-For the resource model and canonical paths, see [Agent Resources — Global resources](/docs/workspace#global-resources).
+For the resource model and canonical paths, see [Agent Resources — Global resources](/docs/agent-resources#global-resources).
 
 ## Setup Checklist
 
@@ -232,7 +232,7 @@ For a new workspace, after running `npx @agent-native/core@latest create`:
 - [ ] Register reusable workspace connections for shared provider accounts, then
       grant apps such as Brain, Analytics, Mail, or Dispatch only when they need
       that account
-- [ ] Add workspace-wide skills, guardrail instructions, and brand/company reference resources via the Resources page. See [Agent Resources](/docs/workspace#global-resources) for the full resource-model table and the recommended starter pack.
+- [ ] Add workspace-wide skills, guardrail instructions, and brand/company reference resources via the Resources page. See [Agent Resources](/docs/agent-resources#global-resources) for the full resource-model table and the recommended starter pack.
 - [ ] Configure the approval policy and approver emails
 - [ ] Set up SendGrid (`SENDGRID_API_KEY`, `SENDGRID_FROM_EMAIL`) for admin notifications
 - [ ] Connect Slack or Telegram for workspace messaging
@@ -240,7 +240,7 @@ For a new workspace, after running `npx @agent-native/core@latest create`:
 
 ## What's next {#whats-next}
 
-- [**Agent Resources**](/docs/workspace) — the customization layer this page governs (skills, memory, agents, MCP servers)
+- [**Agent Resources**](/docs/agent-resources) — the customization layer this page governs (skills, memory, agents, MCP servers)
 - [**Multi-App Workspaces**](/docs/multi-app-workspace) — the deployment shape: one monorepo, many apps
 - [**Dispatch**](/docs/dispatch) — the runtime control plane referenced throughout this page
 - [**Sharing**](/docs/sharing) — access control for individual resources, complementing repo-level CODEOWNERS

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-native/core",
-  "version": "0.115.3",
+  "version": "0.116.0",
   "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": {
@@ -385,8 +385,8 @@
     "y-protocols": "^1.0.7",
     "yjs": "^13.6.31",
     "zod": "^4.3.6",
-    "@agent-native/toolkit": "^0.9.0",
-    "@agent-native/recap-cli": "0.5.0"
+    "@agent-native/recap-cli": "0.5.1",
+    "@agent-native/toolkit": "^0.9.1"
   },
   "devDependencies": {
     "@ai-sdk/anthropic": "^3.0.71",

package/src/agent/production-agent.ts

@@ -3986,8 +3986,16 @@ export async function runAgentLoop(opts: {
       }
     }
     if (!assistantContent) {
-      // No content — done
-      break;
+      if (!terminalStopReason) {
+        // A stream that disappears without a terminal stop is an interrupted
+        // chunk, not a successful empty answer. Let the continuation path
+        // recover it instead of persisting a tool-only completed turn.
+        send({ type: "auto_continue", reason: "stream_ended" });
+        return usage;
+      }
+      // Route a clean terminal stop with no normalized content through the
+      // empty-final retry/fallback below.
+      assistantContent = [];
     }
 
     if (toolCallErrors.size > 0) {
@@ -4022,7 +4030,9 @@ export async function runAgentLoop(opts: {
         : part,
     );
 
-    messages.push({ role: "assistant", content: assistantContentForHistory });
+    if (assistantContentForHistory.length > 0) {
+      messages.push({ role: "assistant", content: assistantContentForHistory });
+    }
 
     const toolCallParts = assistantContent.filter(
       (p): p is import("./engine/types.js").EngineToolCallPart =>

package/src/cli/doctor.ts

@@ -4,7 +4,7 @@
  * itself via `scripts/guard-*.mjs` (see
  * `advisor-plans/reports/005-doctor-design.md` for the full design and
  * `advisor-plans/015-doctor-v1-implementation.md` for the implementation
- * plan). v1 ships 8 of those guards, ported to work against a single
+ * plan). v1 ships 9 of those guards, ported to work against a single
  * generated app root instead of this monorepo's multi-template layout —
  * see `../guards/index.ts`.
  *
@@ -28,6 +28,7 @@ import {
   scanDrizzlePush,
   scanEnvCredentials,
   scanEnvMutation,
+  scanExplicitCollabAccess,
   scanLocalhostFallback,
   scanUnscopedCredentials,
   scanUnscopedQueries,
@@ -47,6 +48,7 @@ export type GuardName =
   | "db-tool-scoping"
   | "no-env-mutation"
   | "no-localhost-fallback"
+  | "explicit-collab-access"
   | "migration-manifest";
 
 export const ALL_GUARD_NAMES: GuardName[] = [
@@ -57,6 +59,7 @@ export const ALL_GUARD_NAMES: GuardName[] = [
   "db-tool-scoping",
   "no-env-mutation",
   "no-localhost-fallback",
+  "explicit-collab-access",
   "migration-manifest",
 ];
 
@@ -150,6 +153,8 @@ function runGuard(
       return scanEnvMutation({ root });
     case "no-localhost-fallback":
       return scanLocalhostFallback({ root, extraExemptPaths: [] });
+    case "explicit-collab-access":
+      return scanExplicitCollabAccess({ root });
     case "migration-manifest": {
       const imports = scanDeprecatedImports({
         root,

package/src/client/AgentPanel.tsx

@@ -66,7 +66,7 @@ import {
   normalizeTooltipText,
 } from "./components/ui/tooltip.js";
 import { ErrorReportActions } from "./ErrorReportActions.js";
-import { FeedbackButton } from "./FeedbackButton.js";
+import { FeedbackButton, resolveFeedbackUrl } from "./FeedbackButton.js";
 import { RunsTrayMenuItem } from "./progress/RunsTray.js";
 import { ShareButton } from "./sharing/ShareButton.js";
 // Lazy-load the full assistant-ui chat stack (tiptap composer + react-markdown +
@@ -773,6 +773,7 @@ function AgentPanelInner({
   ...assistantChatProps
 }: AgentPanelProps) {
   const t = useT();
+  const feedbackEnabled = resolveFeedbackUrl() !== null;
   const navigate = useNavigate();
   const mounted = useClientOnly();
   const keyPrefix = storageKey ? `:${storageKey}` : "";
@@ -1218,23 +1219,25 @@ function AgentPanelInner({
               />
             );
           })()}
-        <FeedbackButton
-          variant="icon"
-          side="bottom"
-          align="end"
-          chatSessionId={activeChatSessionId}
-          chatStorageKey={storageKey}
-          open={feedbackOpen}
-          onOpenChange={setFeedbackOpen}
-          trigger={
-            <button
-              type="button"
-              tabIndex={-1}
-              aria-hidden="true"
-              className="pointer-events-none absolute end-0 top-full h-px w-px opacity-0"
-            />
-          }
-        />
+        {feedbackEnabled ? (
+          <FeedbackButton
+            variant="icon"
+            side="bottom"
+            align="end"
+            chatSessionId={activeChatSessionId}
+            chatStorageKey={storageKey}
+            open={feedbackOpen}
+            onOpenChange={setFeedbackOpen}
+            trigger={
+              <button
+                type="button"
+                tabIndex={-1}
+                aria-hidden="true"
+                className="pointer-events-none absolute end-0 top-full h-px w-px opacity-0"
+              />
+            }
+          />
+        ) : null}
         {mode === "chat" && (
           <IconTooltip content={t("agentPanel.newChat")}>
             <button
@@ -1355,17 +1358,19 @@ function AgentPanelInner({
                 {t("agentPanel.settings")}
               </DropdownMenuItem>
             )}
-            <DropdownMenuItem
-              onSelect={() => {
-                // Defer past the closing DropdownMenu's focus-restore/dismiss-layer
-                // teardown, otherwise it can immediately dismiss the Popover we're
-                // opening in the same tick (Radix nested-overlay race).
-                setTimeout(() => setFeedbackOpen(true), 0);
-              }}
-            >
-              <IconMessageDots size={14} className="shrink-0" />
-              {t("agentPanel.feedback")}
-            </DropdownMenuItem>
+            {feedbackEnabled ? (
+              <DropdownMenuItem
+                onSelect={() => {
+                  // Defer past the closing DropdownMenu's focus-restore/dismiss-layer
+                  // teardown, otherwise it can immediately dismiss the Popover we're
+                  // opening in the same tick (Radix nested-overlay race).
+                  setTimeout(() => setFeedbackOpen(true), 0);
+                }}
+              >
+                <IconMessageDots size={14} className="shrink-0" />
+                {t("agentPanel.feedback")}
+              </DropdownMenuItem>
+            ) : null}
             {onToggleFullscreen && (
               <DropdownMenuItem onSelect={onToggleFullscreen}>
                 {isFullscreen ? (
@@ -1464,6 +1469,7 @@ function AgentPanelInner({
       closeOtherCliTabs,
       closeTabHint,
       feedbackOpen,
+      feedbackEnabled,
       getChatThreadShareUrl,
       headerMenuOpen,
       isFullscreen,
@@ -1541,24 +1547,42 @@ function AgentPanelInner({
     [getChatThreadShareUrl, t],
   );
 
-  // Ref callback: scroll the active tab into view in the overflow container.
-  // Uses getBoundingClientRect for reliable positioning regardless of offsetParent.
-  const activeTabRefCb = useCallback((el: HTMLDivElement | null) => {
-    if (!el) return;
+  const activeTabResizeObserverRef = useRef<ResizeObserver | null>(null);
+  const scrollActiveTabIntoView = useCallback((el: HTMLDivElement) => {
     const container = el.parentElement;
     if (!container) return;
-    // Use rAF so layout is settled after React commit
     requestAnimationFrame(() => {
-      const containerRect = container.getBoundingClientRect();
-      const tabRect = el.getBoundingClientRect();
-      if (tabRect.left < containerRect.left) {
-        container.scrollLeft += tabRect.left - containerRect.left;
-      } else if (tabRect.right > containerRect.right) {
-        container.scrollLeft += tabRect.right - containerRect.right;
-      }
+      const delta = getActiveTabScrollDelta(
+        container.getBoundingClientRect(),
+        el.getBoundingClientRect(),
+      );
+      if (delta !== 0) container.scrollLeft += delta;
     });
   }, []);
 
+  // The sidebar stays mounted while closed and animates its width on open, so
+  // the active tab ref alone can run before the overflow container is usable.
+  const activeTabRefCb = useCallback(
+    (el: HTMLDivElement | null) => {
+      activeTabResizeObserverRef.current?.disconnect();
+      activeTabResizeObserverRef.current = null;
+      if (!el) return;
+      const container = el.parentElement;
+      if (!container) return;
+
+      const observer =
+        typeof ResizeObserver === "undefined"
+          ? null
+          : new ResizeObserver(() => scrollActiveTabIntoView(el));
+      observer?.observe(container);
+      activeTabResizeObserverRef.current = observer;
+      scrollActiveTabIntoView(el);
+    },
+    [scrollActiveTabIntoView],
+  );
+
+  useEffect(() => () => activeTabResizeObserverRef.current?.disconnect(), []);
+
   const renderChatHeader = useCallback(
     ({
       tabs,
@@ -2108,6 +2132,20 @@ const SIDEBAR_FULLSCREEN_Z_INDEX = 90;
 /** Shared max width of the centered fullscreen chat column and composer. */
 const FULLSCREEN_CHAT_COLUMN_MAX_PX = 684;
 
+export function getActiveTabScrollDelta(
+  containerRect: Pick<DOMRect, "left" | "right">,
+  tabRect: Pick<DOMRect, "left" | "right">,
+  margin = 24,
+): number {
+  if (tabRect.left < containerRect.left + margin) {
+    return tabRect.left - containerRect.left - margin;
+  }
+  if (tabRect.right > containerRect.right - margin) {
+    return tabRect.right - containerRect.right + margin;
+  }
+  return 0;
+}
+
 function ResizeHandle({
   position,
   onDrag,

package/src/client/AssistantChat.tsx

@@ -173,6 +173,11 @@ import {
   useGuidedQuestionFlow,
 } from "./guided-questions.js";
 import { useT } from "./i18n.js";
+import {
+  addMcpConnectionCompleteListener,
+  consumeMcpConnectionResume,
+  type McpConnectionResumeRequest,
+} from "./resources/mcp-connection-resume.js";
 import { McpConnectionSuggestion } from "./resources/McpConnectionSuggestion.js";
 import {
   AgentAutoContinueSignal,
@@ -1513,20 +1518,24 @@ export function resolveAssistantChatRunningStatusLabel({
   return "Thinking";
 }
 
-function contentHasVisibleReasoning(content: unknown): boolean {
+function contentHasVisibleTailReasoning(content: unknown): boolean {
   if (!Array.isArray(content)) return false;
-  return content.some((part) => {
-    if (!part || typeof part !== "object") return false;
+  for (let index = content.length - 1; index >= 0; index -= 1) {
+    const part = content[index];
+    if (!part || typeof part !== "object") continue;
     const candidate = part as { type?: unknown; text?: unknown };
-    return (
-      candidate.type === "reasoning" &&
-      typeof candidate.text === "string" &&
-      candidate.text.trim().length > 0
-    );
-  });
+    if (
+      (candidate.type === "text" || candidate.type === "reasoning") &&
+      (typeof candidate.text !== "string" || candidate.text.trim().length === 0)
+    ) {
+      continue;
+    }
+    return candidate.type === "reasoning";
+  }
+  return false;
 }
 
-function contentHasUnresolvedToolCall(
+function contentHasToolCall(
   content: unknown,
   toolName?: string | null,
 ): boolean {
@@ -1540,7 +1549,6 @@ function contentHasUnresolvedToolCall(
     };
     return (
       candidate.type === "tool-call" &&
-      candidate.result === undefined &&
       (!toolName || candidate.toolName === toolName)
     );
   });
@@ -1565,17 +1573,19 @@ export function shouldShowGlobalRunningStatus({
     latestMessage && typeof latestMessage === "object"
       ? (latestMessage as { role?: unknown; content?: unknown })
       : null;
-  const latestMessageHasReasoning =
+  const latestMessageHasTailReasoning =
     message?.role === "assistant" &&
-    contentHasVisibleReasoning(message.content);
-  const latestMessageHasUnresolvedTool =
-    message?.role === "assistant" &&
-    contentHasUnresolvedToolCall(message.content);
+    contentHasVisibleTailReasoning(message.content);
+  const latestMessageHasTool =
+    message?.role === "assistant" && contentHasToolCall(message.content);
+  const reconnectHasTool = contentHasToolCall(reconnectContent);
+  const reconnectHasTailReasoning =
+    contentHasVisibleTailReasoning(reconnectContent);
   const matchingActivityToolIsVisible = Boolean(
     runningActivityTool &&
     ((message?.role === "assistant" &&
-      contentHasUnresolvedToolCall(message.content, runningActivityTool)) ||
-      contentHasUnresolvedToolCall(reconnectContent, runningActivityTool)),
+      contentHasToolCall(message.content, runningActivityTool)) ||
+      contentHasToolCall(reconnectContent, runningActivityTool)),
   );
 
   // A pending card for the same tool is already the running indicator.
@@ -1584,11 +1594,7 @@ export function shouldShowGlobalRunningStatus({
   if (runningActivityLabel && matchingActivityToolIsVisible) {
     return false;
   }
-  if (
-    !runningActivityLabel &&
-    (latestMessageHasUnresolvedTool ||
-      contentHasUnresolvedToolCall(reconnectContent))
-  ) {
+  if (!runningActivityLabel && (latestMessageHasTool || reconnectHasTool)) {
     return false;
   }
   // The reasoning cell already owns the generic Thinking state. Activity
@@ -1596,14 +1602,20 @@ export function shouldShowGlobalRunningStatus({
   // rendering both makes a second Thinking row flash beneath the thought.
   if (
     runningActivityLabel === "Thinking" &&
-    (latestMessageHasReasoning || contentHasVisibleReasoning(reconnectContent))
+    (latestMessageHasTool ||
+      reconnectHasTool ||
+      latestMessageHasTailReasoning ||
+      reconnectHasTailReasoning)
   ) {
     return false;
   }
   if (runningActivityLabel) return true;
 
   return (
-    !latestMessageHasReasoning && !contentHasVisibleReasoning(reconnectContent)
+    !latestMessageHasTool &&
+    !reconnectHasTool &&
+    !latestMessageHasTailReasoning &&
+    !reconnectHasTailReasoning
   );
 }
 
@@ -4676,6 +4688,40 @@ const AssistantChatInner = forwardRef<
     ],
   );
 
+  const mcpResumeTimerRef = useRef<number | null>(null);
+  const scheduleMcpConnectionResume = useCallback(
+    (request: McpConnectionResumeRequest) => {
+      if (mcpResumeTimerRef.current !== null) {
+        window.clearTimeout(mcpResumeTimerRef.current);
+      }
+      mcpResumeTimerRef.current = window.setTimeout(() => {
+        mcpResumeTimerRef.current = null;
+        void addToQueue(request.message);
+      }, 0);
+    },
+    [addToQueue],
+  );
+
+  useEffect(() => {
+    const pending = consumeMcpConnectionResume();
+    if (pending) scheduleMcpConnectionResume(pending);
+
+    return addMcpConnectionCompleteListener(() => {
+      const completed = consumeMcpConnectionResume();
+      if (completed) scheduleMcpConnectionResume(completed);
+    });
+  }, [scheduleMcpConnectionResume]);
+
+  useEffect(
+    () => () => {
+      if (mcpResumeTimerRef.current !== null) {
+        window.clearTimeout(mcpResumeTimerRef.current);
+        mcpResumeTimerRef.current = null;
+      }
+    },
+    [],
+  );
+
   useEffect(() => {
     if (!pendingReconnectRecovery) return;
     const recovery = pendingReconnectRecovery;