@agent-native/core 0.154.5 → 0.157.0

package/dist/client/chat-first/primary-nav.js

@@ -1,13 +1,13 @@
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { IconClock, IconPlus, IconPlugConnected, IconSearch, } from "@tabler/icons-react";
 import { defaultChatFirstCopy } from "./copy.js";
-export function ChatFirstPrimaryNavigation({ onNewChat, onOpenIntegrations, onOpenScheduled, onSearch, activeTab, stickyNewChat = false, copy = defaultChatFirstCopy, }) {
+export function ChatFirstPrimaryNavigation({ onNewChat, onOpenIntegrations, onOpenScheduled, onSearch, activeTab, collapsed = false, stickyNewChat = false, copy = defaultChatFirstCopy, }) {
     const tabClassName = (tab) => `flex h-8 w-full items-center gap-2 rounded-md px-2 text-[13px] font-medium transition-[background-color,color] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring ${activeTab === tab
         ? "bg-sidebar-accent text-sidebar-accent-foreground"
         : "text-sidebar-foreground/80 hover:bg-sidebar-accent hover:text-sidebar-accent-foreground"}`;
-    const renderTab = (tab, content, onSelect, className) => (_jsx("button", { type: "button", role: "tab", "aria-selected": activeTab === tab, className: [tabClassName(tab), className].filter(Boolean).join(" "), onClick: onSelect, children: content }));
+    const renderTab = (tab, content, onSelect, className) => (_jsx("button", { type: "button", role: "tab", "aria-selected": activeTab === tab, "aria-label": tab === "new-chat" ? copy("newChat") : undefined, title: tab === "new-chat" && collapsed ? copy("newChat") : undefined, className: [tabClassName(tab), className].filter(Boolean).join(" "), onClick: onSelect, children: content }));
     const newChatTab = onNewChat
-        ? renderTab("new-chat", _jsxs(_Fragment, { children: [_jsx(IconPlus, { size: 15, className: "shrink-0", "aria-hidden": "true" }), _jsx("span", { children: copy("newChat") })] }), onNewChat, "code-agents-primary-new-chat")
+        ? renderTab("new-chat", _jsxs(_Fragment, { children: [_jsx(IconPlus, { size: 15, className: "shrink-0", "aria-hidden": "true" }), _jsx("span", { className: collapsed ? "sr-only" : undefined, children: copy("newChat") })] }), onNewChat, "code-agents-primary-new-chat")
         : null;
     const integrationsTab = renderTab("integrations", _jsxs(_Fragment, { children: [_jsx(IconPlugConnected, { size: 15, className: "shrink-0", "aria-hidden": "true" }), _jsx("span", { children: copy("integrations") })] }), onOpenIntegrations);
     const scheduledTab = renderTab("scheduled", _jsxs(_Fragment, { children: [_jsx(IconClock, { size: 15, className: "shrink-0", "aria-hidden": "true" }), _jsx("span", { children: copy("scheduled") })] }), onOpenScheduled);

package/dist/client/chat-first/types.d.ts

@@ -8,6 +8,10 @@ export interface ChatFirstAppItem {
     color?: string;
 }
 export type ChatFirstCopy = (key: string, values?: Record<string, string>) => string;
+export interface ChatFirstAppIconRenderOptions {
+    isActive: boolean;
+    isInactive: boolean;
+}
 export interface ChatFirstEmbedTarget {
     url: string;
     title?: string;
@@ -51,7 +55,7 @@ export interface ChatFirstAppRailProps {
     onOpenAllApps?: () => void;
     onCreateApp?: () => void;
     createAppTrigger?: ReactNode;
-    renderIcon: (app: ChatFirstAppItem) => ReactNode;
+    renderIcon: (app: ChatFirstAppItem, options?: ChatFirstAppIconRenderOptions) => ReactNode;
     copy?: ChatFirstCopy;
 }
 export interface ChatFirstBrowserPaneProps {

package/dist/client/components/ui/message-scroller.d.ts

@@ -8,7 +8,7 @@ type MessageScrollerItemProps = React.ComponentProps<typeof ShadcnMessageScrolle
 type MessageScrollerButtonProps = React.ComponentProps<typeof ShadcnMessageScroller.Button>;
 declare function MessageScrollerProvider(props: MessageScrollerProviderProps): React.JSX.Element;
 declare function MessageScroller({ className, ...props }: MessageScrollerRootProps): React.JSX.Element;
-declare function MessageScrollerViewport({ className, children, ...props }: MessageScrollerViewportProps): React.JSX.Element;
+declare function MessageScrollerViewport({ className, children, "aria-label": ariaLabel, ...props }: MessageScrollerViewportProps): React.JSX.Element;
 declare function MessageScrollerContent({ className, spacerClassName, ...props }: MessageScrollerContentProps): React.JSX.Element;
 declare function MessageScrollerItem(props: MessageScrollerItemProps): React.JSX.Element;
 declare function MessageScrollerButton({ className, children, render, ...props }: MessageScrollerButtonProps): React.JSX.Element;

package/dist/client/components/ui/message-scroller.js

@@ -1,6 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { MessageScroller as ShadcnMessageScroller, useMessageScroller, useMessageScrollerScrollable, useMessageScrollerVisibility, } from "@shadcn/react/message-scroller";
 import { IconChevronDown } from "@tabler/icons-react";
+import { useT } from "../../i18n.js";
 import { cn } from "../../utils.js";
 function MessageScrollerProvider(props) {
     return _jsx(ShadcnMessageScroller.Provider, { ...props });
@@ -8,12 +9,14 @@ function MessageScrollerProvider(props) {
 function MessageScroller({ className, ...props }) {
     return (_jsx(ShadcnMessageScroller.Root, { className: cn("relative flex min-h-0 flex-1 flex-col", className), ...props }));
 }
-function MessageScrollerViewport({ className, children, ...props }) {
+function MessageScrollerViewport({ className, children, "aria-label": ariaLabel, ...props }) {
+    const t = useT();
     const { start: hasContentAbove } = useMessageScrollerScrollable();
     return (_jsx(ShadcnMessageScroller.Viewport, { className: cn("min-h-0 flex-1 overflow-y-auto overflow-x-hidden", 
         // The base class carries the mask itself so it is never added or
         // removed; the modifier only widens the fade. See agent-native.css.
-        "message-scroller-viewport", hasContentAbove && "message-scroller-viewport--top-fade", className), ...props, children: children }));
+        "message-scroller-viewport", hasContentAbove && "message-scroller-viewport--top-fade", className), "aria-label": ariaLabel ??
+            t("agentChat.message.messages", { defaultValue: "Messages" }), ...props, children: children }));
 }
 function MessageScrollerContent({ className, spacerClassName, ...props }) {
     return (_jsx(ShadcnMessageScroller.Content, { className: cn("flex flex-col", className), spacerClassName: cn("shrink-0", spacerClassName), ...props }));
@@ -22,7 +25,8 @@ function MessageScrollerItem(props) {
     return _jsx(ShadcnMessageScroller.Item, { ...props });
 }
 function MessageScrollerButton({ className, children, render, ...props }) {
+    const t = useT();
     return (_jsx(ShadcnMessageScroller.Button, { render: render ??
-            ((buttonProps) => (_jsx("div", { className: "shrink-0 flex justify-center -mb-1", children: _jsx("button", { ...buttonProps, className: cn("flex h-7 w-7 items-center justify-center rounded-full border border-border bg-background shadow-sm hover:bg-accent", "data-[active=false]:hidden", className, buttonProps.className), "aria-label": "Scroll to bottom", children: children ?? (_jsx(IconChevronDown, { className: "h-3.5 w-3.5 text-muted-foreground" })) }) }))), ...props }));
+            ((buttonProps) => (_jsx("div", { className: "shrink-0 flex justify-center -mb-1", children: _jsx("button", { ...buttonProps, className: cn("flex h-7 w-7 items-center justify-center rounded-full border border-border bg-background shadow-sm hover:bg-accent", "data-[active=false]:hidden", className, buttonProps.className), "aria-label": t("agentChat.composer.scrollToBottom"), children: children ?? (_jsx(IconChevronDown, { className: "h-3.5 w-3.5 text-muted-foreground" })) }) }))), ...props }));
 }
 export { MessageScroller, MessageScrollerButton, MessageScrollerContent, MessageScrollerItem, MessageScrollerProvider, MessageScrollerViewport, useMessageScroller, useMessageScrollerScrollable, useMessageScrollerVisibility, };

package/dist/client/composer/runtime-adapters.js

@@ -12,7 +12,7 @@ import { getBrowserTabId } from "../browser-tab-id.js";
 import { isTrustedBuilderMessage, tryDelegateBuildRequestToBuilder, } from "../builder-frame.js";
 import { BuilderSetupCard, BuilderSetupContent } from "../chat/run-recovery.js";
 import { isTrustedFrameMessage } from "../frame.js";
-import { useT } from "../i18n.js";
+import { useFormatters, useT } from "../i18n.js";
 import { useOrg } from "../org/hooks.js";
 import { isMcpIntegrationCatalogAvailable } from "../resources/mcp-integration-catalog.js";
 import { McpIntegrationDialog } from "../resources/McpIntegrationDialog.js";
@@ -79,6 +79,7 @@ const coreComposerAdapters = {
 };
 export function CoreComposerRuntimeProvider({ children, }) {
     const translate = useT();
-    const adapters = useMemo(() => ({ ...coreComposerAdapters, translate }), [translate]);
+    const { formatNumber } = useFormatters();
+    const adapters = useMemo(() => ({ ...coreComposerAdapters, formatNumber, translate }), [formatNumber, translate]);
     return (_jsx(ComposerRuntimeAdaptersProvider, { adapters: adapters, children: children }));
 }

package/dist/client/context-xray/ContextMeter.js

@@ -2,12 +2,14 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { ContextMeterView } from "@agent-native/toolkit/context-ui";
 import { lazy, Suspense, useEffect, useRef, useState } from "react";
 import { manifestConversationTokens, manifestSystemTokens, } from "../../shared/context-xray.js";
+import { useT } from "../i18n.js";
 import { useActionMutation, useActionQuery } from "../use-action.js";
 import { resolveContextWindow } from "./format.js";
 const ContextXRayPanel = lazy(() => import("./ContextXRayPanel.js").then((m) => ({
     default: m.ContextXRayPanel,
 })));
 export function ContextMeter({ threadId, manifest: providedManifest, enabled = true, }) {
+    const t = useT();
     const [open, setOpen] = useState(false);
     const [optimistic, setOptimistic] = useState(new Map());
     const currentThreadId = useRef(threadId);
@@ -61,5 +63,7 @@ export function ContextMeter({ threadId, manifest: providedManifest, enabled = t
             ...manifest,
             systemTokens: manifestSystemTokens(manifest),
             conversationTokens: manifestConversationTokens(manifest),
-        }, contextWindow: resolveContextWindow(manifest.model), open: open, onOpenChange: setOpen, children: open ? (_jsx(Suspense, { fallback: _jsx("div", { className: "flex h-52 items-center justify-center text-xs text-muted-foreground", children: "Loading context view\u2026" }), children: _jsx(ContextXRayPanel, { manifest: manifest, optimistic: optimistic, onPin: (segmentId) => mutateStatus(segmentId, "pinned", "pin"), onEvict: (segmentId) => mutateStatus(segmentId, "evicted", "evict"), onRestore: (segmentId) => mutateStatus(segmentId, "active", "restore") }) })) : null }));
+        }, contextWindow: resolveContextWindow(manifest.model), open: open, onOpenChange: setOpen, translate: t, children: open ? (_jsx(Suspense, { fallback: _jsx("div", { className: "flex h-52 items-center justify-center text-xs text-muted-foreground", children: t("agentChat.contextXray.loading", {
+                    defaultValue: "Loading context view…",
+                }) }), children: _jsx(ContextXRayPanel, { manifest: manifest, optimistic: optimistic, onPin: (segmentId) => mutateStatus(segmentId, "pinned", "pin"), onEvict: (segmentId) => mutateStatus(segmentId, "evicted", "evict"), onRestore: (segmentId) => mutateStatus(segmentId, "active", "restore") }) })) : null }));
 }

