@agent-native/core 0.151.2 → 0.152.1

package/dist/client/chat-first.js

@@ -312,14 +312,20 @@ export function orderChatFirstAppIds(appIds, layout) {
         ...preferredDefaults,
         ...appIds.filter((id) => !preferredDefaultSet.has(id)),
     ];
+    const manualOrderedIds = layout.orderedIds.filter((id) => available.has(id));
+    const hasManualOrder = manualOrderedIds.length > 0;
     const ordered = [
-        ...layout.orderedIds.filter((id) => available.has(id)),
+        ...manualOrderedIds,
         ...fallbackOrder.filter((id) => !layout.orderedIds.includes(id)),
     ];
-    const pinned = new Set(layout.pinnedIds.filter((id) => available.has(id)));
-    // `orderedIds` is the single source of positional truth. Pinning changes
-    // presentation only; it must not rewrite the user's drag order or make an
-    // unpinned app jump to the fallback order.
+    const pinnedIds = layout.pinnedIds.filter((id) => available.has(id));
+    const pinned = new Set(pinnedIds);
+    // A live `orderedIds` value is the single source of positional truth. Pinning
+    // changes presentation only; it must not rewrite the user's drag order or
+    // make an unpinned app jump to the fallback order.
+    if (!hasManualOrder) {
+        return [...pinnedIds, ...fallbackOrder.filter((id) => !pinned.has(id))];
+    }
     return [
         ...ordered.filter((id) => pinned.has(id)),
         ...ordered.filter((id) => !pinned.has(id)),

package/dist/client/guided-questions.d.ts

@@ -46,6 +46,13 @@ export interface GuidedQuestionPayload {
      * promise with the answer instead of forwarding it to the agent chat.
      */
     clientResolveId?: string;
+    /**
+     * Chat thread that asked. Set by the agent's `ask-question` tool. A payload
+     * carrying this only renders in that conversation; one without it (app code
+     * calling {@link askUserQuestion}, deterministic writes) is not thread-bound
+     * and renders wherever the flow is mounted.
+     */
+    threadId?: string;
 }
 export declare function isOtherGuidedAnswer(value: unknown): value is string;
 export declare function getOtherGuidedAnswerText(value: unknown): string;
@@ -137,6 +144,13 @@ export interface UseGuidedQuestionFlowOptions {
      * (which it almost always does — see `sessionBrowserTabId`).
      */
     browserTabId?: string;
+    /**
+     * The conversation this flow is mounted in. Agent-written payloads name the
+     * thread that asked, and a pending question belongs to that conversation
+     * only — the application-state key is per browser tab, so without this the
+     * same card follows the user into every other chat in the tab.
+     */
+    threadId?: string;
     queryKey?: readonly unknown[];
     refetchInterval?: number | false;
     submitMessage?: string;
@@ -147,7 +161,7 @@ export interface UseGuidedQuestionFlowOptions {
     }) => string;
     buildSkipContext?: () => string;
 }