package/dist/client/context-xray/ContextXRayPanel.js

@@ -9,18 +9,18 @@ export function ContextXRayPanel({ manifest, optimistic, onPin, onEvict, onResto
             ...manifest,
             systemTokens: manifestSystemTokens(manifest),
             conversationTokens: manifestConversationTokens(manifest),
-        }, contextWindow: resolveContextWindow(manifest.model), optimistic: optimistic, onPin: onPin, onEvict: onEvict, onRestore: onRestore, titleLabel: t("contextXray.panelTitle", {
+        }, contextWindow: resolveContextWindow(manifest.model), optimistic: optimistic, onPin: onPin, onEvict: onEvict, onRestore: onRestore, translate: t, titleLabel: t("agentChat.contextXray.panelTitle", {
             defaultValue: "Context X-Ray",
-        }), systemOrderedLabel: t("contextXray.systemOrdered", {
+        }), systemOrderedLabel: t("agentChat.contextXray.systemOrdered", {
             defaultValue: "System · ordered, not evictable",
         }), governanceLabels: {
-            required: t("contextXray.governance.required", {
+            required: t("agentChat.contextXray.governance.required", {
                 defaultValue: "Required",
             }),
-            inherited: t("contextXray.governance.inherited", {
+            inherited: t("agentChat.contextXray.governance.inherited", {
                 defaultValue: "Inherited",
             }),
-            user: t("contextXray.governance.user", {
+            user: t("agentChat.contextXray.governance.user", {
                 defaultValue: "Your context",
             }),
         } }));

package/dist/client/error-format.d.ts

@@ -18,5 +18,9 @@ export interface NormalizedChatError {
     message: string;
     details?: string;
 }
+type ErrorTranslate = (key: string, options?: Record<string, unknown>) => string;
+/** Localize only Core's own normalized error copy; preserve provider details. */
+export declare function localizeKnownChatErrorText(text: string, t: ErrorTranslate): string;
 export declare function isProviderAuthenticationError(text: string, errorCode?: string): boolean;
 export declare function normalizeChatError(errorMessage: string, errorCode?: string): NormalizedChatError;
+export {};

package/dist/client/error-format.js

@@ -16,6 +16,10 @@ export const BUILDER_SPACE_SETTINGS_URL = "https://builder.io/account/space?utm_
 // error message. The chat renderer intercepts this href and renders a button
 // that dispatches the `agent-native:new-chat` CustomEvent instead of navigating.
 export const NEW_CHAT_ACTION_HREF = "agent-native:new-chat";
+const OPEN_BUILDER_SPACE_SETTINGS_LABEL = "Open Builder space settings";
+const START_NEW_CHAT_LABEL = "Start new chat";
+const UPGRADE_AT_BUILDER_LABEL = "Upgrade at builder.io";
+const BUILDER_AUTHENTICATION_ERROR = "Builder rejected the connected credentials. Reconnect Builder.io (free tier available) in Settings, then retry.";
 function isSafeUpgradeUrl(url) {
     try {
         const parsed = new URL(url);
@@ -31,19 +35,103 @@ export function formatChatErrorText(errorMessage, upgradeUrl, errorCode) {
     const normalized = normalizeChatError(errorMessage, errorCode);
     if (errorCode === "gateway_not_enabled" ||
         /space has not enabled the LLM gateway/i.test(normalized.message)) {
-        return `Error: ${normalized.message}\n\n[Open Builder space settings](${BUILDER_SPACE_SETTINGS_URL})`;
+        return `Error: ${normalized.message}\n\n[${OPEN_BUILDER_SPACE_SETTINGS_LABEL}](${BUILDER_SPACE_SETTINGS_URL})`;
     }
     if (errorCode === "builder_gateway_error") {
-        return `Error: ${normalized.message}\n\n[Start new chat](${NEW_CHAT_ACTION_HREF})`;
+        return `Error: ${normalized.message}\n\n[${START_NEW_CHAT_LABEL}](${NEW_CHAT_ACTION_HREF})`;
     }
     if (errorCode === "context_length_exceeded" ||
         errorCode === "input_too_long") {
-        return `Error: ${normalized.message}\n\n[Start new chat](${NEW_CHAT_ACTION_HREF})`;
+        return `Error: ${normalized.message}\n\n[${START_NEW_CHAT_LABEL}](${NEW_CHAT_ACTION_HREF})`;
     }
     if (!upgradeUrl || !isSafeUpgradeUrl(upgradeUrl)) {
         return `Error: ${normalized.message}`;
     }
-    return `Error: ${normalized.message}\n\n[Upgrade at builder.io](${upgradeUrl})`;
+    return `Error: ${normalized.message}\n\n[${UPGRADE_AT_BUILDER_LABEL}](${upgradeUrl})`;
+}
+const KNOWN_CHAT_ERROR_KEYS = new Map([
+    [
+        "No LLM provider is connected. Open this app's Manage agent > LLM, then connect Builder.io or add a provider key.",
+        "agentChat.errorMessages.noProviderConnected",
+    ],
+    [
+        "The provider behind this model rejected the request. Pick a different model, then retry.",
+        "agentChat.errorMessages.builderModelUnauthorized",
+    ],
+    [
+        BUILDER_AUTHENTICATION_ERROR,
+        "agentChat.errorMessages.builderAuthentication",
+    ],
+    [
+        "This model can't use tools with the current settings. Switch models in Settings, then retry.",
+        "agentChat.errorMessages.providerConfiguration",
+    ],
+    [
+        "The model provider is rate-limiting this chat right now. Wait a moment, then retry.",
+        "agentChat.errorMessages.providerRateLimit",
+    ],
+    [
+        "The model provider rejected the saved API key. Update the key in Settings → Integrations → API keys, then retry.",
+        "agentChat.errorMessages.providerAuthentication",
+    ],
+    [
+        "The model provider could not be reached. Check your connection and retry.",
+        "agentChat.errorMessages.providerNetwork",
+    ],
+    [
+        "The agent connection was interrupted. Check your connection and retry.",
+        "agentChat.errorMessages.agentConnection",
+    ],
+    [
+        "The model gateway returned no error details and the chat couldn't recover. Wait a moment and retry, or start a new chat if it keeps happening.",
+        "agentChat.errorMessages.gatewayNoDetails",
+    ],
+    [
+        "The agent connection timed out before it could finish. You can continue from the partial work or retry.",
+        "agentChat.errorMessages.inactivityTimeout",
+    ],
+    [
+        "A tool schema was invalid, so the model rejected the request before it started. The invalid tool can be skipped and the request retried.",
+        "agentChat.errorMessages.invalidToolSchema",
+    ],
+    [
+        "The provider returned an HTML error page.",
+        "agentChat.errorMessages.providerHtml",
+    ],
+]);
+const KNOWN_CHAT_ERROR_ACTION_KEYS = new Map([
+    [
+        "Open Builder space settings",
+        "agentChat.errorMessages.openBuilderSpaceSettings",
+    ],
+    ["Start new chat", "agentChat.errorMessages.startNewChat"],
+    ["Upgrade at builder.io", "agentChat.errorMessages.upgradeAtBuilder"],
+]);
+/** Localize only Core's own normalized error copy; preserve provider details. */
+export function localizeKnownChatErrorText(text, t) {
+    const newlineIndex = text.indexOf("\n");
+    const firstLine = newlineIndex >= 0 ? text.slice(0, newlineIndex) : text;
+    const suffix = newlineIndex >= 0 ? text.slice(newlineIndex) : "";
+    const hasPrefix = firstLine.startsWith("Error: ");
+    const message = hasPrefix ? firstLine.slice("Error: ".length) : firstLine;
+    const key = KNOWN_CHAT_ERROR_KEYS.get(message);
+    let localizedFirstLine = firstLine;
+    if (key) {
+        const translated = t(key, { defaultValue: message });
+        localizedFirstLine = hasPrefix
+            ? t("agentChat.errorMessages.errorPrefix", {
+                defaultValue: "Error: {{message}}",
+                message: translated,
+            })
+            : translated;
+    }
+    const localizedSuffix = suffix.replace(/\[([^\]]+)]\(([^)]+)\)/g, (link, label, href) => {
+        const actionKey = KNOWN_CHAT_ERROR_ACTION_KEYS.get(label);
+        if (!actionKey)
+            return link;
+        return `[${t(actionKey, { defaultValue: label })}](${href})`;
+    });
+    return `${localizedFirstLine}${localizedSuffix}`;
 }
 function normalizeErrorCode(errorCode) {
     return String(errorCode ?? "")
@@ -124,7 +212,7 @@ export function normalizeChatError(errorMessage, errorCode) {
     }
     if (code === "builder_auth_error") {
         return {
-            message: "Builder rejected the connected credentials. Reconnect Builder.io (free tier available) in Settings, then retry.",
+            message: BUILDER_AUTHENTICATION_ERROR,
             details: text,
         };
     }

package/dist/client/i18n.js

@@ -5,6 +5,7 @@ import { IconCheck, IconChevronDown, IconLanguage } from "@tabler/icons-react";
 import i18next from "i18next";
 import { createContext, useCallback, useContext, useEffect, useMemo, useRef, useState, } from "react";
 import { I18nextProvider, initReactI18next, useTranslation, } from "react-i18next";
+import { coreMessagesForLocale, englishAgentChatMessages, loadCoreMessagesForLocale, normalizeCoreMessageOverrides, } from "../localization/core-messages.js";
 import defaultEnglishMessages from "../localization/default-messages.js";
 import { DEFAULT_LOCALE, LOCALE_HYDRATION_GLOBAL, LOCALE_METADATA, LOCALE_STORAGE_KEY, SUPPORTED_LOCALES, localeDirection, normalizeLocalizationPreference, resolveLocaleFromCandidates, resolveLocaleFromPreference, } from "../localization/shared.js";
 import { injectedAgentNativeConfig } from "./app-config.js";
@@ -138,8 +139,7 @@ function resolveInitialState(args) {
 }
 function resolveSupportedLocales(args) {
     const configured = injectedAgentNativeConfig().translations?.locales;
-    const candidates = configured ??
-        args.catalog?.supportedLocales ?? [args.sourceLocale];
+    const candidates = configured ?? args.catalog?.supportedLocales ?? SUPPORTED_LOCALES;
     const supported = candidates.filter((locale) => SUPPORTED_LOCALES.includes(locale));
     return [
         args.sourceLocale,
@@ -160,16 +160,39 @@ function normalizeLoadedMessages(value) {
     }
     return value;
 }
+function mergeLocaleMessages(base, overrides) {
+    if (!overrides)
+        return base;
+    const merged = { ...base };
+    for (const [key, value] of Object.entries(overrides)) {
+        const current = merged[key];
+        if (current &&
+            value &&
+            typeof current === "object" &&
+            typeof value === "object" &&
+            !Array.isArray(current) &&
+            !Array.isArray(value)) {
+            merged[key] = mergeLocaleMessages(current, value);
+        }
+        else {
+            merged[key] = value;
+        }
+    }
+    return merged;
+}
+function composeLocaleMessages(coreMessages, appMessages) {
+    return mergeLocaleMessages(mergeLocaleMessages(defaultEnglishMessages, coreMessages), appMessages ? normalizeCoreMessageOverrides(appMessages) : null);
+}
 function createI18nInstance(args) {
     const instance = i18next.createInstance();
     const resources = {
         [args.sourceLocale]: {
-            [args.namespace]: args.messages,
+            [args.namespace]: composeLocaleMessages(coreMessagesForLocale(args.sourceLocale), args.messages),
         },
     };
-    if (args.initialLocale !== args.sourceLocale && args.initialMessages) {
+    if (args.initialLocale !== args.sourceLocale) {
         resources[args.initialLocale] = {
-            [args.namespace]: args.initialMessages,
+            [args.namespace]: composeLocaleMessages(coreMessagesForLocale(args.initialLocale), args.initialMessages),
         };
     }
     void instance.use(initReactI18next).init({
@@ -202,24 +225,37 @@ export function AgentNativeI18nProvider({ children, catalog, initialLocale, init
     const [locale, setLocale] = useState(initialState.locale);
     const [loading, setLoading] = useState(false);
     const i18nRef = useRef(null);
+    const appMessagesLoadedRef = useRef(null);
+    const appMessagesRef = useRef(null);
+    const coreMessagesLoadedRef = useRef(null);
     if (!i18nRef.current) {
         const preloadedMessages = normalizeLoadedMessages(hydration.locale === initialState.locale && hydration.messages
             ? hydration.messages
             : initialMessages);
+        const resolvedSourceMessages = normalizeCoreMessageOverrides(hydration.locale === sourceLocale && hydration.messages
+            ? hydration.messages
+            : sourceMessages);
         i18nRef.current = createI18nInstance({
             namespace,
             sourceLocale,
-            messages: hydration.locale === sourceLocale && hydration.messages
-                ? hydration.messages
-                : sourceMessages,
+            messages: resolvedSourceMessages,
             initialLocale: initialState.locale,
             initialMessages: preloadedMessages,
         });
+        appMessagesRef.current = new Map([[sourceLocale, resolvedSourceMessages]]);
+        appMessagesLoadedRef.current = new Set([sourceLocale]);
+        if (initialState.locale !== sourceLocale && preloadedMessages) {
+            appMessagesRef.current.set(initialState.locale, normalizeCoreMessageOverrides(preloadedMessages));
+            appMessagesLoadedRef.current.add(initialState.locale);
+        }
+        coreMessagesLoadedRef.current = new Set([sourceLocale, initialState.locale].filter((candidate) => candidate === DEFAULT_LOCALE));
     }
     const i18n = i18nRef.current;
     useEffect(() => {
         if (i18n.hasResourceBundle(sourceLocale, namespace)) {
-            i18n.addResourceBundle(sourceLocale, namespace, sourceMessages, true, true);
+            const normalizedSourceMessages = normalizeCoreMessageOverrides(sourceMessages);
+            appMessagesRef.current?.set(sourceLocale, normalizedSourceMessages);
+            i18n.addResourceBundle(sourceLocale, namespace, normalizedSourceMessages, true, true);
         }
     }, [i18n, namespace, sourceLocale, sourceMessages]);
     useEffect(() => {
@@ -233,17 +269,37 @@ export function AgentNativeI18nProvider({ children, catalog, initialLocale, init
         async function applyLocale() {
             setLoading(true);
             try {
-                if (locale !== sourceLocale &&
-                    !i18n.hasResourceBundle(locale, namespace)) {
+                const shouldLoadAppMessages = locale !== sourceLocale && !appMessagesLoadedRef.current?.has(locale);
+                const shouldLoadCoreMessages = !coreMessagesLoadedRef.current?.has(locale);
+                if (shouldLoadAppMessages || shouldLoadCoreMessages) {
                     const preloaded = hydration.locale === locale && hydration.messages
                         ? hydration.messages
                         : initialLocale === locale && initialMessages
                             ? initialMessages
                             : null;
-                    const loaded = preloaded ?? (await loadMessages?.(locale));
-                    const messages = normalizeLoadedMessages(loaded);
-                    if (messages) {
-                        i18n.addResourceBundle(locale, namespace, messages, true, true);
+                    const [coreMessages, loadedAppMessages] = await Promise.all([
+                        shouldLoadCoreMessages
+                            ? loadCoreMessagesForLocale(locale)
+                            : Promise.resolve({}),
+                        shouldLoadAppMessages
+                            ? Promise.resolve(preloaded ?? loadMessages?.(locale))
+                            : Promise.resolve(null),
+                    ]);
+                    const existingMessages = normalizeLoadedMessages(i18n.getResourceBundle(locale, namespace));
+                    const loadedMessages = normalizeLoadedMessages(loadedAppMessages);
+                    if (loadedMessages) {
+                        appMessagesRef.current?.set(locale, normalizeCoreMessageOverrides(loadedMessages));
+                    }
+                    const appMessages = appMessagesRef.current?.get(locale) ?? null;
+                    const nextMessages = shouldLoadCoreMessages
+                        ? composeLocaleMessages(coreMessages, appMessages)
+                        : mergeLocaleMessages(existingMessages ?? {}, appMessages);
+                    i18n.addResourceBundle(locale, namespace, nextMessages, true, true);
+                    if (shouldLoadCoreMessages) {
+                        coreMessagesLoadedRef.current?.add(locale);
+                    }
+                    if (shouldLoadAppMessages) {
+                        appMessagesLoadedRef.current?.add(locale);
                     }
                 }
                 if (!cancelled) {
@@ -369,6 +425,10 @@ export function useOptionalLocale() {
     return useContext(LocaleContext);
 }
 const CORE_FALLBACK_MESSAGES = {
+    ...Object.fromEntries(Object.entries(englishAgentChatMessages).map(([key, value]) => [
+        `agentChat.${key}`,
+        value,
+    ])),
     "runsTray.runs": "Runs",
     "runsTray.agentRuns": "Agent runs",
     "runsTray.activeRun_one": "{{count}} active run",
@@ -497,6 +557,12 @@ function fallbackMessage(key, options) {
         ? interpolateFallbackMessage(template, options)
         : humanizeFallbackKey(key);
 }
+function preserveTranslatedUserValues(translated, options) {
+    const defaultValue = options?.defaultValue;
+    return typeof defaultValue === "string" && translated === defaultValue
+        ? interpolateFallbackMessage(defaultValue, options)
+        : translated;
+}
 export function useT() {
     const { i18n, t } = useTranslation();
     const context = useContext(LocaleContext);
@@ -504,11 +570,11 @@ export function useT() {
     return useCallback((key, options) => {
         const translated = t(key, options);
         if (translated !== key)
-            return translated;
+            return preserveTranslatedUserValues(translated, options);
         const getFixedT = i18n.getFixedT;
         const sourceFallback = getFixedT?.(sourceLocale)(key, options);
         if (sourceFallback && sourceFallback !== key)
-            return sourceFallback;
+            return preserveTranslatedUserValues(sourceFallback, options);
         return fallbackMessage(key, options);
     }, [i18n, sourceLocale, t]);
 }

package/dist/client/markdown/InlineMarkdown.d.ts

@@ -0,0 +1,23 @@
+import type { ReactNode } from "react";
+export interface InlineMarkdownProps {
+    content: string;
+    className?: string;
+    linkClassName?: string;
+    codeClassName?: string;
+    inline?: boolean;
+    protectedSpans?: readonly InlineMarkdownProtectedSpan[];
+    renderProtectedSpan?: (span: InlineMarkdownProtectedSpan, children: ReactNode) => ReactNode;
+}
+export interface InlineMarkdownProtectedSpan {
+    source: string;
+    label: string;
+    className?: string;
+    title?: string;
+}
+/**
+ * Render user-authored Markdown for compact text surfaces.
+ *
+ * This intentionally has no block-level Markdown elements: headings, lists,
+ * quotes, and raw HTML are either flattened to their text or omitted.
+ */
+export declare function InlineMarkdown({ content, className, linkClassName, codeClassName, inline, protectedSpans, renderProtectedSpan, }: InlineMarkdownProps): import("react").JSX.Element;

package/dist/client/markdown/InlineMarkdown.js

@@ -0,0 +1,65 @@
+import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
+import ReactMarkdown, { defaultUrlTransform, } from "react-markdown";
+import remarkGfm from "remark-gfm";
+import { cn } from "../utils.js";
+const INLINE_MARKDOWN_ELEMENTS = [
+    "a",
+    "br",
+    "code",
+    "del",
+    "em",
+    "p",
+    "s",
+    "strong",
+];
+/**
+ * Render user-authored Markdown for compact text surfaces.
+ *
+ * This intentionally has no block-level Markdown elements: headings, lists,
+ * quotes, and raw HTML are either flattened to their text or omitted.
+ */
+export function InlineMarkdown({ content, className, linkClassName, codeClassName, inline = false, protectedSpans = [], renderProtectedSpan, }) {
+    const protectedSpanByHref = new Map(protectedSpans
+        .map((span, index) => [`${PROTECTED_SPAN_PREFIX}${index}`, span])
+        .filter(([, span]) => span.source.length > 0));
+    const renderedContent = protectInlineMarkdownSpans(content, protectedSpans);
+    const components = {
+        a: ({ children, href }) => {
+            const protectedSpan = href ? protectedSpanByHref.get(href) : undefined;
+            if (protectedSpan) {
+                return renderProtectedSpan ? (renderProtectedSpan(protectedSpan, children)) : (_jsx("span", { className: protectedSpan.className, title: protectedSpan.title, children: children }));
+            }
+            const safeHref = href
+                ? defaultUrlTransform(normalizeInlineMarkdownHref(href))
+                : "";
+            if (!safeHref)
+                return _jsx(_Fragment, { children: children });
+            return (_jsx("a", { href: safeHref, target: "_blank", rel: "noopener noreferrer", className: cn("text-primary underline-offset-2 hover:underline", linkClassName), children: children }));
+        },
+        code: ({ children, className: syntaxClassName }) => (_jsx("code", { className: cn("rounded bg-muted px-1 py-0.5 font-mono text-[0.9em]", syntaxClassName, codeClassName), children: children })),
+        p: ({ children }) => inline ? _jsx("span", { children: children }) : _jsx("p", { className: "m-0", children: children }),
+    };
+    const Root = inline ? "span" : "div";
+    return (_jsx(Root, { className: cn("whitespace-pre-wrap break-words", className), children: _jsx(ReactMarkdown, { allowedElements: INLINE_MARKDOWN_ELEMENTS, components: components, remarkPlugins: [remarkGfm], skipHtml: true, unwrapDisallowed: true, children: renderedContent }) }));
+}
+const PROTECTED_SPAN_PREFIX = "https://inline-markdown-protected.invalid/span/";
+function protectInlineMarkdownSpans(content, spans) {
+    return [...spans]
+        .map((span, index) => ({ span, index }))
+        .filter(({ span }) => span.source.length > 0)
+        .sort((a, b) => b.span.source.length - a.span.source.length)
+        .reduce((markdown, { span, index }) => markdown
+        .split(span.source)
+        .join(`[${escapeProtectedSpanLabel(span.label)}](${PROTECTED_SPAN_PREFIX}${index})`), content);
+}
+function escapeProtectedSpanLabel(label) {
+    return label.replace(/[\\[\]]/g, "\\$&");
+}
+function normalizeInlineMarkdownHref(href) {
+    if (/^www\./i.test(href))
+        return `https://${href}`;
+    if (/^http:\/\/www\./i.test(href)) {
+        return `https://${href.slice("http://".length)}`;
+    }
+    return href;
+}

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

@@ -0,0 +1 @@
+export { InlineMarkdown, type InlineMarkdownProtectedSpan, type InlineMarkdownProps, } from "./InlineMarkdown.js";

package/dist/client/markdown/index.js

@@ -0,0 +1 @@
+export { InlineMarkdown, } from "./InlineMarkdown.js";

package/dist/client/observability/ThumbsFeedback.js

@@ -3,14 +3,16 @@ import * as PopoverPrimitive from "@radix-ui/react-popover";
 import { IconThumbUp, IconThumbDown } from "@tabler/icons-react";
 import { useState, useCallback } from "react";
 import { agentNativePath } from "../api-path.js";
+import { useT } from "../i18n.js";
 import { cn } from "../utils.js";
 const THUMBS_DOWN_CATEGORIES = [
-    "Inaccurate",
-    "Not helpful",
-    "Wrong tool",
-    "Too slow",
+    { value: "Inaccurate", key: "agentChat.feedback.inaccurate" },
+    { value: "Not helpful", key: "agentChat.feedback.notHelpful" },
+    { value: "Wrong tool", key: "agentChat.feedback.wrongTool" },
+    { value: "Too slow", key: "agentChat.feedback.tooSlow" },
 ];
 export function ThumbsFeedback({ threadId, runId, messageSeq, className, }) {
+    const t = useT();
     const [selection, setSelection] = useState(null);
     const [categoryOpen, setCategoryOpen] = useState(false);
     const [submittedCategory, setSubmittedCategory] = useState(null);
@@ -54,11 +56,11 @@ export function ThumbsFeedback({ threadId, runId, messageSeq, className, }) {
         setCategoryOpen(false);
         sendFeedback("category", category);
     }, [sendFeedback]);
-    return (_jsxs("div", { className: cn("inline-flex items-center gap-0.5", className), children: [_jsx("button", { type: "button", "aria-label": "Thumbs up", onClick: handleThumbsUp, className: cn("flex h-6 w-6 items-center justify-center rounded", selection === "up"
+    return (_jsxs("div", { className: cn("inline-flex items-center gap-0.5", className), children: [_jsx("button", { type: "button", "aria-label": t("agentChat.feedback.thumbsUp"), onClick: handleThumbsUp, className: cn("flex h-6 w-6 items-center justify-center rounded", selection === "up"
                     ? "text-foreground"
-                    : "text-muted-foreground/70 hover:text-muted-foreground hover:bg-accent/50"), children: _jsx(IconThumbUp, { size: 16, stroke: selection === "up" ? 2.5 : 1.5, fill: selection === "up" ? "currentColor" : "none" }) }), _jsxs(PopoverPrimitive.Root, { open: categoryOpen, onOpenChange: setCategoryOpen, children: [_jsx(PopoverPrimitive.Trigger, { asChild: true, children: _jsx("button", { type: "button", "aria-label": "Thumbs down", onClick: handleThumbsDown, className: cn("flex h-6 w-6 items-center justify-center rounded", selection === "down"
+                    : "text-muted-foreground/70 hover:text-muted-foreground hover:bg-accent/50"), children: _jsx(IconThumbUp, { size: 16, stroke: selection === "up" ? 2.5 : 1.5, fill: selection === "up" ? "currentColor" : "none" }) }), _jsxs(PopoverPrimitive.Root, { open: categoryOpen, onOpenChange: setCategoryOpen, children: [_jsx(PopoverPrimitive.Trigger, { asChild: true, children: _jsx("button", { type: "button", "aria-label": t("agentChat.feedback.thumbsDown"), onClick: handleThumbsDown, className: cn("flex h-6 w-6 items-center justify-center rounded", selection === "down"
                                 ? "text-foreground"
-                                : "text-muted-foreground/70 hover:text-muted-foreground hover:bg-accent/50"), children: _jsx(IconThumbDown, { size: 16, stroke: selection === "down" ? 2.5 : 1.5, fill: selection === "down" ? "currentColor" : "none" }) }) }), _jsx(PopoverPrimitive.Portal, { children: _jsx(PopoverPrimitive.Content, { side: "bottom", align: "start", sideOffset: 4, collisionPadding: 8, className: "z-[300] overflow-hidden rounded-lg border border-border bg-popover p-1 shadow-lg outline-none", children: _jsx("div", { className: "flex flex-col gap-0.5", children: THUMBS_DOWN_CATEGORIES.map((category) => (_jsx("button", { type: "button", onClick: () => handleCategory(category), className: cn("rounded-md px-3 py-1.5 text-left text-xs", submittedCategory === category
+                                : "text-muted-foreground/70 hover:text-muted-foreground hover:bg-accent/50"), children: _jsx(IconThumbDown, { size: 16, stroke: selection === "down" ? 2.5 : 1.5, fill: selection === "down" ? "currentColor" : "none" }) }) }), _jsx(PopoverPrimitive.Portal, { children: _jsx(PopoverPrimitive.Content, { side: "bottom", align: "start", sideOffset: 4, collisionPadding: 8, className: "z-[300] overflow-hidden rounded-lg border border-border bg-popover p-1 shadow-lg outline-none", children: _jsx("div", { className: "flex flex-col gap-0.5", children: THUMBS_DOWN_CATEGORIES.map((category) => (_jsx("button", { type: "button", onClick: () => handleCategory(category.value), className: cn("rounded-md px-3 py-1.5 text-start text-xs", submittedCategory === category.value
                                         ? "bg-accent text-foreground font-medium"
-                                        : "text-muted-foreground hover:bg-accent/50 hover:text-foreground"), children: category }, category))) }) }) })] })] }));
+                                        : "text-muted-foreground hover:bg-accent/50 hover:text-foreground"), children: t(category.key) }, category.value))) }) }) })] })] }));
 }