-export declare function useGuidedQuestionFlow({ enabled, stateKey, browserTabId, queryKey, refetchInterval, submitMessage, skipMessage, buildSubmitContext, buildSkipContext, }?: UseGuidedQuestionFlowOptions): {
+export declare function useGuidedQuestionFlow({ enabled, stateKey, browserTabId, threadId, queryKey, refetchInterval, submitMessage, skipMessage, buildSubmitContext, buildSkipContext, }?: UseGuidedQuestionFlowOptions): {
     payload: GuidedQuestionPayload | null;
     questions: GuidedQuestion[] | null;
     title: string | undefined;

package/dist/client/guided-questions.js

@@ -406,7 +406,17 @@ function normalizeBrowserTabId(browserTabId) {
     const trimmed = browserTabId.trim();
     return SAFE_BROWSER_TAB_ID_RE.test(trimmed) ? trimmed : undefined;
 }
-export function useGuidedQuestionFlow({ enabled = true, stateKey = "show-questions", browserTabId, queryKey = ["show-questions"], refetchInterval = false, submitMessage = "Here are my answers — go ahead.", skipMessage = "Skip the questions — decide for me.", buildSubmitContext, buildSkipContext, } = {}) {
+/**
+ * Whether a stored payload belongs to the conversation currently on screen.
+ * Payloads with no `threadId` are not thread-bound and always match.
+ */
+function payloadBelongsToThread(payload, threadId) {
+    const asker = typeof payload.threadId === "string" ? payload.threadId.trim() : "";
+    if (!asker)
+        return true;
+    return asker === (threadId ?? "").trim();
+}
+export function useGuidedQuestionFlow({ enabled = true, stateKey = "show-questions", browserTabId, threadId, queryKey = ["show-questions"], refetchInterval = false, submitMessage = "Here are my answers — go ahead.", skipMessage = "Skip the questions — decide for me.", buildSubmitContext, buildSkipContext, } = {}) {
     const queryClient = useQueryClient();
     const [payload, setPayload] = useState(null);
     const normalizedBrowserTabId = useMemo(() => normalizeBrowserTabId(browserTabId), [browserTabId]);
@@ -458,7 +468,11 @@ export function useGuidedQuestionFlow({ enabled = true, stateKey = "show-questio
                 if (prev &&
                     guidedQuestionsFingerprint(prev.questions) ===
                         guidedQuestionsFingerprint(data.questions) &&
-                    prev.clientResolveId === data.clientResolveId) {
+                    prev.clientResolveId === data.clientResolveId &&
+                    // Two chats can ask a word-for-word identical question. Keeping the
+                    // old payload would bind the new one to the wrong thread, hiding it
+                    // in the chat that asked and re-showing it in the one that didn't.
+                    prev.threadId === data.threadId) {
                     return prev;
                 }
                 return data;
@@ -468,6 +482,10 @@ export function useGuidedQuestionFlow({ enabled = true, stateKey = "show-questio
             setPayload(null);
         }
     }, [data]);
+    // A question asked in another conversation stays in application state — the
+    // user can still answer it by going back to that chat — but it must not
+    // render here.
+    const visiblePayload = payload && payloadBelongsToThread(payload, threadId) ? payload : null;
     const clear = useCallback(() => {
         setPayload(null);
         queryClient.setQueryData(resolvedQueryKey, null);
@@ -481,15 +499,15 @@ export function useGuidedQuestionFlow({ enabled = true, stateKey = "show-questio
     const handleSubmit = useCallback((answers) => {
         // Client-initiated question (askUserQuestion): resolve the caller's
         // promise with the answer instead of forwarding it to the agent chat.
-        const resolveId = payload?.clientResolveId;
+        const resolveId = visiblePayload?.clientResolveId;
         if (resolveId) {
-            const firstId = payload?.questions?.[0]?.id ?? "q1";
+            const firstId = visiblePayload?.questions?.[0]?.id ?? "q1";
             resolveClientQuestion(resolveId, extractSingleAnswer(answers, firstId));
             clear();
             return;
         }
         const formattedAnswers = formatGuidedAnswersForAgent(answers);
-        const resolvedSubmitMessage = payload?.submitMessage ?? submitMessage;
+        const resolvedSubmitMessage = visiblePayload?.submitMessage ?? submitMessage;
         const context = buildSubmitContext?.({ answers, formattedAnswers }) ??
             defaultGuidedSubmitContext(formattedAnswers);
         sendToAgentChat({
@@ -498,28 +516,28 @@ export function useGuidedQuestionFlow({ enabled = true, stateKey = "show-questio
             submit: true,
         });
         clear();
-    }, [buildSubmitContext, clear, payload, submitMessage]);
+    }, [buildSubmitContext, clear, visiblePayload, submitMessage]);
     const handleSkip = useCallback(() => {
-        const resolveId = payload?.clientResolveId;
+        const resolveId = visiblePayload?.clientResolveId;
         if (resolveId) {
             resolveClientQuestion(resolveId, null);
             clear();
             return;
         }
         sendToAgentChat({
-            message: payload?.skipMessage ?? skipMessage,
+            message: visiblePayload?.skipMessage ?? skipMessage,
             context: buildSkipContext?.(),
             submit: true,
         });
         clear();
-    }, [buildSkipContext, clear, payload, skipMessage]);
+    }, [buildSkipContext, clear, visiblePayload, skipMessage]);
     return {
-        payload,
-        questions: payload?.questions ?? null,
-        title: payload?.title,
-        description: payload?.description,
-        skipLabel: payload?.skipLabel,
-        submitLabel: payload?.submitLabel,
+        payload: visiblePayload,
+        questions: visiblePayload?.questions ?? null,
+        title: visiblePayload?.title,
+        description: visiblePayload?.description,
+        skipLabel: visiblePayload?.skipLabel,
+        submitLabel: visiblePayload?.submitLabel,
         clear,
         handleSubmit,
         handleSkip,

package/dist/client/hooks/index.d.ts

@@ -4,7 +4,7 @@ export { useDbSync, useFileWatcher, useScreenRefreshKey, } from "../use-db-sync.
 export { useChangeVersion, useChangeVersions, getChangeVersion, bumpChangeVersion, } from "../use-change-version.js";
 export { useDemoModeStatus, type DemoModeStatus, } from "../use-demo-mode-status.js";
 export { useReconciledState } from "../use-external-value.js";
-export { useSession, type AuthSession } from "../use-session.js";
+export { notifySessionInvalidated, useSession, type AuthSession, } from "../use-session.js";
 export { ACTION_KEEPALIVE_BODY_BUDGET_BYTES, callAction, tryCallActionKeepalive, useActionQuery, useActionMutation, type ActionRegistry, type ClientActionCallOptions, type ClientActionMethod, type KeepaliveActionCallRejectionReason, type KeepaliveActionCallResult, } from "../use-action.js";
 export { createAgentNativeQueryClient } from "../create-query-client.js";
 export { AppProviders, type AppProvidersProps } from "../app-providers.js";

package/dist/client/hooks/index.js

@@ -4,7 +4,7 @@ export { useDbSync, useFileWatcher, useScreenRefreshKey, } from "../use-db-sync.
 export { useChangeVersion, useChangeVersions, getChangeVersion, bumpChangeVersion, } from "../use-change-version.js";
 export { useDemoModeStatus, } from "../use-demo-mode-status.js";
 export { useReconciledState } from "../use-external-value.js";
-export { useSession } from "../use-session.js";
+export { notifySessionInvalidated, useSession, } from "../use-session.js";
 export { ACTION_KEEPALIVE_BODY_BUDGET_BYTES, callAction, tryCallActionKeepalive, useActionQuery, useActionMutation, } from "../use-action.js";
 export { createAgentNativeQueryClient } from "../create-query-client.js";
 export { AppProviders } from "../app-providers.js";

package/dist/client/org/OrgSwitcher.d.ts

@@ -27,6 +27,8 @@ export interface OrgSwitcherProps {
      * Pass `null` for apps that do not mount the Agent page.
      */
     agentPath?: string | null;
+    /** Omit the link to the app that currently owns this switcher. */
+    currentAppId?: string;
 }
 /**
  * Compact org switcher button. Shows the active org (or "Personal" when the
@@ -34,4 +36,4 @@ export interface OrgSwitcherProps {
  * invitations, inline forms to create a new org / invite a teammate, and a
  * sign-out item. Renders nothing in dev / no-auth mode.
  */
-export declare function OrgSwitcher({ className, hideWhenSingle, reserveSpace, compact, settingsPath, profilePath, agentPath, }: OrgSwitcherProps): import("react").JSX.Element | null;
+export declare function OrgSwitcher({ className, hideWhenSingle, reserveSpace, compact, settingsPath, profilePath, agentPath, currentAppId, }: OrgSwitcherProps): import("react").JSX.Element | null;

package/dist/client/org/OrgSwitcher.js

@@ -8,7 +8,7 @@ import { shouldOfferWorkspace } from "../../org/workspace-url.js";
 import { agentNativePath } from "../api-path.js";
 import { useT } from "../i18n.js";
 import { useDemoModeStatus } from "../use-demo-mode-status.js";
-import { useSession } from "../use-session.js";
+import { notifySessionInvalidated, useSession } from "../use-session.js";
 import { useOrg, useSwitchOrg, useCreateOrg, useInviteMember, useAcceptInvitation, useJoinByDomain, } from "./hooks.js";
 import { ORG_SWITCHER_MAX_APP_LINKS, useOrgSwitcherAppLinks, visibleOrgAppLinks, } from "./workspace-app-links.js";
 function personalLabelFromEmail(email) {
@@ -76,23 +76,28 @@ function AppMenuLink({ app, onNavigate, }) {
             (app.isDispatch ? "Workspace hub" : `${app.name} workspace`);
     return (_jsxs("a", { href: app.href, onClick: onNavigate, className: "flex items-center gap-2 rounded-sm px-2.5 py-2 text-xs outline-none hover:bg-accent focus:bg-accent", children: [_jsx("span", { className: "flex h-7 w-7 shrink-0 items-center justify-center rounded-md bg-muted text-muted-foreground", children: _jsx(Icon, { className: "h-3.5 w-3.5" }) }), _jsxs("span", { className: "min-w-0 flex-1", children: [_jsx("span", { className: "block truncate font-medium text-foreground", children: app.name }), _jsx("span", { className: "block truncate text-[11px] text-muted-foreground", title: description, children: description })] }), _jsx(IconArrowUpRight, { className: "h-3.5 w-3.5 shrink-0 text-muted-foreground" })] }));
 }
-function AppsSubmenu({ apps, isLoading, dispatchHref, dispatchAllAppsHref, onNavigate, }) {
-    const { links, overflowCount } = visibleOrgAppLinks(apps);
+function AppsSubmenu({ apps, isLoading, dispatchHref, dispatchAllAppsHref, currentAppId, onNavigate, }) {
+    const appsForMenu = currentAppId
+        ? apps.filter((app) => app.id !== currentAppId)
+        : apps;
+    const { links, overflowCount } = visibleOrgAppLinks(appsForMenu);
     const visibleDispatchApp = links.find((app) => app.isDispatch);
-    const dispatchApp = visibleDispatchApp ??
-        {
-            id: "dispatch",
-            name: "Dispatch",
-            href: dispatchHref,
-            isDispatch: true,
-            status: "ready",
-        };
+    const dispatchApp = currentAppId === "dispatch"
+        ? null
+        : (visibleDispatchApp ??
+            {
+                id: "dispatch",
+                name: "Dispatch",
+                href: dispatchHref,
+                isDispatch: true,
+                status: "ready",
+            });
     const visibleNonDispatch = links
         .filter((app) => !app.isDispatch)
-        .slice(0, visibleDispatchApp ? undefined : ORG_SWITCHER_MAX_APP_LINKS - 1);
+        .slice(0, dispatchApp ? undefined : ORG_SWITCHER_MAX_APP_LINKS);
     const shownCount = (dispatchApp ? 1 : 0) + visibleNonDispatch.length;
-    const remainingCount = Math.max(overflowCount, apps.length - shownCount);
-    return (_jsxs(PopoverPrimitive.Root, { children: [_jsx(PopoverPrimitive.Trigger, { asChild: true, children: _jsxs("button", { type: "button", className: `${ITEM_CLASS} cursor-pointer`, children: [_jsx(IconApps, { className: "h-3.5 w-3.5 shrink-0 text-muted-foreground" }), _jsx("span", { className: "flex-1 text-start", children: "Apps" }), _jsx("span", { className: "text-[11px] text-muted-foreground", children: isLoading ? (_jsx(IconLoader2, { className: "h-3 w-3 animate-spin" })) : (apps.length) }), _jsx(IconChevronRight, { className: "h-3.5 w-3.5 shrink-0 text-muted-foreground rtl:-scale-x-100" })] }) }), _jsx(PopoverPrimitive.Portal, { children: _jsxs(PopoverPrimitive.Content, { side: "right", align: "start", sideOffset: 8, collisionPadding: 12, className: APP_SUBMENU_CONTENT_CLASS, children: [_jsx(AppMenuLink, { app: dispatchApp, onNavigate: onNavigate }), visibleNonDispatch.length > 0 && (_jsx("div", { className: "my-1 h-px bg-border" })), visibleNonDispatch.map((app) => (_jsx(AppMenuLink, { app: app, onNavigate: onNavigate }, app.id))), remainingCount > 0 && (_jsxs(_Fragment, { children: [_jsx("div", { className: "my-1 h-px bg-border" }), _jsxs("a", { href: dispatchAllAppsHref, onClick: onNavigate, className: "flex items-center gap-2 rounded-sm px-2.5 py-1.5 text-xs text-foreground outline-none hover:bg-accent focus:bg-accent", children: [_jsx(IconApps, { className: "h-3.5 w-3.5 shrink-0 text-muted-foreground" }), _jsx("span", { className: "flex-1", children: `View ${remainingCount} more in Dispatch` }), _jsx(IconArrowUpRight, { className: "h-3.5 w-3.5 shrink-0 text-muted-foreground" })] })] }))] }) })] }));
+    const remainingCount = Math.max(overflowCount, appsForMenu.length - shownCount);
+    return (_jsxs(PopoverPrimitive.Root, { children: [_jsx(PopoverPrimitive.Trigger, { asChild: true, children: _jsxs("button", { type: "button", className: `${ITEM_CLASS} cursor-pointer`, children: [_jsx(IconApps, { className: "h-3.5 w-3.5 shrink-0 text-muted-foreground" }), _jsx("span", { className: "flex-1 text-start", children: "Apps" }), _jsx("span", { className: "text-[11px] text-muted-foreground", children: isLoading ? (_jsx(IconLoader2, { className: "h-3 w-3 animate-spin" })) : (appsForMenu.length) }), _jsx(IconChevronRight, { className: "h-3.5 w-3.5 shrink-0 text-muted-foreground rtl:-scale-x-100" })] }) }), _jsx(PopoverPrimitive.Portal, { children: _jsxs(PopoverPrimitive.Content, { side: "right", align: "start", sideOffset: 8, collisionPadding: 12, className: APP_SUBMENU_CONTENT_CLASS, children: [dispatchApp && (_jsx(AppMenuLink, { app: dispatchApp, onNavigate: onNavigate })), dispatchApp && visibleNonDispatch.length > 0 && (_jsx("div", { className: "my-1 h-px bg-border" })), visibleNonDispatch.map((app) => (_jsx(AppMenuLink, { app: app, onNavigate: onNavigate }, app.id))), remainingCount > 0 && (_jsxs(_Fragment, { children: [_jsx("div", { className: "my-1 h-px bg-border" }), _jsxs("a", { href: dispatchAllAppsHref, onClick: onNavigate, className: "flex items-center gap-2 rounded-sm px-2.5 py-1.5 text-xs text-foreground outline-none hover:bg-accent focus:bg-accent", children: [_jsx(IconApps, { className: "h-3.5 w-3.5 shrink-0 text-muted-foreground" }), _jsx("span", { className: "flex-1", children: `View ${remainingCount} more in Dispatch` }), _jsx(IconArrowUpRight, { className: "h-3.5 w-3.5 shrink-0 text-muted-foreground" })] })] }))] }) })] }));
 }
 function ReservedOrgSwitcherSpace({ className }) {
     return _jsx("div", { "aria-hidden": "true", className: `h-8 ${className ?? ""}` });
@@ -106,7 +111,7 @@ function OrgSwitcherLoadingPlaceholder({ className }) {
  * invitations, inline forms to create a new org / invite a teammate, and a
  * sign-out item. Renders nothing in dev / no-auth mode.
  */
-export function OrgSwitcher({ className, hideWhenSingle, reserveSpace, compact, settingsPath = DEFAULT_ORGANIZATION_SETTINGS_PATH, profilePath = DEFAULT_PROFILE_PATH, agentPath = DEFAULT_AGENT_PATH, }) {
+export function OrgSwitcher({ className, hideWhenSingle, reserveSpace, compact, settingsPath = DEFAULT_ORGANIZATION_SETTINGS_PATH, profilePath = DEFAULT_PROFILE_PATH, agentPath = DEFAULT_AGENT_PATH, currentAppId, }) {
     const { data: org, isLoading } = useOrg();
     const { session } = useSession();
     const { enabled: demoModeEnabled } = useDemoModeStatus();
@@ -145,6 +150,7 @@ export function OrgSwitcher({ className, hideWhenSingle, reserveSpace, compact,
         catch {
             /* fall through to reload — server may already have cleared the cookie */
         }
+        notifySessionInvalidated();
         window.location.reload();
     };
     if (!org) {
@@ -216,7 +222,7 @@ export function OrgSwitcher({ className, hideWhenSingle, reserveSpace, compact,
                                                                 setJoiningOrgId(null);
                                                             }
                                                         }, disabled: joinByDomain.isPending, className: "rounded px-1.5 py-0.5 text-[11px] font-medium text-primary hover:bg-primary/10 disabled:opacity-50 cursor-pointer", children: isJoining ? (_jsx(IconLoader2, { className: "h-3 w-3 animate-spin" })) : ("Join") })] }, match.orgId));
-                                        })] })), _jsx("div", { className: "my-1 h-px bg-border" }), _jsx(AppsSubmenu, { apps: appLinks.apps, isLoading: appLinks.isLoading, dispatchHref: appLinks.dispatchHref, dispatchAllAppsHref: appLinks.dispatchAllAppsHref, onNavigate: () => setOpen(false) }), profilePath && (_jsxs("button", { type: "button", onClick: () => {
+                                        })] })), _jsx("div", { className: "my-1 h-px bg-border" }), _jsx(AppsSubmenu, { apps: appLinks.apps, isLoading: appLinks.isLoading, dispatchHref: appLinks.dispatchHref, dispatchAllAppsHref: appLinks.dispatchAllAppsHref, currentAppId: currentAppId, onNavigate: () => setOpen(false) }), profilePath && (_jsxs("button", { type: "button", onClick: () => {
                                         setOpen(false);
                                         navigate(profilePath);
                                     }, className: `${ITEM_CLASS} cursor-pointer`, children: [_jsx(IconUserCircle, { className: "h-3.5 w-3.5 shrink-0 text-muted-foreground" }), _jsx("span", { className: "flex-1 text-start", children: t("settings.profileMenuItem") })] })), agentPath && (_jsxs("button", { type: "button", onClick: () => {

package/dist/client/org/WorkspaceNotice.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { IconExternalLink } from "@tabler/icons-react";
 import { useState } from "react";
-import { shouldOfferWorkspace } from "../../org/workspace-url.js";
+import { isLocalDevelopmentOrigin, shouldOfferWorkspace, } from "../../org/workspace-url.js";
 import { useOrg } from "./hooks.js";
 const DISMISS_KEY_PREFIX = "agent-native:workspace-notice-dismissed:";
 function dismissKey(workspaceUrl) {
@@ -38,6 +38,8 @@ export function WorkspaceNotice({ className }) {
     const workspaceUrl = org?.workspaceUrl ?? null;
     if (typeof window === "undefined")
         return null;
+    if (isLocalDevelopmentOrigin(window.location.href))
+        return null;
     if (!workspaceUrl || dismissedNow || readDismissed(workspaceUrl))
         return null;
     if (!shouldOfferWorkspace(window.location.href, workspaceUrl))

package/dist/client/resources/index.d.ts

@@ -7,4 +7,4 @@ export * from "./use-builtin-capabilities.js";
 export { DEFAULT_MCP_INTEGRATIONS, filterMcpIntegrations, findMcpIntegrationForText, getDefaultMcpIntegrations, isCustomMcpIntegrationEnabled, isMcpIntegrationCatalogAvailable, mergeDefaultMcpIntegrations, type DefaultMcpIntegration, } from "./mcp-integration-catalog.js";
 export { McpIntegrationDialog, type McpIntegrationDialogProps, } from "./McpIntegrationDialog.js";
 export { McpConnectionSuggestion, type McpConnectionSuggestionProps, type McpConnectionSuggestionVariant, } from "./McpConnectionSuggestion.js";
-export { McpServersApiProvider, useMcpServersApi, useMcpServers, useCreateMcpServer, useDeleteMcpServer, useReconnectMcpServer, testMcpServerUrl, type CreateMcpServerArgs, type McpServer, type McpServerScope, type McpServersApi, type McpServersList, type ReconnectMcpServerArgs, type TestMcpUrlResult, } from "./use-mcp-servers.js";
+export { McpServersApiProvider, useMcpServersApi, useMcpServers, useCreateMcpServer, useDeleteMcpServer, useReconnectMcpServer, testMcpServerUrl, formatMcpServersLoadError, type CreateMcpServerArgs, type McpServer, type McpServerScope, type McpServersApi, type McpServersList, type ReconnectMcpServerArgs, type TestMcpUrlResult, } from "./use-mcp-servers.js";

package/dist/client/resources/index.js

@@ -7,4 +7,4 @@ export * from "./use-builtin-capabilities.js";
 export { DEFAULT_MCP_INTEGRATIONS, filterMcpIntegrations, findMcpIntegrationForText, getDefaultMcpIntegrations, isCustomMcpIntegrationEnabled, isMcpIntegrationCatalogAvailable, mergeDefaultMcpIntegrations, } from "./mcp-integration-catalog.js";
 export { McpIntegrationDialog, } from "./McpIntegrationDialog.js";
 export { McpConnectionSuggestion, } from "./McpConnectionSuggestion.js";
-export { McpServersApiProvider, useMcpServersApi, useMcpServers, useCreateMcpServer, useDeleteMcpServer, useReconnectMcpServer, testMcpServerUrl, } from "./use-mcp-servers.js";
+export { McpServersApiProvider, useMcpServersApi, useMcpServers, useCreateMcpServer, useDeleteMcpServer, useReconnectMcpServer, testMcpServerUrl, formatMcpServersLoadError, } from "./use-mcp-servers.js";

package/dist/client/resources/use-mcp-servers.d.ts

@@ -83,6 +83,7 @@ export interface TestMcpUrlResult {
 }
 export declare function getMcpUrlValidationError(rawUrl: string): string | null;
 export declare function formatMcpServerError(error: unknown): string;
+export declare function formatMcpServersLoadError(error: unknown): string;
 export declare function testMcpServerUrl(url: string, headers?: Record<string, string>): Promise<TestMcpUrlResult>;
 /**
  * Virtual tree-node id used when a server is surfaced in the Workspace tree.

package/dist/client/resources/use-mcp-servers.js

@@ -178,6 +178,20 @@ export function formatMcpServerError(error) {
     }
     return text.length > 240 ? `${text.slice(0, 237).trimEnd()}...` : text;
 }
+export function formatMcpServersLoadError(error) {
+    const raw = typeof error === "string"
+        ? error
+        : error instanceof Error
+            ? error.message
+            : String(error ?? "");
+    const text = raw.trim();
+    if (!text)
+        return "Could not load agent integrations.";
+    if (/401|unauthorized|signed-in workspace app|workspace app/i.test(text)) {
+        return "Sign in to a workspace app, then retry loading agent integrations.";
+    }
+    return text.length > 240 ? `${text.slice(0, 237).trimEnd()}...` : text;
+}
 export async function testMcpServerUrl(url, headers) {
     const validationError = getMcpUrlValidationError(url);
     if (validationError)

package/dist/client/settings/AccountSettingsCard.js

@@ -107,11 +107,17 @@ export function AccountSettingsForm({ compact = false, }) {
     const [uploading, setUploading] = useState(false);
     const [photoStatus, setPhotoStatus] = useState("idle");
     const [name, setName] = useState("");
+    const nameEditedRef = useRef(false);
     const displayName = profileQuery.data?.name ||
         session?.name ||
         email ||
         t("settings.profileSignedOut");
     useEffect(() => {
+        nameEditedRef.current = false;
+    }, [email]);
+    useEffect(() => {
+        if (nameEditedRef.current)
+            return;
         const nextName = profileQuery.data?.name || session?.name;
         if (nextName)
             setName(nextName);
@@ -144,12 +150,10 @@ export function AccountSettingsForm({ compact = false, }) {
     return (_jsxs(SettingsGroup, { id: "account", title: t("settings.profileTitle"), description: t("settings.profileDescription"), className: cn(compact && "[&>div:last-child>div>div]:py-3"), children: [_jsx(SettingsRow, { id: "profile", label: t("settings.profileTitle"), description: profileStatus, control: _jsxs("div", { className: "flex items-center gap-3", children: [_jsx(Avatar, { name: displayName, src: avatarUrl, fallback: profileInitials(displayName), size: "default", className: "size-10 shrink-0 rounded-full border border-border bg-accent font-semibold text-muted-foreground" }), _jsx("input", { ref: fileInputRef, type: "file", accept: "image/*", className: "hidden", onChange: handleAvatarChange }), _jsx(ActionButton, { type: "button", intent: "neutral", emphasis: "outline", size: "compact", disabled: !email || uploading, leadingIcon: _jsx(IconCamera, { className: "size-3.5" }), onPress: () => fileInputRef.current?.click(), children: uploading
                                 ? t("settings.profileUploading")
                                 : t("settings.profileChangePhoto") })] }) }), _jsx(SettingsRow, { id: "profile-name", label: t("settings.profileNameLabel"), description: updateProfile.isSuccess ? (_jsx("span", { className: "text-primary", children: t("settings.profileSaved") })) : updateProfile.error ? (_jsx("span", { className: "text-destructive", children: t("settings.profileSaveError") })) : (t("settings.profileNameDescription")), control: _jsxs("div", { className: "flex w-full items-center gap-2 sm:w-80", children: [_jsx(TextField, { id: "agent-native-profile-name", value: name, onChange: (value) => {
+                                nameEditedRef.current = true;
                                 updateProfile.reset();
                                 setName(value);
-                            }, placeholder: t("settings.profileNamePlaceholder"), disabled: !email || profileQuery.isLoading || updateProfile.isPending, "aria-label": t("settings.profileNameLabel"), className: "min-w-0 flex-1" }), _jsx(ActionButton, { type: "button", intent: "primary", emphasis: "solid", size: "compact", pending: updateProfile.isPending, disabled: !email ||
-                                profileQuery.isLoading ||
-                                updateProfile.isPending ||
-                                !name.trim(), onPress: handleProfileSave, children: updateProfile.isPending
+                            }, placeholder: t("settings.profileNamePlaceholder"), disabled: !email || updateProfile.isPending, "aria-label": t("settings.profileNameLabel"), className: "min-w-0 flex-1" }), _jsx(ActionButton, { type: "button", intent: "primary", emphasis: "solid", size: "compact", pending: updateProfile.isPending, disabled: !email || updateProfile.isPending || !name.trim(), onPress: handleProfileSave, children: updateProfile.isPending
                                 ? t("settings.profileSaving")
                                 : t("settings.profileSave") })] }) }), _jsx(SettingsRow, { id: "timezone", label: t("settings.timezoneLabel", { defaultValue: "Timezone" }), description: t("settings.timezoneHint", {
                     defaultValue: "Used for timestamps and scheduled automations.",

package/dist/client/settings/SettingsPanel.js

@@ -8,7 +8,7 @@ import { PROVIDER_ENV_PLACEHOLDERS } from "../../agent/engine/provider-env-vars.
 import { buildSettingsRoute } from "../../navigation/index.js";
 import { saveAgentEngineProviderSettings, setAgentEngineProvider, } from "../agent-engine-key.js";
 import { AgentWorkspaceContent } from "../agent-page/AgentWorkspaceContent.js";
-import { getAgentProviderOption, providerIdForEngine, } from "../agent-provider-catalog.js";
+import { AGENT_PROVIDER_CATALOG, getAgentProviderOption, providerIdForEngine, } from "../agent-provider-catalog.js";
 import { agentNativePath } from "../api-path.js";
 import { BuilderBMark } from "../builder-mark.js";
 import { Popover, PopoverContent, PopoverTrigger, } from "../components/ui/popover.js";
@@ -208,8 +208,6 @@ function UseBuilderCard({ builderFlow, connectUrl, connected, orgName, envManage
                                     ? "Connect account"
                                     : "Reconnect" })), credentialSource !== "env" ? _jsx(DisconnectBuilderButton, {}) : null] })) : null] }));
     }
-    if (!connectUrl)
-        return null;
     if (compact) {
         return (_jsxs(Button, { type: "button", intent: "primary", emphasis: "solid", onClick: () => builderFlow.start({ trackingSource, trackingFlow }), disabled: builderFlow.connecting, className: "inline-flex shrink-0 items-center gap-1.5 rounded-md bg-primary px-3 py-1.5 text-sm font-medium text-primary-foreground hover:bg-primary/90 disabled:cursor-wait disabled:opacity-70", children: [builderFlow.connecting ? "Connecting…" : "Connect Builder.io", builderFlow.connecting ? (_jsx(IconLoader2, { size: 14, className: "animate-spin" })) : null] }));
     }
@@ -278,6 +276,9 @@ function computeSourceBadge(args) {
         if (settingsStatus?.source === "env") {
             return `Connected via ${settingsStatus.envVar ?? args.envVar ?? "env"}`;
         }
+        if (settingsStatus?.source === "app_secrets") {
+            return "Connected via saved key";
+        }
         return "Connected via template (server-side)";
     }
     if (args.envConfigured)
@@ -373,7 +374,9 @@ function LLMSectionInner({ builderFlow, builderLoading, connectUrl, connected, o
             setBaseUrlConfigured(Boolean(data?.openAiBaseUrlConfigured));
             if (data?.configured &&
                 typeof data.engine === "string" &&
-                (data.source === "env" || data.source === "settings")) {
+                (data.source === "env" ||
+                    data.source === "settings" ||
+                    data.source === "app_secrets")) {
                 setSettingsStatus({
                     engine: data.engine,
                     source: data.source,
@@ -407,15 +410,40 @@ function LLMSectionInner({ builderFlow, builderLoading, connectUrl, connected, o
             .finally(() => setEnginesLoaded(true));
     }, []);
     const selectedEngineInfo = engines.find((e) => e.name === selectedEngine);
-    const envVar = selectedEngineInfo?.requiredEnvVars?.[0];
+    const selectedProvider = providerIdForEngine(selectedEngine) ?? "anthropic";
+    const selectedProviderOption = getAgentProviderOption(selectedProvider);
+    const envVar = selectedProviderOption.key;
     const selectedEnginePackageInstalled = selectedEngineInfo?.packageInstalled !== false;
     const envConfigured = envVar
         ? (envKeys.find((k) => k.key === envVar)?.configured ?? false)
         : false;
-    const settingsConfigured = settingsStatus != null && settingsStatus.engine === currentEngine;
+    const settingsConfigured = settingsStatus != null &&
+        (settingsStatus.engine === selectedEngine ||
+            (!!envVar && settingsStatus.envVar === envVar));
+    const configuredProviderIds = useMemo(() => {
+        const configured = new Set();
+        for (const option of AGENT_PROVIDER_CATALOG) {
+            if (option.key &&
+                envKeys.some((entry) => entry.key === option.key && entry.configured)) {
+                configured.add(option.id);
+            }
+        }
+        if (settingsStatus) {
+            const statusProvider = providerIdForEngine(settingsStatus.engine);
+            if (statusProvider)
+                configured.add(statusProvider);
+            if (settingsStatus.envVar) {
+                const statusOption = AGENT_PROVIDER_CATALOG.find((option) => option.key === settingsStatus.envVar);
+                if (statusOption)
+                    configured.add(statusOption.id);
+            }
+        }
+        return configured;
+    }, [envKeys, settingsStatus]);
     const builderConnected = connected || builderFlow.configured;
     const anyKeyConfigured = builderConnected ||
-        (selectedEnginePackageInstalled && (envConfigured || settingsConfigured));
+        (selectedEnginePackageInstalled &&
+            (envConfigured || settingsConfigured || configuredProviderIds.size > 0));
     const sourceBadge = computeSourceBadge({
         settingsConfigured,
         settingsStatus,
@@ -425,8 +453,6 @@ function LLMSectionInner({ builderFlow, builderLoading, connectUrl, connected, o
     });
     const manualSetupHint = "Select a provider.";
     const engineChanged = selectedEngine !== currentEngine || selectedModel !== currentModel;
-    const selectedProvider = providerIdForEngine(selectedEngine) ?? "anthropic";
-    const selectedProviderOption = getAgentProviderOption(selectedProvider);
     const isEndpointProvider = selectedProviderOption.supportsEndpoint === true;
     const endpointChanged = isEndpointProvider && (!!baseUrl.trim() || clearBaseUrl);
     const providerSettingsChanged = !!apiKey.trim() || endpointChanged;
@@ -553,7 +579,7 @@ function LLMSectionInner({ builderFlow, builderLoading, connectUrl, connected, o
                                 ? "Manage"
                                 : t("agentPanel.addOwnKeys", {
                                     defaultValue: "Custom keys",
-                                }), children: _jsxs("div", { className: "space-y-2 mb-1", children: [_jsx(AgentProviderPicker, { value: selectedProvider, layout: isPage ? "page" : "compact", onChange: (provider) => {
+                                }), children: _jsxs("div", { className: "space-y-2 mb-1", children: [_jsx(AgentProviderPicker, { value: selectedProvider, configuredProviders: configuredProviderIds, layout: isPage ? "page" : "compact", onChange: (provider) => {
                                             const option = getAgentProviderOption(provider);
                                             setSelectedEngine(option.engine);
                                             setSelectedModel(option.defaultModel);
@@ -578,7 +604,10 @@ function LLMSectionInner({ builderFlow, builderLoading, connectUrl, connected, o
                                                                     setClearBaseUrl(checked);
                                                                     if (checked)
                                                                         setBaseUrl("");
-                                                                }, "aria-label": "Clear saved endpoint override", className: "shrink-0" }), "Clear saved endpoint override"] })), endpointChanged && (_jsx(Button, { type: "button", intent: "neutral", emphasis: "solid", onClick: handleSave, disabled: saving, className: "rounded bg-accent px-2.5 py-1 text-[10px] font-medium text-foreground hover:bg-accent/80 disabled:opacity-40", children: saving ? (_jsx(IconLoader2, { size: 10, className: "animate-spin" })) : saved ? (_jsx(IconCheck, { size: 10 })) : ("Save endpoint") }))] }))] })), envVar && envConfigured ? (_jsxs("div", { className: cn("flex items-center gap-1.5 text-primary", isPage ? "text-xs" : "text-[10px]"), children: [_jsx(IconCheck, { size: isPage ? 14 : 10 }), envVar, " configured"] })) : envVar ? (_jsxs("div", { className: "flex gap-1.5", children: [_jsx("input", { type: "password", value: apiKey, onChange: (e) => setApiKey(e.target.value), onKeyDown: (e) => {
+                                                                }, "aria-label": "Clear saved endpoint override", className: "shrink-0" }), "Clear saved endpoint override"] })), endpointChanged && (_jsx(Button, { type: "button", intent: "neutral", emphasis: "solid", onClick: handleSave, disabled: saving, className: "rounded bg-accent px-2.5 py-1 text-[10px] font-medium text-foreground hover:bg-accent/80 disabled:opacity-40", children: saving ? (_jsx(IconLoader2, { size: 10, className: "animate-spin" })) : saved ? (_jsx(IconCheck, { size: 10 })) : ("Save endpoint") }))] }))] })), envVar && (envConfigured || settingsConfigured) ? (_jsxs("div", { className: cn("flex items-center gap-1.5 text-primary", isPage ? "text-xs" : "text-[10px]"), children: [_jsx(IconCheck, { size: isPage ? 14 : 10 }), settingsStatus?.source === "app_secrets" &&
+                                                settingsConfigured
+                                                ? "Saved key configured"
+                                                : `${envVar} configured`] })) : envVar ? (_jsxs("div", { className: "flex gap-1.5", children: [_jsx("input", { type: "password", value: apiKey, onChange: (e) => setApiKey(e.target.value), onKeyDown: (e) => {
                                                     if (e.key === "Enter")
                                                         handleSave();
                                                 }, placeholder: PROVIDER_ENV_PLACEHOLDERS[envVar] ?? "...", className: cn(textInputClass(isPage), "flex-1"), style: isPage ? CONTROL_STYLE_PAGE : undefined }), _jsx(Button, { intent: "primary", emphasis: "solid", onClick: handleSave, disabled: !providerSettingsChanged || saving, className: pillButtonClass(isPage, "solid"), children: saving ? (_jsx(IconLoader2, { size: isPage ? 14 : 10, className: "animate-spin" })) : saved ? (_jsx(IconCheck, { size: isPage ? 14 : 10 })) : ("Save") })] })) : null, _jsxs("div", { className: "flex items-center gap-2", children: [_jsx(Button, { intent: "neutral", emphasis: "outline", onClick: handleTest, disabled: testing, className: pillButtonClass(isPage, "outline"), children: testing ? (_jsxs("span", { className: "flex items-center gap-1", children: [_jsx(IconLoader2, { size: isPage ? 14 : 10, className: "animate-spin" }), "Testing\u2026"] })) : ("Test") }), PROVIDER_DOCS[selectedEngine] ? (_jsxs("a", { href: PROVIDER_DOCS[selectedEngine], target: "_blank", rel: "noopener noreferrer", className: cn(pillButtonClass(isPage, "outline"), "no-underline"), children: ["Get an API key", _jsx(IconExternalLink, { size: isPage ? 14 : 10 })] })) : null, engineChanged && (_jsx(Button, { intent: "primary", emphasis: "solid", onClick: handleApply, className: pillButtonClass(isPage, "solid"), children: "Apply" })), settingsStatus != null && (_jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx(Button, { intent: "danger", emphasis: "outline", onClick: handleDisconnect, className: cn(pillButtonClass(isPage, "outline"), "ms-auto text-muted-foreground hover:bg-destructive/10 hover:text-destructive hover:border-destructive/40"), children: "Disconnect" }) }), _jsx(TooltipContent, { children: "Clear the saved engine \u2014 the app will fall back to the default until you re-apply." })] }))] }), testResult && testResult.ok && (_jsxs("p", { className: cn("flex items-center gap-1 text-primary", isPage ? "text-xs" : "text-[10px]"), children: [_jsx(IconCheck, { size: isPage ? 14 : 10 }), "Test passed \u2014 ", testResult.latencyMs, "ms"] })), testResult && testResult.ok === false && (_jsxs("p", { className: cn("text-destructive", isPage ? "text-xs" : "text-[10px]"), children: ["Test failed: ", testResult.error] })), disconnectError && (_jsxs("p", { className: cn("text-destructive", isPage ? "text-xs" : "text-[10px]"), children: ["Disconnect failed: ", disconnectError] })), applyError && (_jsxs("p", { className: cn("text-destructive", isPage ? "text-xs" : "text-[10px]"), children: ["Apply failed: ", applyError] })), applyNote && (_jsx("p", { className: cn("text-muted-foreground", isPage ? "text-xs" : "text-[10px]"), children: "Changes take effect on next conversation" }))] }) })] })] })) }));
@@ -667,6 +696,8 @@ function AppModelDefaultsSectionInner({ grouped = false, open, onToggle, }) {
         };
     }, []);
     useEffect(() => load(), [load]);
+    if (!loading && !settings)
+        return null;
     const selectedEngineInfo = settings?.engines.find((engine) => engine.name === selectedEngine) ?? null;
     const engineOptions = (settings?.engines ?? [])
         .filter((engine) => engine.name === selectedEngine || engine.name !== "ai-sdk:anthropic")
@@ -793,7 +824,7 @@ function AppModelDefaultsSectionInner({ grouped = false, open, onToggle, }) {
                                 }, onEnter: () => {
                                     if (hasPendingChange)
                                         void save();
-                                } }), _jsxs("div", { className: "flex items-center gap-1.5", children: [_jsx(Button, { type: "button", intent: "primary", emphasis: "solid", onClick: () => void save(), disabled: !hasPendingChange || saving, className: pillButtonClass(isPage, "solid"), children: saving ? (_jsx(IconLoader2, { size: isPage ? 14 : 10, className: "animate-spin" })) : saved ? (_jsx(IconCheck, { size: isPage ? 14 : 10 })) : ("Save") }), _jsx(Button, { type: "button", intent: "neutral", emphasis: "outline", onClick: reset, disabled: !settings.canUpdate || !hasAppDefault || saving, className: pillButtonClass(isPage, "outline"), children: "Reset" })] })] }), !settings.canUpdate && (_jsx("p", { className: cn("mt-2 text-muted-foreground", noteTextClass(isPage)), children: "Only organization owners and admins can change app model defaults." })), selectedEngineInfo?.packageInstalled === false ? (_jsx("p", { className: cn("mt-2 text-muted-foreground", noteTextClass(isPage)), children: "This app does not include the optional runtime packages for this provider." })) : selectedEngineInfo && !selectedEngineInfo.configured ? (_jsx("p", { className: cn("mt-2 text-muted-foreground", noteTextClass(isPage)), children: "Credentials for this provider were not detected; runtime will fall back if the model cannot be used." })) : null, error && (_jsx("p", { className: cn("mt-2 text-destructive", noteTextClass(isPage)), children: error }))] }) }))) : (_jsx("p", { className: cn("text-muted-foreground", noteTextClass(isPage)), children: "App model defaults are unavailable." })) }));
+                                } }), _jsxs("div", { className: "flex items-center gap-1.5", children: [_jsx(Button, { type: "button", intent: "primary", emphasis: "solid", onClick: () => void save(), disabled: !hasPendingChange || saving, className: pillButtonClass(isPage, "solid"), children: saving ? (_jsx(IconLoader2, { size: isPage ? 14 : 10, className: "animate-spin" })) : saved ? (_jsx(IconCheck, { size: isPage ? 14 : 10 })) : ("Save") }), _jsx(Button, { type: "button", intent: "neutral", emphasis: "outline", onClick: reset, disabled: !settings.canUpdate || !hasAppDefault || saving, className: pillButtonClass(isPage, "outline"), children: "Reset" })] })] }), !settings.canUpdate && (_jsx("p", { className: cn("mt-2 text-muted-foreground", noteTextClass(isPage)), children: "Only organization owners and admins can change app model defaults." })), selectedEngineInfo?.packageInstalled === false ? (_jsx("p", { className: cn("mt-2 text-muted-foreground", noteTextClass(isPage)), children: "This app does not include the optional runtime packages for this provider." })) : selectedEngineInfo && !selectedEngineInfo.configured ? (_jsx("p", { className: cn("mt-2 text-muted-foreground", noteTextClass(isPage)), children: "Credentials for this provider were not detected; runtime will fall back if the model cannot be used." })) : null, error && (_jsx("p", { className: cn("mt-2 text-destructive", noteTextClass(isPage)), children: error }))] }) }))) : null }));
 }
 // ─── Email Section ──────────────────────────────────────────────────────────
 function EmailSectionInner({ open, onToggle, }) {
@@ -920,6 +951,8 @@ function AgentLimitsSectionInner({ grouped = false, open, onToggle, }) {
         window.addEventListener("agent-loop-settings:changed", handler);
         return () => window.removeEventListener("agent-loop-settings:changed", handler);
     }, []);
+    if (!loading && !settings)
+        return null;
     const numericValue = Number(value);
     const hasPendingChange = !!settings &&
         settings.canUpdate &&
@@ -1004,7 +1037,7 @@ function AgentLimitsSectionInner({ grouped = false, open, onToggle, }) {
                                         void save();
                                 }, className: cn(textInputClass(isPage), "min-w-0 flex-1 disabled:opacity-60"), style: isPage ? CONTROL_STYLE_PAGE : undefined }), _jsx(Button, { type: "button", intent: "primary", emphasis: "solid", onClick: save, disabled: !hasPendingChange || saving, className: pillButtonClass(isPage, "solid"), children: saving ? (_jsx(IconLoader2, { size: isPage ? 14 : 10, className: "animate-spin" })) : saved ? (_jsx(IconCheck, { size: isPage ? 14 : 10 })) : ("Save") }), _jsx(Button, { type: "button", intent: "neutral", emphasis: "outline", onClick: reset, disabled: !settings.canUpdate ||
                                     saving ||
-                                    settings.maxIterations === settings.defaultMaxIterations, className: pillButtonClass(isPage, "outline"), children: "Reset" })] }), !settings.canUpdate && (_jsx("p", { className: cn("mt-2 text-muted-foreground", noteTextClass(isPage)), children: "Only organization owners and admins can change this limit." })), error && (_jsx("p", { className: cn("mt-2 text-destructive", noteTextClass(isPage)), children: error }))] }) }))) : (_jsx("p", { className: cn("text-muted-foreground", noteTextClass(isPage)), children: "Agent limit settings are unavailable." })) }));
+                                    settings.maxIterations === settings.defaultMaxIterations, className: pillButtonClass(isPage, "outline"), children: "Reset" })] }), !settings.canUpdate && (_jsx("p", { className: cn("mt-2 text-muted-foreground", noteTextClass(isPage)), children: "Only organization owners and admins can change this limit." })), error && (_jsx("p", { className: cn("mt-2 text-destructive", noteTextClass(isPage)), children: error }))] }) }))) : null }));
 }
 export function areExtensionSettingsEnabled(options = {}) {
     return options.extensionTools === true;

package/dist/client/settings/SettingsTabsPage.js

@@ -29,9 +29,6 @@ function normalizeTabId(value) {
     if (normalized === "workspace" || normalized === "workspace-settings") {
         return "workspace";
     }
-    if (normalized === "connections") {
-        return "integrations";
-    }
     return normalized;
 }
 function resolveTabId(tabs, value) {
@@ -40,6 +37,14 @@ function resolveTabId(tabs, value) {
         return null;
     if (tabs.some((tab) => tab.id === normalized))
         return normalized;
+    const alternateTabId = normalized === "connections"
+        ? "integrations"
+        : normalized === "integrations"
+            ? "connections"
+            : null;
+    if (alternateTabId && tabs.some((tab) => tab.id === alternateTabId)) {
+        return alternateTabId;
+    }
     const nestedTab = tabs
         .filter((tab) => normalized.startsWith(`${tab.id}:`) ||
         tab.id.startsWith(`${normalized}:`))

package/dist/client/sharing/ShareButton.d.ts

@@ -1,5 +1,5 @@
 import { type ReactNode } from "react";
-import { type ShareButtonVisibility } from "./useShareButtonController.js";
+import { type ShareButtonRole, type ShareButtonVisibility } from "./useShareButtonController.js";
 export interface ShareButtonProps {
     resourceType: string;
     resourceId: string;
@@ -61,6 +61,11 @@ export interface ShareButtonProps {
         label?: string;
         description?: string;
     }>>;
+    /** Optional template-specific labels and descriptions for share roles. */
+    roleCopy?: Partial<Record<Role, {
+        label?: string;
+        description?: string;
+    }>>;
     /** Optional label for the explicit per-person access list. */
     peopleAccessLabel?: ReactNode;
     /** Optional label for the coarse visibility control. */
@@ -95,6 +100,7 @@ export interface ShareButtonProps {
     popoverClassName?: string;
 }
 type Visibility = ShareButtonVisibility;
+type Role = ShareButtonRole;
 /**
  * Framework share control. Renders a shadcn-outline-styled trigger that
  * opens a Google-Docs-style popover anchored beneath it. Uses Tailwind