diff --git a/design-system/packages/ui/README.md b/design-system/packages/ui/README.md
index fbf2c26448..e365049467 100644
--- a/design-system/packages/ui/README.md
+++ b/design-system/packages/ui/README.md
@@ -889,3 +889,12 @@ The outer animated surface owns both paint and backdrop blur; its content is
 transparent and unfiltered. An opaque fallback covers unsupported filters and
 reduced-transparency preferences. Tooltip declares ownership of its entrance
 motion to avoid the product's additional popup animation.
+
+### Layout-owned field labels
+
+`FieldAccessibilityProvider` accepts `aria-labelledby` and `aria-describedby`
+references for layouts that render labels outside their controls. Input, Switch,
+Checkbox, Select, Combobox, MultiSelect, NumberInput, SearchField and Textarea
+consume those references through intervening wrappers. A control's explicit name
+or own label takes precedence; descriptions are combined. Give each child in a
+composite field its own name. Nested `Field` controls retain their own labels.
diff --git a/design-system/packages/ui/src/components/Checkbox/Checkbox.tsx b/design-system/packages/ui/src/components/Checkbox/Checkbox.tsx
index 8abf641203..615a16ad50 100644
--- a/design-system/packages/ui/src/components/Checkbox/Checkbox.tsx
+++ b/design-system/packages/ui/src/components/Checkbox/Checkbox.tsx
@@ -1,3 +1,4 @@
+import { useFieldAccessibility } from "../Field/FieldAccessibility";
 import { Check as LucideCheck, Minus as LucideMinus } from 'lucide-react';
 import {
   forwardRef,
@@ -44,6 +45,7 @@ export const Checkbox = forwardRef<HTMLInputElement, CheckboxProps>(function Che
   size = "md",
   ...props
 }, forwardedRef) {
+  const fieldAccessibility = useFieldAccessibility(props, label !== undefined || children !== undefined);
   const inputRef = useRef<HTMLInputElement>(null);
   useImperativeHandle(forwardedRef, () => inputRef.current as HTMLInputElement);
 
@@ -67,6 +69,7 @@ export const Checkbox = forwardRef<HTMLInputElement, CheckboxProps>(function Che
       <span className={styles.control} data-openbitfun-part="control">
         <input
           {...props}
+          {...fieldAccessibility}
           aria-invalid={invalid || undefined}
           checked={checked}
           className={styles.input}
diff --git a/design-system/packages/ui/src/components/Combobox/Combobox.tsx b/design-system/packages/ui/src/components/Combobox/Combobox.tsx
index 5f65da32ea..cfcbc7f1e4 100644
--- a/design-system/packages/ui/src/components/Combobox/Combobox.tsx
+++ b/design-system/packages/ui/src/components/Combobox/Combobox.tsx
@@ -1,3 +1,4 @@
+import { useFieldAccessibility } from "../Field/FieldAccessibility";
 import {
   forwardRef,
   useCallback,
@@ -501,13 +502,14 @@ const CollectionPicker = forwardRef<HTMLDivElement, PickerProps>(function Collec
   const activeDescendant = resolvedOpen && activeIndex >= 0
     ? optionId(activeIndex)
     : undefined;
+  const fieldAccessibility = useFieldAccessibility({ ...props, "aria-describedby": ariaDescribedBy }, Boolean(label));
   const resolvedTriggerLabel = ariaLabel
-    ?? (label || providedId || typeof placeholder !== "string" ? undefined : placeholder);
+    ?? (label || fieldAccessibility["aria-labelledby"] || providedId || typeof placeholder !== "string" ? undefined : placeholder);
   const resolvedLabelledBy = ariaLabel
     ? ariaLabelledBy
-    : ariaLabelledBy ?? (label ? labelId : undefined);
+    : ariaLabelledBy ?? (label ? labelId : fieldAccessibility["aria-labelledby"]);
   const resolvedDescribedBy = [
-    ariaDescribedBy,
+    fieldAccessibility["aria-describedby"],
     errorMessage ? errorId : undefined,
   ].filter(Boolean).join(" ") || undefined;
 
diff --git a/design-system/packages/ui/src/components/Field/Field.tsx b/design-system/packages/ui/src/components/Field/Field.tsx
index e6b40b3ef0..97c737f51e 100644
--- a/design-system/packages/ui/src/components/Field/Field.tsx
+++ b/design-system/packages/ui/src/components/Field/Field.tsx
@@ -1,3 +1,4 @@
+import { FieldAccessibilityProvider } from "./FieldAccessibility";
 import {
   cloneElement,
   forwardRef,
@@ -112,7 +113,7 @@ export const Field = forwardRef<HTMLDivElement, FieldProps>(function Field({
             {controlLeading}
           </span>
         )}
-        {control}
+        <FieldAccessibilityProvider>{control}</FieldAccessibilityProvider>
         {controlTrailing !== undefined && controlTrailing !== null && (
           <span className={styles.controlAdornment} data-openbitfun-part="control-trailing">
             {controlTrailing}
diff --git a/design-system/packages/ui/src/components/Field/FieldAccessibility.tsx b/design-system/packages/ui/src/components/Field/FieldAccessibility.tsx
new file mode 100644
index 0000000000..344e50fb27
--- /dev/null
+++ b/design-system/packages/ui/src/components/Field/FieldAccessibility.tsx
@@ -0,0 +1,23 @@
+import { createContext, useContext, type AriaAttributes, type ReactNode } from "react";
+
+type FieldAccessibility = Pick<AriaAttributes, "aria-labelledby" | "aria-describedby">;
+const FieldAccessibilityContext = createContext<FieldAccessibility>({});
+
+/** Associates a layout-owned label with controls, including controls inside wrappers.
+ * Composite fields should give each child its own accessible name.
+ */
+export function FieldAccessibilityProvider({ children, ...value }: FieldAccessibility & { children: ReactNode }) {
+  return <FieldAccessibilityContext.Provider value={value}>{children}</FieldAccessibilityContext.Provider>;
+}
+
+export function useFieldAccessibility(props: AriaAttributes, hasOwnLabel = false): FieldAccessibility {
+  const inherited = useContext(FieldAccessibilityContext);
+  return {
+    "aria-labelledby": props["aria-labelledby"] ?? (
+      props["aria-label"] || hasOwnLabel ? undefined : inherited["aria-labelledby"]
+    ),
+    "aria-describedby": [...new Set([
+      props["aria-describedby"], inherited["aria-describedby"],
+    ].filter(Boolean).flatMap(value => value!.split(/\s+/)))].join(" ") || undefined,
+  };
+}
diff --git a/design-system/packages/ui/src/components/Input/Input.tsx b/design-system/packages/ui/src/components/Input/Input.tsx
index 772961a6a8..2602a686ca 100644
--- a/design-system/packages/ui/src/components/Input/Input.tsx
+++ b/design-system/packages/ui/src/components/Input/Input.tsx
@@ -1,3 +1,4 @@
+import { useFieldAccessibility } from "../Field/FieldAccessibility";
 import {
   forwardRef,
   useRef,
@@ -41,6 +42,7 @@ export const Input = forwardRef<HTMLInputElement, InputProps>(function Input({
   type = "text",
   ...props
 }, ref) {
+  const fieldAccessibility = useFieldAccessibility(props);
   const compositionActiveRef = useRef(false);
   const fieldSurface = useFieldSurface();
   const handleChange: ChangeEventHandler<HTMLInputElement> = (event) => {
@@ -67,6 +69,7 @@ export const Input = forwardRef<HTMLInputElement, InputProps>(function Input({
       )}
       <input
         {...props}
+        {...fieldAccessibility}
         aria-invalid={resolvedAriaInvalid}
         className={styles.input}
         data-hide-native-password-reveal={hideNativePasswordReveal ? "true" : undefined}
diff --git a/design-system/packages/ui/src/components/NumberInput/NumberInput.tsx b/design-system/packages/ui/src/components/NumberInput/NumberInput.tsx
index 1d7c2f3afa..bca6aca863 100644
--- a/design-system/packages/ui/src/components/NumberInput/NumberInput.tsx
+++ b/design-system/packages/ui/src/components/NumberInput/NumberInput.tsx
@@ -1,3 +1,4 @@
+import { useFieldAccessibility } from "../Field/FieldAccessibility";
 import {
   forwardRef,
   useCallback,
@@ -67,6 +68,11 @@ export const NumberInput = forwardRef<HTMLInputElement, NumberInputProps>(functi
   "aria-invalid": ariaInvalid,
 }, ref) {
   const fieldSurface = useFieldSurface();
+  const fieldAccessibility = useFieldAccessibility({
+    "aria-label": ariaLabel,
+    "aria-labelledby": ariaLabelledBy,
+    "aria-describedby": ariaDescribedBy,
+  }, Boolean(label));
   const format = useCallback((next: number) => precision > 0 ? next.toFixed(precision) : String(Math.round(next)), [precision]);
   const clamp = useCallback((next: number) => Math.min(max, Math.max(min, next)), [max, min]);
   const [draft, setDraft] = useState(() => format(value));
@@ -106,8 +112,8 @@ export const NumberInput = forwardRef<HTMLInputElement, NumberInputProps>(functi
         <input
           id={id}
           required={required}
-          aria-labelledby={ariaLabelledBy}
-          aria-describedby={ariaDescribedBy}
+          aria-labelledby={fieldAccessibility["aria-labelledby"]}
+          aria-describedby={fieldAccessibility["aria-describedby"]}
           aria-invalid={ariaInvalid}
           aria-label={ariaLabel ?? label}
           className={styles.input}
diff --git a/design-system/packages/ui/src/components/Select/Select.tsx b/design-system/packages/ui/src/components/Select/Select.tsx
index 6d4134584e..980c66ef62 100644
--- a/design-system/packages/ui/src/components/Select/Select.tsx
+++ b/design-system/packages/ui/src/components/Select/Select.tsx
@@ -1,3 +1,4 @@
+import { useFieldAccessibility } from "../Field/FieldAccessibility";
 import {
   forwardRef,
   useCallback,
@@ -159,6 +160,11 @@ export const Select = forwardRef<HTMLSelectElement, SelectProps>(function Select
 }, forwardedRef) {
   const designSystem = useDesignSystem();
   const fieldSurface = useFieldSurface();
+  const fieldAccessibility = useFieldAccessibility({
+    "aria-label": ariaLabel,
+    "aria-labelledby": ariaLabelledBy,
+    "aria-describedby": ariaDescribedBy,
+  });
   const generatedId = useId();
   const id = providedId ?? `openbitfun-select-${generatedId}`;
   const listboxId = `${id}-listbox`;
@@ -390,12 +396,12 @@ export const Select = forwardRef<HTMLSelectElement, SelectProps>(function Select
       <button
         data-overflow-trigger
         aria-controls={listboxId}
-        aria-describedby={ariaDescribedBy}
+        aria-describedby={fieldAccessibility["aria-describedby"]}
         aria-expanded="true"
         aria-haspopup="listbox"
         aria-invalid={invalid ? true : ariaInvalid}
         aria-label={ariaLabel}
-        aria-labelledby={ariaLabelledBy}
+        aria-labelledby={fieldAccessibility["aria-labelledby"]}
         aria-required={required || ariaRequired || undefined}
         className={classNames(styles.trigger, styles.popoverHeader)}
         data-openbitfun-part="header"
@@ -413,7 +419,7 @@ export const Select = forwardRef<HTMLSelectElement, SelectProps>(function Select
       <div className={styles.options} data-openbitfun-part="options">
         <Listbox
           aria-label={ariaLabel}
-          aria-labelledby={ariaLabel ? undefined : ariaLabelledBy ?? id}
+          aria-labelledby={ariaLabel ? undefined : fieldAccessibility["aria-labelledby"] ?? id}
           autoFocusOption
           className={styles.listbox}
           id={listboxId}
@@ -452,11 +458,11 @@ export const Select = forwardRef<HTMLSelectElement, SelectProps>(function Select
     >
       <select
         {...nativeProps}
-        aria-describedby={ariaDescribedBy}
+        aria-describedby={fieldAccessibility["aria-describedby"]}
         aria-hidden="true"
         aria-invalid={invalid ? true : ariaInvalid}
         aria-label={ariaLabel}
-        aria-labelledby={ariaLabelledBy}
+        aria-labelledby={fieldAccessibility["aria-labelledby"]}
         aria-required={required || ariaRequired || undefined}
         className={styles.native}
         disabled={disabled}
@@ -479,13 +485,13 @@ export const Select = forwardRef<HTMLSelectElement, SelectProps>(function Select
       </select>
       <button data-overflow-trigger
         aria-controls={resolvedOpen ? undefined : listboxId}
-        aria-describedby={ariaDescribedBy}
+        aria-describedby={fieldAccessibility["aria-describedby"]}
         aria-expanded={resolvedOpen ? undefined : false}
         aria-hidden={resolvedOpen || undefined}
         aria-haspopup="listbox"
         aria-invalid={invalid ? true : ariaInvalid}
         aria-label={ariaLabel}
-        aria-labelledby={ariaLabelledBy}
+        aria-labelledby={fieldAccessibility["aria-labelledby"]}
         aria-required={required || ariaRequired || undefined}
         autoFocus={!resolvedOpen && autoFocus}
         className={styles.trigger}
diff --git a/design-system/packages/ui/src/components/Switch/Switch.tsx b/design-system/packages/ui/src/components/Switch/Switch.tsx
index e20a36251e..7ee628918d 100644
--- a/design-system/packages/ui/src/components/Switch/Switch.tsx
+++ b/design-system/packages/ui/src/components/Switch/Switch.tsx
@@ -1,3 +1,4 @@
+import { useFieldAccessibility } from "../Field/FieldAccessibility";
 import {
   forwardRef,
   type ChangeEventHandler,
@@ -17,6 +18,7 @@ export const Switch = forwardRef<HTMLInputElement, SwitchProps>(function Switch(
   onCheckedChange,
   ...props
 }, ref) {
+  const fieldAccessibility = useFieldAccessibility(props);
   const handleChange: ChangeEventHandler<HTMLInputElement> = (event) => {
     onChange?.(event);
     onCheckedChange?.(event.currentTarget.checked);
@@ -29,6 +31,7 @@ export const Switch = forwardRef<HTMLInputElement, SwitchProps>(function Switch(
     >
       <input
         {...props}
+        {...fieldAccessibility}
         className={styles.input}
         onChange={handleChange}
         ref={ref}
diff --git a/design-system/packages/ui/src/components/Textarea/Textarea.tsx b/design-system/packages/ui/src/components/Textarea/Textarea.tsx
index bf94d1aaeb..1ad47a407a 100644
--- a/design-system/packages/ui/src/components/Textarea/Textarea.tsx
+++ b/design-system/packages/ui/src/components/Textarea/Textarea.tsx
@@ -1,3 +1,4 @@
+import { useFieldAccessibility } from "../Field/FieldAccessibility";
 import {
   forwardRef,
   useCallback,
@@ -68,6 +69,11 @@ export const Textarea = forwardRef<HTMLTextAreaElement, TextareaProps>(function
   const resolvedInvalid = invalid || (ariaInvalid !== undefined && ariaInvalid !== false && ariaInvalid !== "false");
   const hasSupport = Boolean((resolvedInvalid && errorMessage) || (!resolvedInvalid && hint) || showCount);
 
+  const fieldAccessibility = useFieldAccessibility({
+    ...props,
+    "aria-describedby": [ariaDescribedBy, hasSupport ? supportId : undefined].filter(Boolean).join(" "),
+  }, Boolean(label));
+
   const resizeToContent = useCallback((node: HTMLTextAreaElement) => {
     if (!autoResize) return;
     node.style.height = "auto";
@@ -111,7 +117,7 @@ export const Textarea = forwardRef<HTMLTextAreaElement, TextareaProps>(function
       )}
       <textarea
         {...props}
-        aria-describedby={hasSupport ? supportId : ariaDescribedBy}
+        {...fieldAccessibility}
         aria-invalid={resolvedInvalid || undefined}
         className={styles.textarea}
         data-openbitfun-part="input"
diff --git a/design-system/packages/ui/src/flow-chat/conversation/ToolDuration.tsx b/design-system/packages/ui/src/flow-chat/conversation/ToolDuration.tsx
index acb6a70393..4038bbda0e 100644
--- a/design-system/packages/ui/src/flow-chat/conversation/ToolDuration.tsx
+++ b/design-system/packages/ui/src/flow-chat/conversation/ToolDuration.tsx
@@ -39,20 +39,22 @@ export interface ToolDurationProps {
   showCompletedDuration?: boolean;
   completedStatus?: 'success' | 'error' | 'cancelled';
   completionLabel?: string;
+  /** Host-owned localization. Omit to retain the default compact format. */
+  formatDuration?: (milliseconds: number, precision: 'live' | 'precise') => string;
   children?: ReactNode;
 }
 
 /** Controlled duration anatomy. Clock, timeout mutations and overlays belong to the host. */
 export function ToolDuration({
   isRunning, showIcon = true, elapsedMs = 0, remainingMs, timeoutMs, timeoutDisabled = false, open = false,
-  completedDurationMs, showCompletedDuration = true, completedStatus, completionLabel, children,
+  completedDurationMs, showCompletedDuration = true, completedStatus, completionLabel, children, formatDuration,
 }: ToolDurationProps) {
   if (!isRunning) {
     if (completedDurationMs == null || !showCompletedDuration) return null;
     return <span data-openbitfun-component="tool-timeout-indicator" data-openbitfun-part="root" data-openbitfun-mode="completed"
       className={`duration-text duration-text--completed${completedStatus ? ` duration-text--completed-${completedStatus}` : ''}`}
       title={completionLabel} aria-label={completionLabel}>
-      <span data-openbitfun-component="tool-timeout-indicator" data-openbitfun-part="duration">{formatDurationPrecise(completedDurationMs)}</span>
+      <span data-openbitfun-component="tool-timeout-indicator" data-openbitfun-part="duration">{formatDuration?.(completedDurationMs, 'precise') ?? formatDurationPrecise(completedDurationMs)}</span>
     </span>;
   }
   const hasTimeout = Boolean(timeoutMs && timeoutMs > 0);
@@ -62,13 +64,13 @@ export function ToolDuration({
     data-openbitfun-state={[isWarning && 'warning', timeoutDisabled && 'disabled', open && 'open'].filter(Boolean).join(' ')} className="tool-timeout-indicator">
     <span data-openbitfun-component="tool-timeout-indicator" data-openbitfun-part="duration" className={`duration-text duration-text--live ${isWarning ? 'duration-text--warning' : ''}`}>
       {showIcon && <Icon glyph={Timer} size="sm" />}
-      <span data-openbitfun-component="tool-timeout-indicator" data-openbitfun-part="elapsed" className="duration-elapsed">{formatDurationLive(elapsedMs)}</span>
+      <span data-openbitfun-component="tool-timeout-indicator" data-openbitfun-part="elapsed" className="duration-elapsed">{formatDuration?.(elapsedMs, 'live') ?? formatDurationLive(elapsedMs)}</span>
       {hasTimeout && <>
         <span className="duration-separator">/</span>
         <span data-openbitfun-component="tool-timeout-indicator" data-openbitfun-part="timeout"
           className={`duration-timeout ${timeoutDisabled ? 'duration-timeout--disabled' : ''} ${isWarning ? 'duration-timeout--warning' : ''}`}>
           {timeoutDisabled ? <Icon glyph={InfinityIcon} size="sm" className="duration-timeout--infinity" />
-            : formatDurationLive(displayRemaining ?? timeoutMs!)}
+            : (formatDuration?.(displayRemaining ?? timeoutMs!, 'live') ?? formatDurationLive(displayRemaining ?? timeoutMs!))}
         </span>
       </>}
     </span>
diff --git a/design-system/packages/ui/src/index.ts b/design-system/packages/ui/src/index.ts
index 148e5e71b0..1c794e9afb 100644
--- a/design-system/packages/ui/src/index.ts
+++ b/design-system/packages/ui/src/index.ts
@@ -308,3 +308,5 @@ export {
 export { LayersPlusIcon } from "./components/Icon";
 export { SplitView, SplitViewPrimaryDock, SplitViewSurface } from './components/SplitView';
 export type { SplitViewProps, SplitViewMode, SplitViewHeaderGeometry } from './components/SplitView';
+
+export { FieldAccessibilityProvider } from "./components/Field/FieldAccessibility";
diff --git a/docs/architecture/i18n.md b/docs/architecture/i18n.md
index 570859c7e7..a237b0ef38 100644
--- a/docs/architecture/i18n.md
+++ b/docs/architecture/i18n.md
@@ -189,3 +189,5 @@ store canonical ids.
 5. Run focused checks for touched runtime code.
 6. If a surface intentionally does not support the locale, document that
    decision in the contract-facing PR description.
+
+Duration presentation uses `src/shared/i18n/formatDuration.ts` with each surface's number formatter. The policy carries rounded seconds into minutes and hours, while live timers truncate elapsed seconds. Web tools, model rounds and usage reports use the Web UI formatting wrapper; mobile uses its own i18n provider without importing Web UI catalogs. Protocol durations remain milliseconds.
diff --git a/scripts/i18n-dynamic-key-allowlist.json b/scripts/i18n-dynamic-key-allowlist.json
index 5702f0c196..ee243d86d5 100644
--- a/scripts/i18n-dynamic-key-allowlist.json
+++ b/scripts/i18n-dynamic-key-allowlist.json
@@ -12,7 +12,9 @@
         "resolveSubagentNameKey",
         "subagentIdentity.names.bouncyBean"
       ],
-      "keyPrefixes": ["subagentIdentity.names."]
+      "keyPrefixes": [
+        "subagentIdentity.names."
+      ]
     },
     {
       "id": "installer-install-path-errors",
@@ -190,6 +192,24 @@
         "filters.",
         "categories."
       ]
+    },
+    {
+      "id": "web-global-search-capability-labels",
+      "surface": "web-ui",
+      "namespace": "scenes/capabilities",
+      "owner": "src/web-ui/src/app/global-search/providers/interactiveCapabilitySearchProvider.ts",
+      "description": "Search display labels follow the UI locale. Catalog and item coverage is verified in interactiveCapabilitySearchProvider.test.ts; bilingual catalog text remains search aliases only.",
+      "sourceReferences": [
+        "search.capabilities.${capability.id}.title",
+        "search.capabilities.${capability.id}.items.${item.id}",
+        "search.categories.${capability.categoryId}",
+        "search.kinds.${capability.kind}"
+      ],
+      "keyPrefixes": [
+        "search.capabilities.",
+        "search.categories.",
+        "search.kinds."
+      ]
     }
   ]
 }
diff --git a/src/mobile-web/src/components/ChatTranscript.tsx b/src/mobile-web/src/components/ChatTranscript.tsx
index 2baa0fc1c3..fdeab84a40 100644
--- a/src/mobile-web/src/components/ChatTranscript.tsx
+++ b/src/mobile-web/src/components/ChatTranscript.tsx
@@ -24,11 +24,6 @@ import ChatToolApprovalActions, { isToolAwaitingApproval } from './ChatToolAppro
 
 type ToolApprovalHandler = (toolId: string, updatedInput?: Record<string, unknown>) => Promise<void>;
 
-function formatDuration(ms: number): string {
-  if (ms < 1000) return `${Math.round(ms)}ms`;
-  return `${(ms / 1000).toFixed(1)}s`;
-}
-
 function getEnglishPluralSuffix(language: string, count: number): string {
   return language === 'en-US' && count !== 1 ? 's' : '';
 }
@@ -250,7 +245,7 @@ export const TaskToolCard: React.FC<{
   onApproveTool?: ToolApprovalHandler;
   onRejectTool?: ToolApprovalHandler;
 }> = ({ tool, now, subItems = [], onCancelTool, onApproveTool, onRejectTool }) => {
-  const { t, language } = useI18n();
+  const { t, language, formatDuration } = useI18n();
   const scrollRef = useRef<HTMLDivElement>(null);
   const [stepsExpanded, setStepsExpanded] = useState(false);
   const isRunning = tool.status === 'running';
@@ -449,7 +444,7 @@ const ToolCard: React.FC<{
   onApproveTool?: ToolApprovalHandler;
   onRejectTool?: ToolApprovalHandler;
 }> = ({ tool, now, onCancelTool, onApproveTool, onRejectTool }) => {
-  const { t } = useI18n();
+  const { t, formatDuration } = useI18n();
   const toolKey = tool.name.toLowerCase().replace(/[\s-]/g, '_');
   const typeLabelKey = TOOL_TYPE_MAP[toolKey] || TOOL_TYPE_MAP[tool.name];
   const typeLabel = typeLabelKey ? t(typeLabelKey) : '';
diff --git a/src/mobile-web/src/i18n/I18nProvider.tsx b/src/mobile-web/src/i18n/I18nProvider.tsx
index 5aff6c0728..6547063afb 100644
--- a/src/mobile-web/src/i18n/I18nProvider.tsx
+++ b/src/mobile-web/src/i18n/I18nProvider.tsx
@@ -1,3 +1,4 @@
+import { formatDuration as formatLocalizedDuration, type DurationPrecision } from '../../../shared/i18n/formatDuration';
 import React, { createContext, useCallback, useLayoutEffect, useMemo, useState } from 'react';
 import { DEFAULT_LANGUAGE, messages, type MobileLanguage } from './messages';
 import {
@@ -18,6 +19,7 @@ interface I18nContextValue {
   t: (key: string, params?: TranslateParams) => string;
   formatDate: (date: Date | number, options?: Intl.DateTimeFormatOptions) => string;
   formatRelativeTime: (date: Date | number) => string;
+  formatDuration: (milliseconds: number, precision?: DurationPrecision) => string;
 }
 
 const STORAGE_KEY = 'openbitfun-mobile-language';
@@ -101,6 +103,7 @@ export const I18nContext = createContext<I18nContextValue>({
   t: (key) => key,
   formatDate: (date, options) => new Intl.DateTimeFormat(DEFAULT_LANGUAGE, options).format(date),
   formatRelativeTime: (date) => formatRelativeTime(DEFAULT_LANGUAGE, date),
+  formatDuration: (ms, precision) => formatLocalizedDuration(ms, (value, options) => new Intl.NumberFormat(DEFAULT_LANGUAGE, options).format(value), precision),
 });
 
 function formatRelativeTime(language: MobileLanguage, date: Date | number): string {
@@ -143,6 +146,7 @@ export const I18nProvider: React.FC<{ children: React.ReactNode }> = ({ children
     t: (key, params) => translate(language, key, params),
     formatDate: (date, options) => new Intl.DateTimeFormat(language, options).format(date),
     formatRelativeTime: (date) => formatRelativeTime(language, date),
+    formatDuration: (ms, precision) => formatLocalizedDuration(ms, (value, options) => new Intl.NumberFormat(language, options).format(value), precision),
   }), [language, setLanguage, toggleLanguage]);
 
   return (
diff --git a/src/shared/i18n/formatDuration.ts b/src/shared/i18n/formatDuration.ts
new file mode 100644
index 0000000000..c76d84aeaa
--- /dev/null
+++ b/src/shared/i18n/formatDuration.ts
@@ -0,0 +1,29 @@
+/** Locale-neutral duration policy; each surface supplies its own number formatter. */
+export type DurationPrecision = 'live' | 'precise';
+export type DurationNumberFormatter = (value: number, options?: Intl.NumberFormatOptions) => string;
+
+export function formatDuration(
+  milliseconds: number,
+  formatNumber: DurationNumberFormatter,
+  precision: DurationPrecision = 'precise',
+): string {
+  const safeMs = Number.isFinite(milliseconds) ? Math.max(0, milliseconds) : 0;
+  const unit = (value: number, name: string, decimals = 0) => formatNumber(value, {
+    style: 'unit', unit: name, unitDisplay: 'short', maximumFractionDigits: decimals,
+  });
+  if (safeMs < 1000) return unit(Math.round(safeMs), 'millisecond');
+  const seconds = precision === 'live' ? Math.floor(safeMs / 1000) : Math.round(safeMs / 100) / 10;
+  if (seconds < 60) return unit(seconds, 'second', precision === 'live' ? 0 : 1);
+  const wholeSeconds = precision === 'live' ? Math.floor(seconds) : Math.round(seconds);
+  const minutes = Math.floor(wholeSeconds / 60);
+  const remainingSeconds = wholeSeconds % 60;
+  if (minutes < 60) return [unit(minutes, 'minute'), remainingSeconds ? unit(remainingSeconds, 'second') : ''].filter(Boolean).join(' ');
+  const hours = Math.floor(minutes / 60);
+  const remainingMinutes = minutes % 60;
+  if (hours >= 24) {
+    const days = Math.floor(hours / 24);
+    const remainingHours = hours % 24;
+    return [unit(days, 'day'), remainingHours ? unit(remainingHours, 'hour') : ''].filter(Boolean).join(' ');
+  }
+  return [unit(hours, 'hour'), remainingMinutes ? unit(remainingMinutes, 'minute') : ''].filter(Boolean).join(' ');
+}
diff --git a/src/web-ui/AGENTS.md b/src/web-ui/AGENTS.md
index 82d7c12fbd..202b451859 100644
--- a/src/web-ui/AGENTS.md
+++ b/src/web-ui/AGENTS.md
@@ -220,3 +220,11 @@ establish visual or remote transport behavior):
 ```bash
 pnpm --dir src/web-ui run test:run src/shared/ui/OverlayStack.test.tsx src/shared/ui/OverlayOwnership.contract.test.ts src/shared/ui/Dialog.test.tsx src/shared/ui/MenuPopover.test.tsx src/infrastructure/appearance/runtime/AppearanceOverlayHost.test.ts src/shared/notification-system/components/NotificationContainer.test.tsx src/shared/context-menu-system/components/ui/ContextMenu.test.tsx
 ```
+
+For Markdown Mermaid rendering states and supported syntax:
+
+```bash
+pnpm --dir src/web-ui run test:run src/infrastructure/markdown/MermaidBlock.test.tsx src/tools/mermaid-editor/services/MermaidService.test.ts
+```
+
+The service tests use the real Mermaid parser; native SVG rendering still needs UI verification.
diff --git a/src/web-ui/src/app/components/NavPanel/MainNav.projectCreation.test.tsx b/src/web-ui/src/app/components/NavPanel/MainNav.projectCreation.test.tsx
index eec787102c..cb526dfbcb 100644
--- a/src/web-ui/src/app/components/NavPanel/MainNav.projectCreation.test.tsx
+++ b/src/web-ui/src/app/components/NavPanel/MainNav.projectCreation.test.tsx
@@ -25,6 +25,9 @@ vi.mock('@/shared/utils/logger', () => ({ createLogger: () => ({ error: vi.fn()
 vi.mock('@/infrastructure/peer-device/pickWorkspaceDirectory', () => ({ pickWorkspaceDirectory: state.pickDirectory }));
 vi.mock('@/infrastructure/api', () => ({ globalAPI: {}, workspaceAPI: {} }));
 vi.mock('@/app/services/createProject', () => ({ createProject: state.createProject }));
+vi.mock('@/features/ssh-remote/sshApi', () => ({
+  sshApi: { listWslDistributions: async () => ({ supported: true, distributions: [] }) },
+}));
 vi.mock('@/features/ssh-remote/useWorkspaceSourceOptions', () => ({
   workspacePresetHost: (preset?: { kind: string; connection?: unknown }) => preset?.kind === 'saved' ? preset.connection : undefined,
   useWorkspaceSourceOptions: (source: string) => ({ options: state.options[source] || [], loading: false, error: '', refresh: vi.fn() }),
@@ -138,6 +141,7 @@ describe('project creation entry points', () => {
       expect(document.querySelector('[data-testid="nav-session-group-add-project"]')).toBeNull();
     }
     expect(sourceOption(1, 'wsl')).not.toBeNull();
+    expect(sourceOption(1, 'wsl').disabled).toBe(false);
     setSource('wsl');
     await click('actions.add');
     expect(document.querySelector('[data-testid="connection-dialog"]')).toBeNull();
@@ -171,6 +175,7 @@ describe('project creation entry points', () => {
 
   it('opens new configuration from the header and preserves the chosen source when it is cancelled', async () => {
     await act(async () => window.dispatchEvent(new Event('nav:new-project')));
+    expect(sourceOption(1, 'wsl').disabled).toBe(false);
     setSource('wsl');
     await act(async () => document.querySelector<HTMLButtonElement>('button[aria-label="ssh.remote.newConnection"]')!.click());
     expect(document.querySelector('[data-testid="connection-dialog"]')?.getAttribute('data-target')).toBe('wsl');
diff --git a/src/web-ui/src/app/components/NewProjectDialog/NewProjectDialog.test.tsx b/src/web-ui/src/app/components/NewProjectDialog/NewProjectDialog.test.tsx
index f77ee906d2..aa7aa977ee 100644
--- a/src/web-ui/src/app/components/NewProjectDialog/NewProjectDialog.test.tsx
+++ b/src/web-ui/src/app/components/NewProjectDialog/NewProjectDialog.test.tsx
@@ -13,6 +13,8 @@ vi.mock('@/infrastructure/api/service-api/RemoteConnectAPI', async importOrigina
   ...await importOriginal<typeof import('@/infrastructure/api/service-api/RemoteConnectAPI')>(),
   remoteConnectAPI: { getDeviceInfo: async () => ({ device_id: 'local', device_name: 'Workstation', device_os: 'macOS' }) },
 }));
+const wslSupport = vi.hoisted(() => ({ supported: true }));
+vi.mock('@/features/ssh-remote/sshApi', () => ({ sshApi: { listWslDistributions: async () => ({ supported: wslSupport.supported, distributions: [] }) } }));
 const { pickDirectory, sourceOptions, optionsBySource } = vi.hoisted(() => ({ pickDirectory: vi.fn(), sourceOptions: [] as WorkspaceSourceOption[], optionsBySource: {} as Record<string, WorkspaceSourceOption[]> }));
 vi.mock('@/features/ssh-remote/useWorkspaceSourceOptions', () => ({
   useWorkspaceSourceOptions: (source: string) => ({ options: optionsBySource[source] || [], loading: false, error: '', refresh: vi.fn() }),
@@ -57,6 +59,7 @@ describe('NewProjectDialog composition', () => {
 
   beforeEach(() => {
     vi.resetAllMocks();
+    wslSupport.supported = true;
     sourceOptions.length = 0;
     for (const key of Object.keys(optionsBySource)) delete optionsBySource[key];
     for (const source of ['ssh', 'wsl', 'localDocker', 'remoteDocker']) {
@@ -75,6 +78,17 @@ describe('NewProjectDialog composition', () => {
     await act(async () => root.render(<NewProjectDialog isOpen defaultParentPath="/srv" onClose={close} onConfirm={confirm} {...extra} />));
   };
 
+  it('disables WSL before selection when the active host does not support it', async () => {
+    wslSupport.supported = false;
+    const onSelectRemoteHost = vi.fn();
+    await render({ onPickRemoteFolder: vi.fn(), onSelectRemoteHost });
+    expect(sourceOption(1, 'wsl').disabled).toBe(true);
+    expect(document.body.textContent).toContain('ssh.remote.wslUnsupported');
+    act(() => sourceOption(1, 'wsl').click());
+    expect(sourceOption(1, 'system').getAttribute('aria-checked')).toBe('true');
+    expect(onSelectRemoteHost).not.toHaveBeenCalled();
+  });
+
   it('uses the single source folder name when the name is left empty', async () => {
     await render();
     expect(button('newProject.create').disabled).toBe(true);
diff --git a/src/web-ui/src/app/components/NewProjectDialog/NewProjectDialog.tsx b/src/web-ui/src/app/components/NewProjectDialog/NewProjectDialog.tsx
index 8044c6284a..4739051770 100644
--- a/src/web-ui/src/app/components/NewProjectDialog/NewProjectDialog.tsx
+++ b/src/web-ui/src/app/components/NewProjectDialog/NewProjectDialog.tsx
@@ -37,6 +37,7 @@ export const NewProjectDialog: React.FC<NewProjectDialogProps> = ({
   const { t } = useI18n('common');
   const [folders, setFolders] = useState<ProjectFolder[]>([]);
   const [projectName, setProjectName] = useState('');
+  const [wslSupported, setWslSupported] = useState(false);
   const [source, setSource] = useState<WorkspaceSource>('host');
   const [selectedOption, setSelectedOption] = useState<string>();
   const [selectedHostOption, setSelectedHostOption] = useState<string>();
@@ -71,7 +72,7 @@ export const NewProjectDialog: React.FC<NewProjectDialogProps> = ({
       ?? (source === 'remoteDocker' && selectedHost ? { kind: 'new', host: workspacePresetHost(selectedHost.preset), credentialConnectionId: selectedHost.preset.credentialConnectionId } : undefined),
   [source, selectedHost, sourceOptions.options, selectedOption]);
   const showEnvironment = location === 'current' || Boolean(selectedHost);
-  const sourceReady = hasFolders || (showEnvironment && (source === 'host' || (source === 'ssh' ? Boolean(selectedHost) : Boolean(selectedOption && sourceOptions.options.some(option => option.id === selectedOption)) || Boolean(connectedRemote))));
+  const sourceReady = (source !== 'wsl' || wslSupported) && (hasFolders || (showEnvironment && (source === 'host' || (source === 'ssh' ? Boolean(selectedHost) : Boolean(selectedOption && sourceOptions.options.some(option => option.id === selectedOption)) || Boolean(connectedRemote)))));
   const environmentLabel = environment === 'wsl' ? t('workspaceSource.wsl')
     : environment === 'container' ? t('workspaceSource.container') : t('workspaceSource.system');
   const saveLocation = `${source === 'host' ? t('newProject.emptyProjectHint')
@@ -183,7 +184,7 @@ export const NewProjectDialog: React.FC<NewProjectDialogProps> = ({
   }, [busy, needsName, name, invalidDirectoryName, folders, onConfirm, onClose, source, onSelectRemoteHost, step, t, connectionPreset, connectedRemote, sourceOptions.loading, sourceReady]);
 
   const handleConfigureSource = async (target: WorkspaceConnectionTarget) => {
-    if (busy || hasFolders || !onSelectRemoteHost) return;
+    if (busy || hasFolders || !onSelectRemoteHost || (target === 'wsl' && !wslSupported)) return;
     setIsSelecting(true);
     setError('');
     try {
@@ -209,7 +210,7 @@ export const NewProjectDialog: React.FC<NewProjectDialogProps> = ({
   };
 
   const handleEditSource = async (option: WorkspaceSourceOption, target: WorkspaceConnectionTarget) => {
-    if (busy || hasFolders || !onSelectRemoteHost) return;
+    if (busy || hasFolders || !onSelectRemoteHost || (target === 'wsl' && !wslSupported)) return;
     setIsSelecting(true);
     setError('');
     try {
@@ -318,13 +319,13 @@ export const NewProjectDialog: React.FC<NewProjectDialogProps> = ({
               </div>
               {onPickRemoteFolder && (
                 <div className="new-project-dialog__field" data-openbitfun-component="new-project-dialog" data-openbitfun-part="field">
-                  <WorkspaceSourceSelector value={source} disabled={busy || hasFolders} showEnvironment={showEnvironment}
+                  <WorkspaceSourceSelector onWslSupportChange={setWslSupported} value={source} disabled={busy || hasFolders} showEnvironment={showEnvironment}
                     locationOptions={location === 'other' ? optionChoices(hostOptions, 'ssh', selectedHostOption, value => {
                       setSelectedHostOption(value); setSelectedOption(undefined);
                     }) : undefined}
                     environmentOptions={source !== 'host' && source !== 'ssh' ? optionChoices(environmentOptions, source, selectedOption, setSelectedOption) : undefined}
                     locationActions={location === 'other' ? optionActions(hostOptions, 'ssh') : undefined}
-                    environmentActions={source !== 'host' && source !== 'ssh' ? optionActions(environmentOptions, source) : undefined}
+                    environmentActions={source !== 'host' && source !== 'ssh' && (source !== 'wsl' || wslSupported) ? optionActions(environmentOptions, source) : undefined}
                     onValueChange={value => {
                       if (workspaceSourceCoordinates(value).location !== location) setSelectedHostOption(undefined);
                       setSource(value); setSelectedOption(undefined); setConnectedRemote(undefined); setError('');
diff --git a/src/web-ui/src/app/components/panels/content-canvas/hooks/useKeyboardShortcuts.ts b/src/web-ui/src/app/components/panels/content-canvas/hooks/useKeyboardShortcuts.ts
index 474c6c54e9..2bb97996ed 100644
--- a/src/web-ui/src/app/components/panels/content-canvas/hooks/useKeyboardShortcuts.ts
+++ b/src/web-ui/src/app/components/panels/content-canvas/hooks/useKeyboardShortcuts.ts
@@ -7,6 +7,7 @@
  */
 
 import { useCallback } from 'react';
+import { CANVAS_OVERVIEW_SHORTCUT } from '@/shared/constants/shortcuts';
 import { useShortcut } from '@/infrastructure/hooks/useShortcut';
 import { activeEditTargetService } from '@/tools/editor/services/ActiveEditTargetService';
 import { useCanvasStore } from '../stores';
@@ -63,7 +64,7 @@ export const useKeyboardShortcuts = (options: UseKeyboardShortcutsOptions = {})
   // Mission control
   useShortcut(
     'canvas.missionControl',
-    { key: 'Tab', ctrl: true, scope: 'canvas', allowInInput: true },
+    CANVAS_OVERVIEW_SHORTCUT,
     () => toggleMissionControl(),
     {
       enabled: enabled && missionControlEnabled,
diff --git a/src/web-ui/src/app/components/scheduled-jobs/DateTimePickerPopover.tsx b/src/web-ui/src/app/components/scheduled-jobs/DateTimePickerPopover.tsx
index b82e37cd86..a2bdd5e81b 100644
--- a/src/web-ui/src/app/components/scheduled-jobs/DateTimePickerPopover.tsx
+++ b/src/web-ui/src/app/components/scheduled-jobs/DateTimePickerPopover.tsx
@@ -11,7 +11,7 @@
  * and the text field already accepts it.
  */
 
-import { subscribeOverlayInteraction, createOverlayPortal, Button, Icon, IconButton } from '@openbitfun/ui';
+import { useDismissibleLayer, createOverlayPortal, Button, Icon, IconButton } from '@openbitfun/ui';
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 
 import { getAppearanceOverlayHost } from '@/infrastructure/appearance/runtime/AppearanceOverlayHost';
@@ -46,6 +46,7 @@ export interface DateTimePickerPopoverProps {
   anchorRef: React.RefObject<HTMLElement | null>;
   /** Currently selected day, or null when the field is empty. */
   selected: Date | null;
+  triggerRef: React.RefObject<HTMLButtonElement | null>;
   onSelect: (day: Date) => void;
   onClose: () => void;
 }
@@ -53,12 +54,20 @@ export interface DateTimePickerPopoverProps {
 const DateTimePickerPopover: React.FC<DateTimePickerPopoverProps> = ({
   anchorRef,
   selected,
+  triggerRef,
   onSelect,
   onClose,
 }) => {
   const { t, formatDate } = useI18n('common');
   const popoverRef = useRef<HTMLDivElement | null>(null);
 
+  const [focusedDayMs, setFocusedDayMs] = useState(() => {
+    const day = selected ?? new Date();
+    return new Date(day.getFullYear(), day.getMonth(), day.getDate()).getTime();
+  });
+  const pendingDayFocus = useRef(true);
+  const branches = useMemo(() => [anchorRef], [anchorRef]);
+
   const [monthAnchorMs, setMonthAnchorMs] = useState(() => {
     const base = selected ?? new Date();
     return new Date(base.getFullYear(), base.getMonth(), 1).getTime();
@@ -93,25 +102,53 @@ const DateTimePickerPopover: React.FC<DateTimePickerPopoverProps> = ({
     };
   }, [anchorRef]);
 
-  useEffect(() => {
-    const handlePointerDown = (event: MouseEvent) => {
-      const target = event.target as Node | null;
-      if (!target) return;
-      if (popoverRef.current?.contains(target)) return;
-      if (anchorRef.current?.contains(target)) return;
+  useDismissibleLayer({
+    enabled: true,
+    layerRef: popoverRef,
+    branchRefs: branches,
+    onDismiss: reason => {
       onClose();
-    };
-    const handleKeyDown = (event: KeyboardEvent) => {
-      if (event.key === 'Escape') onClose();
-    };
+      if (reason === 'escape-key') triggerRef.current?.focus();
+    },
+  });
 
-    const removeOverlayMousedown0 = subscribeOverlayInteraction(popoverRef, 'mousedown', handlePointerDown);
-    const removeOverlayKeydown1 = subscribeOverlayInteraction(popoverRef, 'keydown', handleKeyDown);
-    return () => {
-      removeOverlayMousedown0?.();
-      removeOverlayKeydown1?.();
-    };
-  }, [anchorRef, onClose]);
+  useEffect(() => {
+    if (!pendingDayFocus.current) return;
+    pendingDayFocus.current = false;
+    popoverRef.current?.querySelector<HTMLButtonElement>(`[data-day="${focusedDayMs}"]`)?.focus();
+  }, [focusedDayMs]);
+
+  const selectDay = (day: Date) => {
+    onSelect(day);
+    triggerRef.current?.focus();
+  };
+
+  const handleDayKeyDown = (event: React.KeyboardEvent, day: Date) => {
+    const next = new Date(day);
+    switch (event.key) {
+      case 'ArrowLeft': next.setDate(next.getDate() - 1); break;
+      case 'ArrowRight': next.setDate(next.getDate() + 1); break;
+      case 'ArrowUp': next.setDate(next.getDate() - 7); break;
+      case 'ArrowDown': next.setDate(next.getDate() + 7); break;
+      case 'Home': next.setDate(next.getDate() - next.getDay()); break;
+      case 'End': next.setDate(next.getDate() + 6 - next.getDay()); break;
+      case 'PageUp':
+      case 'PageDown': {
+        const offset = (event.key === 'PageUp' ? -1 : 1) * (event.shiftKey ? 12 : 1);
+        next.setDate(1);
+        next.setMonth(next.getMonth() + offset);
+        const lastDay = new Date(next.getFullYear(), next.getMonth() + 1, 0).getDate();
+        next.setDate(Math.min(day.getDate(), lastDay));
+        break;
+      }
+      default: return;
+    }
+    event.preventDefault();
+    event.stopPropagation();
+    pendingDayFocus.current = true;
+    setMonthAnchorMs(new Date(next.getFullYear(), next.getMonth(), 1).getTime());
+    setFocusedDayMs(next.getTime());
+  };
 
   const grid = useMemo(() => buildMonthGrid(monthAnchorMs), [monthAnchorMs]);
   const anchorDate = useMemo(() => new Date(monthAnchorMs), [monthAnchorMs]);
@@ -125,7 +162,9 @@ const DateTimePickerPopover: React.FC<DateTimePickerPopoverProps> = ({
   const shiftMonth = useCallback((delta: number) => {
     setMonthAnchorMs(current => {
       const date = new Date(current);
-      return new Date(date.getFullYear(), date.getMonth() + delta, 1).getTime();
+      const next = new Date(date.getFullYear(), date.getMonth() + delta, 1).getTime();
+      setFocusedDayMs(next);
+      return next;
     });
   }, []);
 
@@ -138,6 +177,10 @@ const DateTimePickerPopover: React.FC<DateTimePickerPopoverProps> = ({
       data-testid="datetime-picker"
       role="dialog"
       aria-label={t('dateTimeField.pickerLabel')}
+      onBlur={event => {
+        const next = event.relatedTarget as Node | null;
+        if (next && !event.currentTarget.contains(next) && !anchorRef.current?.contains(next)) onClose();
+      }}
       style={{ top: position.top, left: position.left }}
     >
       <header className="openbitfun-datetime-picker__head" data-openbitfun-component="datetime-picker" data-openbitfun-part="head">
@@ -148,7 +191,7 @@ const DateTimePickerPopover: React.FC<DateTimePickerPopoverProps> = ({
           icon={<Icon name="chevron-left" size="lg" />}
           onClick={() => shiftMonth(-1)}
         />
-        <span className="openbitfun-datetime-picker__month">
+        <span className="openbitfun-datetime-picker__month" aria-live="polite">
           {formatDate(anchorDate, { year: 'numeric', month: 'long' })}
         </span>
         <IconButton
@@ -166,17 +209,20 @@ const DateTimePickerPopover: React.FC<DateTimePickerPopoverProps> = ({
         ))}
       </div>
 
-      <div className="openbitfun-datetime-picker__grid" role="grid" data-openbitfun-component="datetime-picker" data-openbitfun-part="grid">
-        {grid.map(day => {
+      <div className="openbitfun-datetime-picker__grid" role="grid" aria-label={formatDate(anchorDate, { year: 'numeric', month: 'long' })} data-openbitfun-component="datetime-picker" data-openbitfun-part="grid">
+        {Array.from({ length: 6 }, (_, week) => (
+          <div role="row" className="openbitfun-datetime-picker__week" key={week}>
+          {grid.slice(week * 7, week * 7 + 7).map(day => {
           const isCurrentMonth = day.getMonth() === anchorDate.getMonth();
           const isSelected = selected != null && isSameDay(day, selected);
           const isToday = isSameDay(day, today);
 
           return (
+            <div role="gridcell" aria-selected={isSelected} key={day.getTime()}>
             <button
-              key={day.getTime()}
+              data-day={day.getTime()}
+              tabIndex={day.getTime() === focusedDayMs ? 0 : -1}
               type="button"
-              role="gridcell"
               className={[
                 'openbitfun-datetime-picker__day',
                 isCurrentMonth ? '' : 'openbitfun-datetime-picker__day--outside',
@@ -187,25 +233,33 @@ const DateTimePickerPopover: React.FC<DateTimePickerPopoverProps> = ({
               data-openbitfun-part="day"
               data-openbitfun-state={isSelected ? 'selected' : isToday ? 'today' : undefined}
               aria-pressed={isSelected}
+              aria-current={isToday ? 'date' : undefined}
               aria-label={formatDate(day, { year: 'numeric', month: 'long', day: 'numeric' })}
-              onClick={() => onSelect(day)}
+              onKeyDown={event => handleDayKeyDown(event, day)}
+              onFocus={() => setFocusedDayMs(day.getTime())}
+              onClick={() => selectDay(day)}
             >
-              {day.getDate()}
+              {formatDate(day, { day: 'numeric' })}
             </button>
+            </div>
           );
-        })}
+          })}
+          </div>
+        ))}
       </div>
 
       <footer className="openbitfun-datetime-picker__foot" data-openbitfun-component="datetime-picker" data-openbitfun-part="foot">
-        <Button size="sm" variant="outline" onClick={() => onSelect(new Date())}>
+        <Button size="sm" variant="outline" onClick={() => selectDay(new Date())}>
           {t('dateTimeField.now')}
         </Button>
-        <Button size="sm" variant="fill" onClick={onClose}>
+        <Button size="sm" variant="fill" onClick={() => { onClose(); triggerRef.current?.focus(); }}>
           {t('dateTimeField.close')}
         </Button>
       </footer>
     </div>,
     getAppearanceOverlayHost(),
+    undefined,
+    { ownerRef: anchorRef },
   );
 };
 
diff --git a/src/web-ui/src/app/components/scheduled-jobs/LocalizedDateTimeField.scss b/src/web-ui/src/app/components/scheduled-jobs/LocalizedDateTimeField.scss
index ee97fcbf59..4530cdbcae 100644
--- a/src/web-ui/src/app/components/scheduled-jobs/LocalizedDateTimeField.scss
+++ b/src/web-ui/src/app/components/scheduled-jobs/LocalizedDateTimeField.scss
@@ -41,7 +41,7 @@
   }
 
   &__weekdays,
-  &__grid {
+  &__week {
     display: grid;
     grid-template-columns: repeat(7, minmax(0, 1fr));
     gap: 2px;
@@ -55,7 +55,14 @@
     color: var(--openbitfun-color-content-muted);
   }
 
+  &__grid {
+    display: flex;
+    flex-direction: column;
+    gap: 2px;
+  }
+
   &__day {
+    width: 100%;
     display: flex;
     align-items: center;
     justify-content: center;
diff --git a/src/web-ui/src/app/components/scheduled-jobs/LocalizedDateTimeField.test.tsx b/src/web-ui/src/app/components/scheduled-jobs/LocalizedDateTimeField.test.tsx
index d873f767a5..c038593a55 100644
--- a/src/web-ui/src/app/components/scheduled-jobs/LocalizedDateTimeField.test.tsx
+++ b/src/web-ui/src/app/components/scheduled-jobs/LocalizedDateTimeField.test.tsx
@@ -60,4 +60,31 @@ describe('LocalizedDateTimeField picker action', () => {
     expect(pickerButton?.getAttribute('aria-expanded')).toBe('true');
     expect(document.querySelector('[data-testid="datetime-picker"]')).not.toBeNull();
   });
+  it('exposes native day buttons in grid rows and restores focus after keyboard dismissal', () => {
+    const onChange = vi.fn();
+    act(() => root.render(<LocalizedDateTimeField value="2026-08-31T09:30" onChange={onChange} />));
+    const trigger = container.querySelector<HTMLButtonElement>('button[aria-label="dateTimeField.openPicker"]')!;
+    act(() => trigger.click());
+    const grid = document.querySelector('[role="grid"]')!;
+    expect(grid.querySelectorAll(':scope > [role="row"]')).toHaveLength(6);
+    expect(grid.querySelectorAll('[role="gridcell"] > button:not([role])')).toHaveLength(42);
+    expect(grid.querySelectorAll('button[tabindex="0"]')).toHaveLength(1);
+    const key = (value: string) => act(() => {
+      document.activeElement!.dispatchEvent(new KeyboardEvent('keydown', { key: value, bubbles: true }));
+    });
+    expect((document.activeElement as HTMLElement).dataset.day).toBe(String(new Date(2026, 7, 31).getTime()));
+    key('ArrowRight');
+    expect((document.activeElement as HTMLElement).dataset.day).toBe(String(new Date(2026, 8, 1).getTime()));
+    key('PageDown');
+    expect((document.activeElement as HTMLElement).dataset.day).toBe(String(new Date(2026, 9, 1).getTime()));
+    key('Escape');
+    expect(document.querySelector('[data-testid="datetime-picker"]')).toBeNull();
+    expect(document.activeElement).toBe(trigger);
+    expect(onChange).not.toHaveBeenCalled();
+    act(() => trigger.click());
+    act(() => (document.activeElement as HTMLButtonElement).click());
+    expect(onChange).toHaveBeenCalledWith('2026-08-31T09:30');
+    expect(document.activeElement).toBe(trigger);
+  });
+
 });
diff --git a/src/web-ui/src/app/components/scheduled-jobs/LocalizedDateTimeField.tsx b/src/web-ui/src/app/components/scheduled-jobs/LocalizedDateTimeField.tsx
index f4be736ab8..157a5362f4 100644
--- a/src/web-ui/src/app/components/scheduled-jobs/LocalizedDateTimeField.tsx
+++ b/src/web-ui/src/app/components/scheduled-jobs/LocalizedDateTimeField.tsx
@@ -52,6 +52,7 @@ const LocalizedDateTimeField: React.FC<LocalizedDateTimeFieldProps> = ({
 }) => {
   const { t, currentLanguage } = useI18n('common');
   const anchorRef = useRef<HTMLDivElement | null>(null);
+  const pickerTriggerRef = useRef<HTMLButtonElement | null>(null);
   const editingRef = useRef(false);
   const [pickerOpen, setPickerOpen] = useState(false);
 
@@ -140,6 +141,7 @@ const LocalizedDateTimeField: React.FC<LocalizedDateTimeFieldProps> = ({
 
       <Tooltip content={t('dateTimeField.openPicker')} disabled={disabled}>
         <IconButton
+          ref={pickerTriggerRef}
           type="button"
           size="sm"
           disabled={disabled}
@@ -153,6 +155,7 @@ const LocalizedDateTimeField: React.FC<LocalizedDateTimeFieldProps> = ({
       {pickerOpen && !disabled ? (
         <DateTimePickerPopover
           anchorRef={anchorRef}
+          triggerRef={pickerTriggerRef}
           selected={selectedDay}
           onSelect={handlePickDay}
           onClose={() => setPickerOpen(false)}
diff --git a/src/web-ui/src/app/components/scheduled-jobs/ScheduledJobsView.tsx b/src/web-ui/src/app/components/scheduled-jobs/ScheduledJobsView.tsx
index 8e861a19d3..d17cadc2f0 100644
--- a/src/web-ui/src/app/components/scheduled-jobs/ScheduledJobsView.tsx
+++ b/src/web-ui/src/app/components/scheduled-jobs/ScheduledJobsView.tsx
@@ -29,6 +29,7 @@ import { notificationService } from '@/shared/notification-system/services/Notif
 import { createLogger } from '@/shared/utils/logger';
 import { i18nService } from '@/infrastructure/i18n';
 import { resolveSessionTitle } from '@/flow_chat/utils/sessionTitle';
+import { agentName } from '@/shared/agents/identity';
 import { WorkspaceKind } from '@/shared/types';
 import {
   ASSISTANT_WORKSPACE_AGENT_TYPE,
@@ -113,6 +114,7 @@ function formatJobMetaSummary(
   t: (key: string, params?: Record<string, unknown>) => string,
   options?: {
     resolveSessionLabel: (sessionId: string) => string | undefined;
+    resolveAgentLabel: (agentType: string) => string;
   },
 ): string {
   const scheduleSummary = formatScheduleSummary(job.schedule, formatDate, t);
@@ -121,7 +123,7 @@ function formatJobMetaSummary(
     return `${sessionLabel} · ${scheduleSummary}`;
   }
   if (job.target.kind === 'workspace') {
-    return `${job.target.launch.agentType} · ${scheduleSummary}`;
+    return `${options?.resolveAgentLabel(job.target.launch.agentType) ?? agentName({ id: job.target.launch.agentType, name: job.target.launch.agentType }, t)} · ${scheduleSummary}`;
   }
   return scheduleSummary;
 }
@@ -145,13 +147,14 @@ function buildWorkspaceAgentOptions(
   modes: ModeInfo[],
   currentAgentType: string,
   defaultAgentType: string,
+  t: (key: string) => string,
   workspaceKind?: WorkspaceKind,
 ) {
   if (workspaceKind === WorkspaceKind.Assistant) {
     return [
       {
         value: defaultAgentType,
-        label: defaultAgentType,
+        label: agentName({ id: defaultAgentType, name: defaultAgentType }, t),
         description: undefined,
       },
     ];
@@ -161,7 +164,7 @@ function buildWorkspaceAgentOptions(
     .filter(mode => mode.id !== ASSISTANT_WORKSPACE_AGENT_TYPE)
     .map(mode => ({
       value: mode.id,
-      label: mode.name?.trim() || mode.id,
+      label: agentName(mode, t),
       description: mode.description?.trim() || undefined,
     }));
 
@@ -173,7 +176,7 @@ function buildWorkspaceAgentOptions(
     if (!options.some(option => option.value === agentType)) {
       options.push({
         value: agentType,
-        label: agentType,
+        label: agentName({ id: agentType, name: agentType }, t),
         description: undefined,
       });
     }
@@ -544,9 +547,10 @@ const ScheduledJobsView: React.FC<ScheduledJobsViewProps> = ({
       availableModes,
       draft.agentType,
       defaultAgentType,
+      t,
       workspaceKind,
     ),
-    [availableModes, defaultAgentType, draft.agentType, workspaceKind],
+    [availableModes, defaultAgentType, draft.agentType, workspaceKind, t],
   );
 
   const canSave = assistantWorkspaceMode
@@ -670,6 +674,10 @@ const ScheduledJobsView: React.FC<ScheduledJobsViewProps> = ({
                     <div className="asv__item-meta-row" data-openbitfun-component="scheduled-jobs-view" data-openbitfun-part="jobMeta">
                       <div className="asv__item-meta"><OverflowText>
                         {formatJobMetaSummary(job, formatDate, t, {
+                          resolveAgentLabel: id => {
+                            const mode = availableModes.find(mode => mode.id === id);
+                            return agentName(mode ?? { id, name: id }, t);
+                          },
                           resolveSessionLabel: sessionId => sessionLabelById.get(sessionId),
                         })}
                       </OverflowText></div>
diff --git a/src/web-ui/src/app/global-search/GlobalSearchContent.test.tsx b/src/web-ui/src/app/global-search/GlobalSearchContent.test.tsx
new file mode 100644
index 0000000000..bc42d5320a
--- /dev/null
+++ b/src/web-ui/src/app/global-search/GlobalSearchContent.test.tsx
@@ -0,0 +1,119 @@
+// @vitest-environment jsdom
+import React, { act } from 'react';
+import { createRoot, type Root } from 'react-dom/client';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { activateSurface, resetDeviceSurfaceForTest } from '@/infrastructure/peer-device/deviceSurface';
+import { GlobalSearchContent } from './GlobalSearchRoot';
+import type { GlobalSearchSnapshot } from './types';
+
+globalThis.IS_REACT_ACT_ENVIRONMENT = true;
+const fixtures = vi.hoisted(() => ({
+  t: (key: string) => key,
+  workspaces: [],
+  providers: [],
+  activate: vi.fn(),
+  search: vi.fn(),
+  setActiveWorkspace: vi.fn(),
+  selectAssistantWorkspace: vi.fn(),
+  openAssistant: vi.fn(),
+}));
+vi.mock('@/infrastructure/i18n', () => ({ useI18n: () => ({ t: fixtures.t }) }));
+vi.mock('@/infrastructure/hooks/useShortcut', () => ({ useShortcut: vi.fn() }));
+vi.mock('@/infrastructure/contexts/WorkspaceContext', () => ({ useWorkspaceContext: () => ({
+  currentWorkspace: null, openedWorkspacesList: fixtures.workspaces, setActiveWorkspace: fixtures.setActiveWorkspace,
+}) }));
+vi.mock('@/app/scenes/my-agent/myAgentStore', () => ({ useMyAgentStore: () => fixtures.selectAssistantWorkspace }));
+vi.mock('@/app/scenes/profile/nurseryStore', () => ({ useNurseryStore: () => fixtures.openAssistant }));
+vi.mock('@/shared/notification-system', () => ({ notificationService: { error: vi.fn() } }));
+vi.mock('./globalSearchActivator', () => ({ activateGlobalSearchTarget: fixtures.activate }));
+vi.mock('./federatedSearchEngine', () => ({ runFederatedSearch: fixtures.search }));
+vi.mock('./globalSearchRegistry', () => ({ globalSearchRegistry: {
+  subscribe: () => () => {}, getSnapshot: () => fixtures.providers,
+} }));
+vi.mock('./globalSearchShortcut', () => ({
+  GLOBAL_SEARCH_SHORTCUT: 'mod+k', getGlobalSearchShortcutLabel: () => 'Cmd+K',
+  splitGlobalSearchShortcutLabel: () => ({ modifier: 'command', key: 'K' }), subscribeGlobalSearchShortcut: () => () => {},
+}));
+
+const snapshot: GlobalSearchSnapshot = {
+  providerStatus: {}, diagnostics: [], isSearching: false, truncated: false,
+  items: [
+    { id: 'terminal', providerId: 'actions', group: 'actions', title: 'Open terminal', score: 90, target: { kind: 'action', actionId: 'surface.terminal.open' } },
+    { id: 'project', providerId: 'actions', group: 'actions', title: 'Open project', score: 80, target: { kind: 'action', actionId: 'project.open' } },
+  ],
+};
+
+describe('GlobalSearchContent accessibility', () => {
+  let container: HTMLDivElement;
+  let root: Root;
+  beforeEach(() => {
+    resetDeviceSurfaceForTest();
+    vi.useFakeTimers();
+    fixtures.activate.mockReset();
+    fixtures.search.mockReset();
+    fixtures.search.mockImplementation((_providers, _request, _signal, onUpdate) => onUpdate(snapshot));
+    HTMLElement.prototype.scrollIntoView = vi.fn();
+    vi.stubGlobal('CSS', { escape: (value: string) => value });
+    container = document.createElement('div');
+    document.body.appendChild(container);
+    root = createRoot(container);
+  });
+  afterEach(() => {
+    act(() => root.unmount());
+    container.remove();
+    vi.useRealTimers();
+    vi.unstubAllGlobals();
+  });
+  it('retains named native actions and tracks keyboard selection in the controlled grid', async () => {
+    act(() => root.render(<GlobalSearchContent autoFocus />));
+    await act(async () => { await vi.runOnlyPendingTimersAsync(); });
+    const input = container.querySelector<HTMLInputElement>('[role="combobox"]')!;
+    const grid = document.getElementById(input.getAttribute('aria-controls')!)!;
+    expect(input.getAttribute('aria-haspopup')).toBe('grid');
+    expect(grid.getAttribute('role')).toBe('grid');
+    const buttons = grid.querySelectorAll('[role="gridcell"] button:not([role])');
+    expect([...buttons].map(button => button.getAttribute('aria-label'))).toEqual(['Open terminal', 'Open project']);
+    act(() => input.dispatchEvent(new KeyboardEvent('keydown', { key: 'ArrowDown', bubbles: true })));
+    const selected = document.getElementById(input.getAttribute('aria-activedescendant')!)!;
+    expect(selected.getAttribute('role')).toBe('gridcell');
+    expect(selected.getAttribute('aria-selected')).toBe('true');
+    expect(selected.textContent).toContain('Open terminal');
+    expect(document.activeElement).toBe(input);
+    await act(async () => input.dispatchEvent(new KeyboardEvent('keydown', { key: 'Enter', bubbles: true })));
+    expect(fixtures.activate).toHaveBeenCalledWith(snapshot.items[0].target, expect.anything());
+  });
+  it('shows source diagnostics and retries without clearing the query or healthy results', async () => {
+    const failure = { ...snapshot, diagnostics: [{
+      providerId: 'files', code: 'workspace_unavailable', message: 'Connection timed out',
+      workspaceName: 'Remote project', workspacePath: '/srv/project', hostLabel: 'build-host',
+    }] };
+    fixtures.search.mockImplementationOnce((_providers, _request, _signal, onUpdate) => onUpdate(failure));
+    fixtures.search.mockImplementationOnce((_providers, _request, _signal, onUpdate, retry) =>
+      onUpdate({ ...retry.previous, isSearching: true }));
+    act(() => root.render(<GlobalSearchContent initialQuery="needle" />));
+    await act(async () => { await vi.runOnlyPendingTimersAsync(); });
+    const details = container.querySelector('details')!;
+    expect(details.textContent).toContain('Connection timed out');
+    expect(details.textContent).toContain('/srv/project');
+    expect(details.textContent).toContain('build-host');
+    act(() => details.querySelector<HTMLButtonElement>('button')!.click());
+    await act(async () => { await vi.runOnlyPendingTimersAsync(); });
+    expect(fixtures.search.mock.calls[1][4]).toEqual({ previous: failure, providerIds: ['files'] });
+    expect(container.querySelector('input')?.value).toBe('needle');
+    expect(container.textContent).toContain('Open terminal');
+    expect(details.querySelector('button')?.disabled).toBe(true);
+  });
+
+  it('discards old results and ignores late completions after a device switch', async () => {
+    act(() => root.render(<GlobalSearchContent />));
+    await act(async () => { await vi.runOnlyPendingTimersAsync(); });
+    const [, , signal, publishOld] = fixtures.search.mock.calls[0];
+    expect(container.textContent).toContain('Open terminal');
+    act(() => activateSurface('peer-b'));
+    expect(signal.aborted).toBe(true);
+    expect(container.textContent).not.toContain('Open terminal');
+    act(() => publishOld(snapshot));
+    expect(container.textContent).not.toContain('Open terminal');
+  });
+
+});
diff --git a/src/web-ui/src/app/global-search/GlobalSearchRoot.scss b/src/web-ui/src/app/global-search/GlobalSearchRoot.scss
index aec5d12ff1..e448388e10 100644
--- a/src/web-ui/src/app/global-search/GlobalSearchRoot.scss
+++ b/src/web-ui/src/app/global-search/GlobalSearchRoot.scss
@@ -189,6 +189,16 @@ $chevron-box-slack: 5px;
     margin-top: 8px;
   }
 
+  &__result-row {
+    min-width: 0;
+  }
+
+  &__result-row > [role='gridcell'],
+  &__result-row .global-search__action-card {
+    width: 100%;
+    height: 100%;
+  }
+
   &__result {
     display: flex;
     align-items: center;
@@ -878,3 +888,19 @@ $chevron-box-slack: 5px;
     }
   }
 }
+
+.global-search__diagnostics {
+  min-width: 0;
+  flex: 1;
+  max-height: 200px;
+  overflow: auto;
+  summary { cursor: pointer; }
+}
+.global-search__diagnostic-target { margin-block: 8px; }
+.global-search__diagnostic {
+  padding-block: 8px;
+  border-top: 1px solid var(--openbitfun-color-border-subtle);
+  overflow-wrap: anywhere;
+  p { margin-block: 4px 8px; }
+}
+.global-search__diagnostic-path { color: var(--openbitfun-color-content-muted); }
diff --git a/src/web-ui/src/app/global-search/GlobalSearchRoot.tsx b/src/web-ui/src/app/global-search/GlobalSearchRoot.tsx
index 84c2d3ad2d..34723d4db9 100644
--- a/src/web-ui/src/app/global-search/GlobalSearchRoot.tsx
+++ b/src/web-ui/src/app/global-search/GlobalSearchRoot.tsx
@@ -10,6 +10,7 @@ import React, {
 import { isImeOwnedKeyboardEvent } from '@/shared/utils/ime';
 import { OverflowText,
   ActionCard,
+  Button,
   TabGroup,
   Icon,
   KeyHint,
@@ -22,6 +23,8 @@ import { OverflowText,
 import { BarChart3, Blocks, CheckSquare2, FileText, Keyboard, MessageSquareText, MessagesSquare, Network, Users } from 'lucide-react';
 import { useShortcut } from '@/infrastructure/hooks/useShortcut';
 import { useI18n } from '@/infrastructure/i18n';
+import { getActiveSurfaceScope, onSurfaceActivated } from '@/infrastructure/peer-device/deviceSurface';
+import { usePeerDeviceModeOptional } from '@/infrastructure/peer-device/peerDeviceContextState';
 import { useWorkspaceContext } from '@/infrastructure/contexts/WorkspaceContext';
 import { useMyAgentStore } from '@/app/scenes/my-agent/myAgentStore';
 import { useNurseryStore } from '@/app/scenes/profile/nurseryStore';
@@ -157,6 +160,7 @@ export const GlobalSearchContent: React.FC<GlobalSearchContentProps> = ({
 }) => {
   const { t: tCommon } = useI18n('common');
   const { t: tSettings } = useI18n('settings');
+  const { t: tCapabilities } = useI18n('scenes/capabilities');
   const {
     currentWorkspace,
     openedWorkspacesList,
@@ -166,7 +170,17 @@ export const GlobalSearchContent: React.FC<GlobalSearchContentProps> = ({
   const openAssistant = useNurseryStore((state) => state.openAssistant);
   const [query, setQuery] = useState(initialQuery);
   const [scope, setScope] = useState<GlobalSearchScope>('all');
-  const [snapshot, setSnapshot] = useState<GlobalSearchSnapshot>(EMPTY_SNAPSHOT);
+  const surfaceScope = useSyncExternalStore(onSurfaceActivated, getActiveSurfaceScope, getActiveSurfaceScope);
+  const peerDevice = usePeerDeviceModeOptional();
+  const hostLabel = peerDevice?.peerMode.active
+    ? peerDevice.peerMode.deviceName : tCommon('accountLogin.thisDevice');
+  const [snapshotState, setSnapshotState] = useState({ epoch: surfaceScope.epoch, value: EMPTY_SNAPSHOT });
+  const snapshot = snapshotState.epoch === surfaceScope.epoch ? snapshotState.value : EMPTY_SNAPSHOT;
+  const setSnapshot = useCallback((value: GlobalSearchSnapshot) => {
+    if (surfaceScope.isCurrent()) setSnapshotState({ epoch: surfaceScope.epoch, value });
+  }, [surfaceScope]);
+  const [retryRevision, setRetryRevision] = useState(0);
+  const retryRef = useRef<{ context: string; providerId: string; previous: GlobalSearchSnapshot } | null>(null);
   const [activeId, setActiveId] = useState<string | null>(null);
   const [drilldownGroup, setDrilldownGroup] = useState<GlobalSearchDrilldownGroupId | null>(null);
   const inputRef = useRef<HTMLInputElement>(null);
@@ -195,15 +209,32 @@ export const GlobalSearchContent: React.FC<GlobalSearchContentProps> = ({
     setActiveId(null);
     setDrilldownGroup(null);
     setSnapshot(EMPTY_SNAPSHOT);
-  }, [active, initialQuery]);
+  }, [active, initialQuery, setSnapshot]);
 
   const parsedQuery = useMemo(() => parseGlobalSearchQuery(query, scope), [query, scope]);
 
+  const searchContext = JSON.stringify([
+    surfaceScope.epoch, query, parsedQuery.scope, currentWorkspace?.id,
+    openedWorkspacesList.map(workspace => [workspace.id, workspace.rootPath, workspace.connectionId]),
+  ]);
+  const retryProvider = (providerId: string) => {
+    if (!surfaceScope.isCurrent() || snapshot.isSearching) return;
+    retryRef.current = { context: searchContext, providerId, previous: snapshot };
+    setRetryRevision(revision => revision + 1);
+  };
+
   useEffect(() => {
     if (!active) return;
     const controller = new AbortController();
+    const abort = () => controller.abort();
+    surfaceScope.signal.addEventListener('abort', abort, { once: true });
+    const requestedRetry = retryRef.current;
+    retryRef.current = null;
+    const retry = requestedRetry?.context === searchContext
+      ? { previous: requestedRetry.previous, providerIds: [requestedRetry.providerId] } : undefined;
     const delay = parsedQuery.query ? SEARCH_DEBOUNCE_MS : 0;
     const timer = window.setTimeout(() => {
+      if (!surfaceScope.isCurrent()) return;
       void runFederatedSearch(
         providers,
         {
@@ -215,18 +246,25 @@ export const GlobalSearchContent: React.FC<GlobalSearchContentProps> = ({
           limitPerGroup: SEARCH_LIMIT_PER_GROUP,
           tCommon,
           tSettings,
+          tCapabilities,
         },
         controller.signal,
-        setSnapshot,
+        value => { if (!controller.signal.aborted) setSnapshot(value); },
+        retry,
       );
     }, delay);
 
     return () => {
       window.clearTimeout(timer);
       controller.abort();
+      surfaceScope.signal.removeEventListener('abort', abort);
     };
   }, [
     active,
+    surfaceScope,
+    searchContext,
+    setSnapshot,
+    retryRevision,
     currentWorkspace,
     openedWorkspacesList,
     parsedQuery.query,
@@ -235,6 +273,7 @@ export const GlobalSearchContent: React.FC<GlobalSearchContentProps> = ({
     query,
     tCommon,
     tSettings,
+    tCapabilities,
   ]);
 
   const items = snapshot.items;
@@ -398,6 +437,7 @@ export const GlobalSearchContent: React.FC<GlobalSearchContentProps> = ({
               aria-label={tCommon('nav.search.inputLabel')}
               role="combobox"
               aria-autocomplete="list"
+              aria-haspopup="grid"
               aria-expanded="true"
               aria-controls={resultsId}
               aria-activedescendant={activeId ? `${instanceId}-option-${activeId}` : undefined}
@@ -428,7 +468,8 @@ export const GlobalSearchContent: React.FC<GlobalSearchContentProps> = ({
           ref={listRef}
           id={resultsId}
           className="global-search__results"
-          role="listbox"
+          role="grid"
+          aria-busy={snapshot.isSearching}
           aria-label={tCommon('nav.search.resultsLabel')}
           data-openbitfun-component="global-search"
           data-openbitfun-part="results"
@@ -436,9 +477,11 @@ export const GlobalSearchContent: React.FC<GlobalSearchContentProps> = ({
           data-search-view={drilldownGroup ?? 'overview'}
         >
           {navigableItems.length === 0 ? (
-            <div className="global-search__empty" role="status">
-              {snapshot.isSearching ? tCommon('nav.search.searching') : emptyLabel}
-            </div>
+            <div role="row"><div role="gridcell">
+              <div className="global-search__empty" role="status">
+                {snapshot.isSearching ? tCommon('nav.search.searching') : emptyLabel}
+              </div>
+            </div></div>
           ) : resultPresentation.groups.map((groupView) => {
             const groupId = groupView.id;
             const groupItems = groupView.items;
@@ -452,7 +495,7 @@ export const GlobalSearchContent: React.FC<GlobalSearchContentProps> = ({
               <section
                 key={groupId}
                 className={`global-search__group global-search__group--${groupId}${groupDetailPage ? ' global-search__group--detail' : ''}`}
-                role="group"
+                role="rowgroup"
                 aria-labelledby={labelId}
                 data-openbitfun-component="global-search"
                 data-openbitfun-part="group"
@@ -461,6 +504,7 @@ export const GlobalSearchContent: React.FC<GlobalSearchContentProps> = ({
                   ? `${testIdPrefix}-group-page-${groupId}`
                   : `${testIdPrefix}-group-${groupId}`}
               >
+                <div role="row"><div role="columnheader">
                 {groupDetailPage ? (
                   <div className="global-search__detail-header">
                     <button
@@ -506,7 +550,8 @@ export const GlobalSearchContent: React.FC<GlobalSearchContentProps> = ({
                     </span>
                   </div>
                 )}
-                <div className="global-search__group-items">
+                </div></div>
+                <div className="global-search__group-items" role="presentation">
                   {groupItems.map((item) => {
                     const itemIcon = iconForItem(item);
                     const selected = item.id === activeId;
@@ -527,14 +572,25 @@ export const GlobalSearchContent: React.FC<GlobalSearchContentProps> = ({
                       </span>
                     );
 
-                    if (itemVariant === 'action') {
-                      return (
-                        <ActionCard
-                          key={item.id}
+                    // Grid cells keep executable buttons in the native accessibility tree.
+                    // Listbox options flatten interactive descendants in WebKit.
+                    const resultRow = (content: React.ReactNode) => (
+                      <div role="row" key={item.id} className="global-search__result-row">
+                        <div
+                          role="gridcell"
                           id={`${instanceId}-option-${item.id}`}
                           data-search-result-id={item.id}
-                          role="option"
                           aria-selected={selected}
+                          aria-label={[item.title, item.subtitle, item.context].filter(Boolean).join('. ')}
+                        >{content}</div>
+                      </div>
+                    );
+
+                    if (itemVariant === 'action') {
+                      return resultRow(
+                        <ActionCard
+                          tabIndex={-1}
+                          aria-label={item.title}
                           className="global-search__action-card"
                           onClick={() => void activateItem(item)}
                           data-openbitfun-state={selected ? 'selected' : undefined}
@@ -558,13 +614,10 @@ export const GlobalSearchContent: React.FC<GlobalSearchContentProps> = ({
                     }
 
                     if (entity) {
-                      return (
+                      return resultRow(
                         <ActionCard
-                          key={item.id}
-                          id={`${instanceId}-option-${item.id}`}
-                          data-search-result-id={item.id}
-                          role="option"
-                          aria-selected={selected}
+                          tabIndex={-1}
+                          aria-label={item.title}
                           className="global-search__action-card"
                           onClick={() => void activateItem(item)}
                           data-openbitfun-state={selected ? 'selected' : undefined}
@@ -581,14 +634,11 @@ export const GlobalSearchContent: React.FC<GlobalSearchContentProps> = ({
                       );
                     }
 
-                    return (
+                    return resultRow(
                       <button data-overflow-trigger
-                        key={item.id}
-                        id={`${instanceId}-option-${item.id}`}
-                        data-search-result-id={item.id}
                         type="button"
-                        role="option"
-                        aria-selected={selected}
+                        tabIndex={-1}
+                        aria-label={item.title}
                         className={`global-search__result global-search__result--${itemVariant}${selected ? ' is-selected' : ''}`}
                         onClick={() => void activateItem(item)}
                         data-openbitfun-component="global-search"
@@ -616,13 +666,27 @@ export const GlobalSearchContent: React.FC<GlobalSearchContentProps> = ({
           || snapshot.diagnostics.length > 0) ? (
         <footer className="global-search__footer" data-openbitfun-component="global-search" data-openbitfun-part="footer">
           {snapshot.diagnostics.length > 0 ? (
-            <OverflowText
-              className="global-search__footer-status"
-              role="status"
-              data-testid={`${testIdPrefix}-partial-status`}
-            >
-              {tCommon('nav.search.partialUnavailable')}
-            </OverflowText>
+            <details className="global-search__diagnostics" data-testid={`${testIdPrefix}-partial-status`}>
+              <summary>{tCommon('nav.search.partialUnavailable')}</summary>
+              <div className="global-search__diagnostic-target">
+                {tCommon('nav.search.diagnosticTarget', { host: hostLabel })}
+              </div>
+              {snapshot.diagnostics.map((diagnostic, index) => (
+                <div className="global-search__diagnostic" key={`${diagnostic.providerId}:${diagnostic.code}:${index}`}>
+                  <strong>{providers.find(provider => provider.id === diagnostic.providerId)?.groups
+                    .map(group => tCommon(`nav.search.groups.${group}`)).join(' / ') ?? diagnostic.providerId}</strong>
+                  {diagnostic.workspaceName ? <div>{diagnostic.workspaceName} · {diagnostic.hostLabel ?? hostLabel}</div> : null}
+                  {diagnostic.workspacePath ? <div className="global-search__diagnostic-path">{diagnostic.workspacePath}</div> : null}
+                  <p>{diagnostic.message}</p>
+                  {diagnostic.retryable !== false ? (
+                    <Button size="sm" variant="outline" disabled={snapshot.isSearching}
+                      onClick={() => retryProvider(diagnostic.providerId)}>
+                      {tCommon('nav.search.retrySource')}
+                    </Button>
+                  ) : null}
+                </div>
+              ))}
+            </details>
           ) : null}
           <span className="global-search__footer-keys" aria-hidden="true">
             <KeyHint>↑↓</KeyHint> {tCommon('nav.search.footer.navigate')}
diff --git a/src/web-ui/src/app/global-search/federatedSearchEngine.test.ts b/src/web-ui/src/app/global-search/federatedSearchEngine.test.ts
index b5e8714dfc..fde45a2e5f 100644
--- a/src/web-ui/src/app/global-search/federatedSearchEngine.test.ts
+++ b/src/web-ui/src/app/global-search/federatedSearchEngine.test.ts
@@ -10,6 +10,7 @@ const request: GlobalSearchRequest = {
   currentWorkspace: null,
   limitPerGroup: 2,
   tCommon: (key) => key,
+  tCapabilities: key => key,
   tSettings: (key) => key,
 };
 
@@ -47,6 +48,24 @@ describe('runFederatedSearch', () => {
     expect(updates).toHaveBeenCalled();
   });
 
+  it('retries only the failed source while keeping successful results throughout', async () => {
+    const healthy = provider('healthy', vi.fn(() => ({ items: [{
+      id: 'healthy-result', providerId: 'healthy', group: 'actions', title: 'Healthy result', score: 80,
+      target: { kind: 'action', actionId: 'settings.open' },
+    }] })));
+    const failed = vi.fn().mockRejectedValueOnce(new Error('offline')).mockResolvedValueOnce({ items: [] });
+    const sources = [healthy, provider('broken', failed)];
+    const previous = await runFederatedSearch(sources, request, new AbortController().signal, () => {});
+    const updates = vi.fn();
+    const result = await runFederatedSearch(sources, request, new AbortController().signal, updates,
+      { previous, providerIds: ['broken'] });
+    expect(healthy.search).toHaveBeenCalledOnce();
+    expect(failed).toHaveBeenCalledTimes(2);
+    expect(updates.mock.calls.every(([value]) => value.items.some((item: { id: string }) => item.id === 'healthy-result'))).toBe(true);
+    expect(result.diagnostics).toEqual([]);
+    expect(result.isSearching).toBe(false);
+  });
+
   it('sorts deterministically, deduplicates by stable id, and enforces group budgets', async () => {
     const result = await runFederatedSearch([
       provider('first', () => ({
diff --git a/src/web-ui/src/app/global-search/federatedSearchEngine.ts b/src/web-ui/src/app/global-search/federatedSearchEngine.ts
index dc6263e3fd..0e2a89b9c3 100644
--- a/src/web-ui/src/app/global-search/federatedSearchEngine.ts
+++ b/src/web-ui/src/app/global-search/federatedSearchEngine.ts
@@ -64,25 +64,37 @@ export async function runFederatedSearch(
   request: GlobalSearchRequest,
   signal: AbortSignal,
   onUpdate: (snapshot: GlobalSearchSnapshot) => void,
+  retry?: { previous: GlobalSearchSnapshot; providerIds: readonly string[] },
 ): Promise<GlobalSearchSnapshot> {
   const providerItems = new Map<string, GlobalSearchItem[]>();
   const providerDiagnostics = new Map<string, GlobalSearchProviderDiagnostic[]>();
   const providerTruncated = new Map<string, boolean>();
+  const searchingProviders = retry
+    ? providers.filter(provider => retry.providerIds.includes(provider.id))
+    : providers;
   const providerStatus: Record<string, GlobalSearchProviderStatus> = Object.fromEntries(
-    providers.map((provider) => [provider.id, 'loading' as const]),
+    providers.map(provider => [provider.id, retry?.previous.providerStatus[provider.id] ?? 'ready']),
   );
+  if (retry) {
+    for (const provider of providers) {
+      providerItems.set(provider.id, retry.previous.items.filter(item => item.providerId === provider.id));
+      providerDiagnostics.set(provider.id, retry.previous.diagnostics.filter(item => item.providerId === provider.id));
+    }
+  }
+  for (const provider of searchingProviders) providerStatus[provider.id] = 'loading';
 
   const snapshot = (): GlobalSearchSnapshot => ({
     items: buildItems(providers, providerItems, request.limitPerGroup),
     providerStatus: { ...providerStatus },
     diagnostics: [...providerDiagnostics.values()].flat(),
     isSearching: Object.values(providerStatus).some((status) => status === 'loading'),
-    truncated: [...providerTruncated.values()].some(Boolean),
+    truncated: Boolean(retry?.previous.truncated) || [...providerTruncated.values()].some(Boolean),
   });
 
+  if (signal.aborted) return snapshot();
   onUpdate(snapshot());
 
-  await Promise.all(providers.map(async (provider) => {
+  await Promise.all(searchingProviders.map(async (provider) => {
     try {
       const result = await provider.search(request, signal);
       if (signal.aborted) return;
diff --git a/src/web-ui/src/app/global-search/providers/fileSearchProvider.test.ts b/src/web-ui/src/app/global-search/providers/fileSearchProvider.test.ts
index 5db2271692..ff609db733 100644
--- a/src/web-ui/src/app/global-search/providers/fileSearchProvider.test.ts
+++ b/src/web-ui/src/app/global-search/providers/fileSearchProvider.test.ts
@@ -33,6 +33,7 @@ function request(workspaces: WorkspaceInfo[]): GlobalSearchRequest {
     currentWorkspace: workspaces[0] ?? null,
     limitPerGroup: 20,
     tCommon: (key, options) => `${key}:${String(options?.workspace ?? '')}`,
+    tCapabilities: key => key,
     tSettings: key => key,
   };
 }
diff --git a/src/web-ui/src/app/global-search/providers/fileSearchProvider.ts b/src/web-ui/src/app/global-search/providers/fileSearchProvider.ts
index 211e87a3f2..0c268dcf26 100644
--- a/src/web-ui/src/app/global-search/providers/fileSearchProvider.ts
+++ b/src/web-ui/src/app/global-search/providers/fileSearchProvider.ts
@@ -84,6 +84,10 @@ export const fileSearchProvider: GlobalSearchProvider = {
     const diagnostics: GlobalSearchProviderDiagnostic[] = remoteWorkspaces.map(workspace => ({
       providerId: 'files',
       code: 'remote_workspace_unsupported',
+      retryable: false,
+      workspaceName: workspace.name,
+      workspacePath: workspace.rootPath,
+      hostLabel: workspace.sshHost,
       message: request.tCommon('nav.search.errors.remoteFileSearchUnavailable', {
         workspace: workspace.name,
       }),
@@ -95,6 +99,9 @@ export const fileSearchProvider: GlobalSearchProvider = {
         diagnostics.push({
           providerId: 'files',
           code: 'workspace_unavailable',
+          workspaceName: workspace?.name,
+          workspacePath: workspace?.rootPath,
+          hostLabel: workspace?.sshHost,
           message: `${workspace?.name ?? 'Workspace'}: ${
             result.reason instanceof Error ? result.reason.message : String(result.reason)
           }`,
diff --git a/src/web-ui/src/app/global-search/providers/interactiveCapabilitySearchProvider.test.ts b/src/web-ui/src/app/global-search/providers/interactiveCapabilitySearchProvider.test.ts
index bee2f55c32..5e9bb8aef1 100644
--- a/src/web-ui/src/app/global-search/providers/interactiveCapabilitySearchProvider.test.ts
+++ b/src/web-ui/src/app/global-search/providers/interactiveCapabilitySearchProvider.test.ts
@@ -1,9 +1,19 @@
+import en from '@/locales/en-US/scenes/capabilities.json';
+import cn from '@/locales/zh-CN/scenes/capabilities.json';
+import tw from '@/locales/zh-TW/scenes/capabilities.json';
 import { describe, expect, it } from 'vitest';
 import { INTERACTIVE_CAPABILITY_CATALOG } from '../interactiveCapabilityCatalog';
 import type { GlobalSearchRequest } from '../types';
 import { interactiveCapabilitySearchProvider } from './interactiveCapabilitySearchProvider';
 
-function request(query: string): GlobalSearchRequest {
+const resources = { 'en-US': en, 'zh-CN': cn, 'zh-TW': tw };
+function translate(locale: keyof typeof resources, key: string): string {
+  const value = key.split('.').reduce<unknown>((current, segment) =>
+    current && typeof current === 'object' ? (current as Record<string, unknown>)[segment] : undefined, resources[locale]);
+  expect(typeof value, `${locale}:${key}`).toBe('string');
+  return String(value);
+}
+function request(query: string, locale: keyof typeof resources = 'en-US'): GlobalSearchRequest {
   return {
     rawQuery: query,
     query,
@@ -12,11 +22,36 @@ function request(query: string): GlobalSearchRequest {
     currentWorkspace: null,
     limitPerGroup: 20,
     tCommon: (key) => key,
+    tCapabilities: key => translate(locale, key),
     tSettings: (key) => key,
   };
 }
 
 describe('interactiveCapabilitySearchProvider', () => {
+  it.each(['en-US', 'zh-CN', 'zh-TW'] as const)('uses %s display labels for both English and Chinese queries', async locale => {
+    const labels: string[] = [];
+    for (const query of ['terminal', '终端']) {
+      const result = await interactiveCapabilitySearchProvider.search(request(query, locale), new AbortController().signal);
+      const terminal = result.items.find(item => item.target.kind === 'capability' && item.target.capabilityId === 'feature.terminal')!;
+      labels.push(terminal.title);
+      expect(terminal.context).not.toContain('feature.');
+      expect(terminal.badge).toBe(translate(locale, 'search.kinds.feature'));
+    }
+    expect(labels[0]).toBe(labels[1]);
+    expect(labels[0]).toBe(translate(locale, 'search.capabilities.feature.terminal.title'));
+  });
+
+  it('provides translated labels for every catalog target and subview', () => {
+    for (const locale of Object.keys(resources) as Array<keyof typeof resources>) {
+      for (const capability of INTERACTIVE_CAPABILITY_CATALOG.capabilities) {
+        translate(locale, `search.capabilities.${capability.id}.title`);
+        translate(locale, `search.capabilities.${capability.id}.summary`);
+        translate(locale, `search.categories.${capability.categoryId}`);
+        for (const item of capability.items) translate(locale, `search.capabilities.${capability.id}.items.${item.id}`);
+      }
+    }
+  });
+
   it('restores accelerated search in the settings catalog', () => {
     const capability = INTERACTIVE_CAPABILITY_CATALOG.capabilities.find(
       ({ id }) => id === 'setting.workspace.session',
@@ -102,9 +137,9 @@ describe('interactiveCapabilitySearchProvider', () => {
         && item.target.capabilityId === 'feature.browser');
       expect(browser).toBeDefined();
       expect(browser?.subtitle.toLowerCase()).toContain(
-        query === '元素选择器' ? '元素选择器' : 'element picker',
+        'element picker',
       );
-      expect(browser?.context).toContain('feature.browser:element-picker');
+      expect(browser?.context).toBe('Projects & development');
     }
   });
 
diff --git a/src/web-ui/src/app/global-search/providers/interactiveCapabilitySearchProvider.ts b/src/web-ui/src/app/global-search/providers/interactiveCapabilitySearchProvider.ts
index 0a6069b07f..ed923be578 100644
--- a/src/web-ui/src/app/global-search/providers/interactiveCapabilitySearchProvider.ts
+++ b/src/web-ui/src/app/global-search/providers/interactiveCapabilitySearchProvider.ts
@@ -7,12 +7,6 @@ import {
 import { scoreTextMatch } from '../searchMatching';
 import type { GlobalSearchProvider } from '../types';
 
-const CJK_QUERY = /[\u3400-\u9fff]/u;
-
-function resultTitle(capability: InteractiveCapability, query: string) {
-  return CJK_QUERY.test(query) ? capability.titleZh : capability.titleEn;
-}
-
 function matchingItem(capability: InteractiveCapability, query: string) {
   const queryTokens = query.trim().split(/[\s._/\\:-]+/u).filter(Boolean);
   return capability.items
@@ -29,25 +23,13 @@ function matchingItem(capability: InteractiveCapability, query: string) {
     .sort((left, right) => right.score - left.score)[0]?.item;
 }
 
-function resultSubtitle(
-  capability: InteractiveCapability,
-  query: string,
-  item: ReturnType<typeof matchingItem>,
-) {
-  const category = INTERACTIVE_CAPABILITY_CATALOG.categories[capability.categoryId];
-  const summary = item
-    ? (CJK_QUERY.test(query) ? item.titleZh : item.titleEn)
-    : (CJK_QUERY.test(query) ? capability.summaryZh : capability.summaryEn);
-  const categoryTitle = CJK_QUERY.test(query) ? category?.titleZh : category?.titleEn;
-  return [categoryTitle, summary].filter(Boolean).join(' · ');
-}
-
 export const interactiveCapabilitySearchProvider: GlobalSearchProvider = {
   id: 'interactive-capabilities',
   groups: ['capabilities', 'settings'],
   search: (request) => {
     if (request.scope === 'content' || !request.query) return { items: [] };
 
+    const t = request.tCapabilities;
     const catalog = request.currentWorkspace?.workspaceKind === 'remote'
       ? getInteractiveCapabilityCatalog(false)
       : INTERACTIVE_CAPABILITY_CATALOG;
@@ -73,10 +55,12 @@ export const interactiveCapabilitySearchProvider: GlobalSearchProvider = {
           id: `capability:${capability.id}`,
           providerId: 'interactive-capabilities',
           group: capability.kind === 'setting' ? 'settings' as const : 'capabilities' as const,
-          title: resultTitle(capability, request.query),
-          subtitle: resultSubtitle(capability, request.query, item),
-          context: item ? `${capability.id}:${item.id}` : capability.id,
-          badge: capability.kind,
+          title: t(`search.capabilities.${capability.id}.title`),
+          subtitle: item
+            ? t(`search.capabilities.${capability.id}.items.${item.id}`)
+            : t(`search.capabilities.${capability.id}.summary`),
+          context: t(`search.categories.${capability.categoryId}`),
+          badge: t(`search.kinds.${capability.kind}`),
           score: textScore > 0 ? textScore + directControlBonus + delegatedControlBonus : 0,
           target: {
             kind: 'capability' as const,
diff --git a/src/web-ui/src/app/global-search/providers/sessionContentSearchProvider.ts b/src/web-ui/src/app/global-search/providers/sessionContentSearchProvider.ts
index 87cd6c4f70..aa68f0c610 100644
--- a/src/web-ui/src/app/global-search/providers/sessionContentSearchProvider.ts
+++ b/src/web-ui/src/app/global-search/providers/sessionContentSearchProvider.ts
@@ -67,6 +67,9 @@ export const sessionContentSearchProvider: GlobalSearchProvider = {
         diagnostics.push({
           providerId: 'session-content',
           code: 'workspace_unavailable',
+          workspaceName: workspace?.name,
+          workspacePath: workspace?.rootPath,
+          hostLabel: workspace?.sshHost,
           message: `${workspace?.name ?? 'Workspace'}: ${
             result.reason instanceof Error ? result.reason.message : String(result.reason)
           }`,
@@ -80,6 +83,9 @@ export const sessionContentSearchProvider: GlobalSearchProvider = {
       diagnostics.push(...(result.value.response.diagnostics ?? []).map((diagnostic) => ({
         providerId: 'session-content',
         code: diagnostic.code,
+        workspaceName: workspace?.name,
+        workspacePath: workspace?.rootPath,
+        hostLabel: workspace?.sshHost,
         message: diagnostic.message,
       })));
     });
diff --git a/src/web-ui/src/app/global-search/types.ts b/src/web-ui/src/app/global-search/types.ts
index 9a6062c37f..cd89b9c8c1 100644
--- a/src/web-ui/src/app/global-search/types.ts
+++ b/src/web-ui/src/app/global-search/types.ts
@@ -59,6 +59,10 @@ export interface GlobalSearchProviderDiagnostic {
   providerId: string;
   code: string;
   message: string;
+  workspaceName?: string;
+  workspacePath?: string;
+  hostLabel?: string;
+  retryable?: boolean;
 }
 
 export interface GlobalSearchProviderResult {
@@ -75,6 +79,7 @@ export interface GlobalSearchRequest {
   currentWorkspace: WorkspaceInfo | null;
   limitPerGroup: number;
   tCommon: (key: string, options?: Record<string, unknown>) => string;
+  tCapabilities: (key: string, options?: Record<string, unknown>) => string;
   tSettings: (key: string, options?: Record<string, unknown>) => string;
 }
 
diff --git a/src/web-ui/src/app/scenes/agents/components/CreateAgentDialog.test.tsx b/src/web-ui/src/app/scenes/agents/components/CreateAgentDialog.test.tsx
index 4717830b59..55529c3650 100644
--- a/src/web-ui/src/app/scenes/agents/components/CreateAgentDialog.test.tsx
+++ b/src/web-ui/src/app/scenes/agents/components/CreateAgentDialog.test.tsx
@@ -4,10 +4,14 @@ import { createRoot, type Root } from 'react-dom/client';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import type { Editor } from '@tiptap/core';
 import CreateAgentDialog from './CreateAgentDialog';
+import CreateAgentPage from './CreateAgentPage';
 import { activateSurface } from '@/infrastructure/peer-device/deviceSurface';
 
 const mocks = vi.hoisted(() => ({
   create: vi.fn(),
+  detail: vi.fn(),
+  update: vi.fn(),
+  editingId: null as string | null,
   tools: vi.fn(),
   error: vi.fn(),
   success: vi.fn(),
@@ -20,7 +24,7 @@ vi.mock('@/infrastructure/contexts/WorkspaceContext', () => ({
   useCurrentWorkspace: () => ({ workspace: mocks.workspace, hasWorkspace: Boolean(mocks.workspace) }),
 }));
 vi.mock('@/infrastructure/api/service-api/CustomAgentAPI', () => ({
-  CustomAgentAPI: { createCustomAgent: mocks.create },
+  CustomAgentAPI: { createCustomAgent: mocks.create, getCustomAgentDetail: mocks.detail, updateCustomAgent: mocks.update },
 }));
 vi.mock('@/infrastructure/api/service-api/ToolAPI', () => ({
   toolAPI: { getAllToolsInfo: mocks.tools },
@@ -29,7 +33,7 @@ vi.mock('@/shared/notification-system', () => ({
   useNotification: () => ({ error: mocks.error, success: mocks.success }),
 }));
 vi.mock('../agentsStore', () => ({
-  useAgentsStore: () => ({ openHome: vi.fn(), agentEditorMode: 'create', editingAgentId: null }),
+  useAgentsStore: () => ({ openHome: vi.fn(), agentEditorMode: mocks.editingId ? 'edit' : 'create', editingAgentId: mocks.editingId }),
 }));
 vi.mock('./useUserToolGroups', () => ({
   useUserToolGroups: () => ({ groups: [], saveGroups: vi.fn() }),
@@ -95,6 +99,7 @@ beforeEach(() => {
   Range.prototype.getBoundingClientRect = () => new DOMRect();
   vi.clearAllMocks();
   mocks.workspace = { id: 'workspace-1' };
+  mocks.editingId = null;
   mocks.tools.mockReset().mockResolvedValue(tools);
   mocks.create.mockReset().mockResolvedValue(undefined);
   activateSurface('local');
@@ -116,9 +121,10 @@ describe('guided agent creation', () => {
     expect(dialog().querySelectorAll('[aria-current="step"]')).toHaveLength(1);
     expect(dialog().querySelector('textarea')).toBeNull();
     await submit();
-    expect(field('id').getAttribute('aria-invalid')).toBe('true');
+    expect(field('name').getAttribute('aria-invalid')).toBe('true');
+    expect(field('id').value).toMatch(/^agent-[a-f0-9]{8}$/);
     expect(field('description').getAttribute('aria-invalid')).toBe('true');
-    expect(document.activeElement).toBe(field('id'));
+    expect(document.activeElement).toBe(field('name'));
     fill('id', '9-invalid');
     fill('description', 'Research a topic');
     await submit();
@@ -159,6 +165,69 @@ describe('guided agent creation', () => {
     expect(onClose).toHaveBeenCalledOnce();
   });
 
+  it('opens and suggests an ID in a WebView without randomUUID', async () => {
+    vi.stubGlobal('crypto', {});
+    try {
+      await render();
+      fill('name', '中文智能体');
+      expect(field('id').value).toMatch(/^agent-[a-z0-9]+-[a-z0-9]*$/);
+      expect(document.activeElement).toBe(field('name'));
+    } finally {
+      vi.unstubAllGlobals();
+    }
+  });
+
+  it('keeps advanced permissions collapsed in the full page and creates from the task template', async () => {
+    await act(async () => root.render(<div role="dialog"><CreateAgentPage /></div>));
+    await act(async () => { await vi.dynamicImportSettled(); });
+    expect(field('name').placeholder).toBe(copy('createNamePlaceholder'));
+    const permissions = [...dialog().querySelectorAll('summary')].find(summary => summary.textContent === copy('permissionsStandard'))!;
+    expect(permissions.closest('details')?.open).toBe(false);
+    fill('name', 'Research helper');
+    fill('description', 'Research a topic');
+    expect(field('id').value).toBe('research-helper');
+    await click(copy('usePromptTemplate'));
+    await submit();
+    expect(mocks.create).toHaveBeenCalledWith(expect.objectContaining({
+      id: 'research-helper', name: 'Research helper', description: 'Research a topic',
+      prompt: copy('promptTemplate'), readonly: false,
+    }));
+  });
+
+  it('keeps an existing identifier when the display name changes', async () => {
+    mocks.editingId = 'legacy-id';
+    mocks.detail.mockResolvedValue({ kind: 'mode', level: 'user', agentId: 'legacy-id', name: 'Existing',
+      description: 'Existing goal', prompt: 'Existing instructions', readonly: false, review: false,
+      tools: ['Read'], userContextPolicy: ['workspace_context'] });
+    mocks.update.mockResolvedValue(undefined);
+    await act(async () => root.render(<div role="dialog"><CreateAgentPage /></div>));
+    await act(async () => { await vi.dynamicImportSettled(); });
+    fill('name', 'New display name');
+    expect(field('id').disabled).toBe(true);
+    expect(field('id').value).toBe('legacy-id');
+    await submit();
+    expect(mocks.update).toHaveBeenCalledWith(expect.objectContaining({ agentId: 'legacy-id', name: 'New display name' }));
+    expect(mocks.create).not.toHaveBeenCalled();
+  });
+
+  it('starts with a name, generates a portable ID and preserves a manual override', async () => {
+    await render();
+    expect(document.activeElement).toBe(field('name'));
+    fill('name', 'Research helper');
+    expect(field('id').value).toBe('research-helper');
+    fill('id', 'my-stable-id');
+    fill('name', 'Renamed helper');
+    expect(field('id').value).toBe('my-stable-id');
+    fill('description', 'Research a topic');
+    await submit();
+    await act(async () => { await vi.dynamicImportSettled(); });
+    await click(copy('usePromptTemplate'));
+    expect(promptEditor().getText()).toContain(copy('promptTemplate'));
+    expect(button(copy('usePromptTemplate'))).toBeUndefined();
+    await submit();
+    expect(dialog().querySelector('[data-testid="custom-agent-tool-groups"]')?.closest('details')?.open).toBe(false);
+  });
+
   it.each(['text', 'source-html', 'markdown-editor'])('renders pasted Markdown from %s and keeps its structure across steps', async (format) => {
     await render();
     await completeBasics();
@@ -276,7 +345,8 @@ describe('guided agent creation', () => {
     expect(onCreated).not.toHaveBeenCalled();
     expect(onClose).not.toHaveBeenCalled();
     expect(mocks.success).not.toHaveBeenCalled();
-    expect(field('id').value).toBe('');
+    expect(field('id').value).toMatch(/^agent-[a-f0-9]{8}$/);
+    expect(field('name').value).toBe('');
   });
 
   it('resets the draft when the workspace or peer surface changes', async () => {
@@ -284,11 +354,13 @@ describe('guided agent creation', () => {
     await completeBasics();
     mocks.workspace = { id: 'workspace-2' };
     await render();
-    expect(field('id').value).toBe('');
+    expect(field('id').value).toMatch(/^agent-[a-f0-9]{8}$/);
+    expect(field('name').value).toBe('');
     expect(dialog().querySelector('textarea')).toBeNull();
     await completeBasics();
     await act(async () => { activateSurface('peer-device'); });
-    expect(field('id').value).toBe('');
+    expect(field('id').value).toMatch(/^agent-[a-f0-9]{8}$/);
+    expect(field('name').value).toBe('');
     expect(dialog().querySelector('textarea')).toBeNull();
     expect(mocks.create).not.toHaveBeenCalled();
   });
diff --git a/src/web-ui/src/app/scenes/agents/components/CreateAgentPage.tsx b/src/web-ui/src/app/scenes/agents/components/CreateAgentPage.tsx
index 4a15cd1112..546ecd1fcc 100644
--- a/src/web-ui/src/app/scenes/agents/components/CreateAgentPage.tsx
+++ b/src/web-ui/src/app/scenes/agents/components/CreateAgentPage.tsx
@@ -22,6 +22,7 @@ import {
   normalizeReviewModeState,
   type SubagentEditorToolInfo,
 } from './subagentEditorUtils';
+import { createSuggestedAgentId, suggestAgentId } from './suggestAgentId';
 import { ToolGroupPicker, ToolGroupSummary } from './ToolGroupPicker';
 import { useUserToolGroups } from './useUserToolGroups';
 import '../AgentsView.scss';
@@ -111,7 +112,7 @@ const CreateAgentPage: React.FC<CreateAgentPageProps> = ({ standalone = false, t
   const closeEditor = onCancel ?? openHome;
   const formInstanceId = React.useId();
   const formId = `${formInstanceId}-custom-agent-form`;
-  const fieldId = (field: string) => `${formInstanceId}-custom-agent-${field}`;
+  const fieldId = useCallback((field: string) => `${formInstanceId}-custom-agent-${field}`, [formInstanceId]);
   const formRef = useRef<HTMLFormElement>(null);
   const promptControlRef = useRef<HTMLDivElement>(null);
   const [step, setStep] = useState(0);
@@ -158,9 +159,12 @@ const CreateAgentPage: React.FC<CreateAgentPageProps> = ({ standalone = false, t
 
   const [kind, setKind] = useState<CustomAgentKind>('mode');
   const [level, setLevel] = useState<CustomAgentLevel>('user');
-  const [agentId, setAgentId] = useState('');
+  const [generatedId] = useState(createSuggestedAgentId);
+  const [agentId, setAgentId] = useState(generatedId);
+  const agentIdCustomized = useRef(false);
   const [agentIdError, setAgentIdError] = useState<string | null>(null);
   const [name, setName] = useState('');
+  const [nameError, setNameError] = useState(false);
   const [description, setDescription] = useState('');
   const [descriptionError, setDescriptionError] = useState(false);
   const [prompt, setPrompt] = useState('');
@@ -381,22 +385,23 @@ const CreateAgentPage: React.FC<CreateAgentPageProps> = ({ standalone = false, t
     project_layout: t('agentsOverview.form.contextProjectLayoutTooltip'),
   };
 
-  const focusField = (field: string) => {
+  const focusField = useCallback((field: string) => {
     if (field === 'prompt') {
       promptControlRef.current?.querySelector<HTMLElement>('[contenteditable="true"], textarea')?.focus({ preventScroll: true });
       return;
     }
     const control = formRef.current?.elements.namedItem(fieldId(field));
     if (control instanceof HTMLElement) control.focus();
-  };
+  }, [fieldId]);
 
   const handleNext = () => {
     if (step === 0) {
       const idError = validateAgentId(agentId);
       setAgentIdError(idError);
+      setNameError(!name.trim());
       setDescriptionError(!description.trim());
-      if (idError || !description.trim()) {
-        focusField(idError ? 'id' : 'description');
+      if (!name.trim() || idError || !description.trim()) {
+        focusField(!name.trim() ? 'name' : idError ? 'id' : 'description');
         return;
       }
     }
@@ -416,6 +421,11 @@ const CreateAgentPage: React.FC<CreateAgentPageProps> = ({ standalone = false, t
     if (nextAgentIdError) {
       return;
     }
+    if (!isEdit && !name.trim()) {
+      setNameError(true);
+      focusField('name');
+      return;
+    }
     if (!description.trim()) {
       notification.error(t('agentsOverview.form.descRequired'));
       return;
@@ -492,6 +502,7 @@ const CreateAgentPage: React.FC<CreateAgentPageProps> = ({ standalone = false, t
     agentId,
     description,
     editingAgentId,
+    focusField,
     isEdit,
     kind,
     level,
@@ -595,6 +606,50 @@ const CreateAgentPage: React.FC<CreateAgentPageProps> = ({ standalone = false, t
         <h3>{t('agentsOverview.form.basicInformation')}</h3>
       </div>
 
+      <div className="th-create-panel__field">
+        <label className="th-create-panel__label" htmlFor={fieldId('name')}>
+          {t('agentsOverview.form.name')}
+        </label>
+        <Input
+          id={fieldId('name')}
+          value={name}
+          onChange={(event) => {
+            const nextName = event.target.value;
+            setName(nextName);
+            setNameError(false);
+            if (!isEdit && !agentIdCustomized.current) setAgentId(suggestAgentId(nextName, generatedId));
+          }}
+          invalid={nameError}
+          aria-describedby={nameError ? fieldId('name-error') : undefined}
+          placeholder={t(isEdit ? 'agentsOverview.form.namePlaceholder' : 'agentsOverview.form.createNamePlaceholder')}
+          size="sm"
+        />
+        {nameError && <span id={fieldId('name-error')} className="th-create-panel__error" role="alert">{t('agentsOverview.form.nameRequired')}</span>}
+      </div>
+
+      <div className="th-create-panel__field">
+        <label className="th-create-panel__label" htmlFor={fieldId('description')}>
+          {t('agentsOverview.form.description')}
+        </label>
+        <Input
+          id={fieldId('description')}
+          value={description}
+          onChange={(event) => {
+            setDescription(event.target.value);
+            setDescriptionError(false);
+          }}
+          invalid={descriptionError}
+          aria-describedby={descriptionError ? fieldId('description-error') : undefined}
+          placeholder={t('agentsOverview.form.descPlaceholder')}
+          size="sm"
+        />
+        {descriptionError && (
+          <span id={fieldId('description-error')} className="th-create-panel__error" role="alert">
+            {t('agentsOverview.form.descRequired')}
+          </span>
+        )}
+      </div>
+
       <div className="th-create-panel__field" data-openbitfun-component="create-agent-page" data-openbitfun-part="field">
         <span className="th-create-panel__label">{t('agentsOverview.form.kind')}</span>
         <div
@@ -633,7 +688,9 @@ const CreateAgentPage: React.FC<CreateAgentPageProps> = ({ standalone = false, t
         </div>
       </div>
 
-      <div className="th-create-panel__identity-fields">
+      <details className="th-create-panel__field" open={isEdit || !!agentIdError || undefined}>
+        <summary>{t('agentsOverview.form.identityDetails')}</summary>
+        <p className="th-create-panel__label-hint">{t('agentsOverview.form.idHelp')}</p>
         <div className="th-create-panel__field">
           <label className="th-create-panel__label" htmlFor={fieldId('id')}>
             {t('agentsOverview.form.id')}
@@ -642,6 +699,7 @@ const CreateAgentPage: React.FC<CreateAgentPageProps> = ({ standalone = false, t
             id={fieldId('id')}
             value={agentId}
             onChange={(event) => {
+              agentIdCustomized.current = true;
               setAgentId(event.target.value);
               setAgentIdError(validateAgentId(event.target.value));
             }}
@@ -657,42 +715,7 @@ const CreateAgentPage: React.FC<CreateAgentPageProps> = ({ standalone = false, t
           ) : null}
         </div>
 
-        <div className="th-create-panel__field">
-          <label className="th-create-panel__label" htmlFor={fieldId('name')}>
-            {t('agentsOverview.form.name')}
-          </label>
-          <Input
-            id={fieldId('name')}
-            value={name}
-            onChange={(event) => setName(event.target.value)}
-            placeholder={t('agentsOverview.form.namePlaceholder')}
-            size="sm"
-          />
-        </div>
-      </div>
-
-      <div className="th-create-panel__field">
-        <label className="th-create-panel__label" htmlFor={fieldId('description')}>
-          {t('agentsOverview.form.description')}
-        </label>
-        <Input
-          id={fieldId('description')}
-          value={description}
-          onChange={(event) => {
-            setDescription(event.target.value);
-            setDescriptionError(false);
-          }}
-          invalid={descriptionError}
-          aria-describedby={descriptionError ? fieldId('description-error') : undefined}
-          placeholder={t('agentsOverview.form.descPlaceholder')}
-          size="sm"
-        />
-        {descriptionError && (
-          <span id={fieldId('description-error')} className="th-create-panel__error" role="alert">
-            {t('agentsOverview.form.descRequired')}
-          </span>
-        )}
-      </div>
+      </details>
 
       {kind === 'subagent' ? (
         <div className="th-create-panel__field">
@@ -733,7 +756,6 @@ const CreateAgentPage: React.FC<CreateAgentPageProps> = ({ standalone = false, t
           </div>
         </div>
       ) : null}
-      {!standalone && permissionControls}
     </div>
   );
   const toolSelection = selectableTools.length > 0 ? (
@@ -798,6 +820,10 @@ const CreateAgentPage: React.FC<CreateAgentPageProps> = ({ standalone = false, t
         )}
       </div>
       {standalone ? (
+        <>
+          <ToolGroupSummary grouped={false} tools={selectableGroupTools} selectedToolNames={Array.from(selectedTools)} userGroups={userToolGroups} />
+          <details className="th-create-panel__field">
+            <summary>{t('agentsOverview.form.customizeTools')}</summary>
         <ToolGroupPicker
           grouped={false}
           tools={selectableGroupTools}
@@ -809,6 +835,8 @@ const CreateAgentPage: React.FC<CreateAgentPageProps> = ({ standalone = false, t
           disabled={submitting}
           testId="custom-agent-tool-groups"
         />
+          </details>
+        </>
       ) : toolsEditing ? (
         <ScrollArea className="th-create-panel__tool-editor" overscrollBehaviorY="contain">
           <ToolGroupPicker
@@ -844,6 +872,15 @@ const CreateAgentPage: React.FC<CreateAgentPageProps> = ({ standalone = false, t
           {t('agentsOverview.form.prompt')}
         </span>
       </h3>
+      {!isEdit && !prompt.trim() && (
+        <div className="th-create-panel__field">
+          <p className="th-create-panel__label-hint">{t('agentsOverview.form.promptGuide')}</p>
+          <Button type="button" size="sm" variant="outline" onClick={() => {
+            setPrompt(t('agentsOverview.form.promptTemplate', { goal: description.trim() }));
+            setPromptError(false);
+          }}>{t('agentsOverview.form.usePromptTemplate')}</Button>
+        </div>
+      )}
       <div
         className="th-create-panel__prompt-editor"
         data-openbitfun-component="create-agent-page"
@@ -982,7 +1019,10 @@ const CreateAgentPage: React.FC<CreateAgentPageProps> = ({ standalone = false, t
             {(!standalone || step === 0) && basicInformation}
             {(!standalone || step === 2) && (
               <>
-                {standalone && permissionControls}
+                <details className="th-create-panel__field">
+                  <summary>{t(readonly ? 'agentsOverview.form.permissionsReadonly' : 'agentsOverview.form.permissionsStandard')}</summary>
+                  {permissionControls}
+                </details>
                 {standalone && toolsLoading ? (
                   <p className="th__title-sub" role="status">{t('agentsOverview.form.wizard.loadingTools')}</p>
                 ) : standalone && toolsLoadError ? (
diff --git a/src/web-ui/src/app/scenes/agents/components/suggestAgentId.test.ts b/src/web-ui/src/app/scenes/agents/components/suggestAgentId.test.ts
new file mode 100644
index 0000000000..69f49fb4b4
--- /dev/null
+++ b/src/web-ui/src/app/scenes/agents/components/suggestAgentId.test.ts
@@ -0,0 +1,16 @@
+import { afterEach, expect, it, vi } from 'vitest';
+import { createSuggestedAgentId, suggestAgentId } from './suggestAgentId';
+afterEach(() => vi.unstubAllGlobals());
+it.each([
+  ['Research Helper', 'research-helper'], ['123 review', 'agent-123-review'],
+  ['Résumé', 'resume'], ['中文智能体', 'agent-fallback'], ['../../', 'agent-fallback'],
+])('suggests a portable ID for %s', (name, expected) => {
+  expect(suggestAgentId(name, 'agent-fallback')).toBe(expected);
+});
+
+it.each([undefined, {}])('generates valid fallback IDs without randomUUID (%s)', crypto => {
+  vi.stubGlobal('crypto', crypto);
+  const id = createSuggestedAgentId();
+  expect(id).toMatch(/^agent-[a-z0-9]+-[a-z0-9]*$/);
+  expect(suggestAgentId('中文智能体', id)).toBe(id);
+});
diff --git a/src/web-ui/src/app/scenes/agents/components/suggestAgentId.ts b/src/web-ui/src/app/scenes/agents/components/suggestAgentId.ts
new file mode 100644
index 0000000000..84b2631068
--- /dev/null
+++ b/src/web-ui/src/app/scenes/agents/components/suggestAgentId.ts
@@ -0,0 +1,14 @@
+/** Generate a portable ID even in WebViews without randomUUID. */
+export function createSuggestedAgentId(): string {
+  const suffix = typeof globalThis.crypto?.randomUUID === 'function'
+    ? globalThis.crypto.randomUUID().slice(0, 8)
+    : `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 10)}`;
+  return `agent-${suffix}`;
+}
+
+/** IDs are portable filenames; display names remain unrestricted and localized. */
+export function suggestAgentId(name: string, fallback: string): string {
+  const slug = name.normalize('NFKD').replace(/[\u0300-\u036f]/g, '')
+    .toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-+|-+$/g, '');
+  return slug ? (/^[a-z]/.test(slug) ? slug : `agent-${slug}`) : fallback;
+}
diff --git a/src/web-ui/src/app/scenes/git/AGENTS.md b/src/web-ui/src/app/scenes/git/AGENTS.md
new file mode 100644
index 0000000000..fee740bc98
--- /dev/null
+++ b/src/web-ui/src/app/scenes/git/AGENTS.md
@@ -0,0 +1,15 @@
+# Git scene presentation
+
+Follow the Web UI guide. Repository state and operation routing stay in `tools/git`;
+keep workspace identity explicit and use `gitSceneStore` for history/branch navigation.
+
+For working-copy empty states, clean/unpublished commits, conflict visibility,
+and repository identity, run from the repository root:
+
+```bash
+pnpm --dir src/web-ui run test:run src/app/scenes/git/views/WorkingCopyView.test.tsx
+pnpm run check:web
+```
+
+These DOM fixtures use mocked host calls. They do not establish live SSH or Peer behavior.
+For refresh or state ownership changes, also follow `src/web-ui/src/tools/git/AGENTS.md`.
diff --git a/src/web-ui/src/app/scenes/git/GitScene.tsx b/src/web-ui/src/app/scenes/git/GitScene.tsx
index fa434251c3..7de8848ce6 100644
--- a/src/web-ui/src/app/scenes/git/GitScene.tsx
+++ b/src/web-ui/src/app/scenes/git/GitScene.tsx
@@ -16,6 +16,7 @@ import { globalEventBus } from '@/infrastructure/event-bus';
 import { requestGitRepositoryTrust } from '@/shared/services/gitTrustService';
 import { isSurfaceChangedError } from '@/infrastructure/peer-device/deviceSurface';
 import './GitScene.scss';
+import { usePeerDeviceModeOptional } from '@/infrastructure/peer-device/peerDeviceContextState';
 
 interface GitSceneProps {
   workspacePath?: string;
@@ -29,6 +30,8 @@ const GitScene: React.FC<GitSceneProps> = ({
   const { workspace } = useCurrentWorkspace();
   const workspacePath = workspacePathProp ?? workspace?.rootPath ?? '';
   const { t } = useTranslation('panels/git');
+  const peer = usePeerDeviceModeOptional();
+  const hostLabel = workspace?.connectionName || (peer?.peerMode.active ? peer.peerMode.deviceName : t('workingCopy.currentHost'));
   const activeView = useGitSceneStore((s) => s.activeView);
 
   const [forceReset, setForceReset] = useState(false);
@@ -103,9 +106,9 @@ const GitScene: React.FC<GitSceneProps> = ({
         return <GraphView workspaceId={workspace?.id} workspacePath={workspacePath} />;
       case 'working-copy':
       default:
-        return <WorkingCopyView workspaceId={workspace?.id} workspacePath={workspacePath} isActive={isActive} />;
+        return <WorkingCopyView hostLabel={hostLabel} workspaceId={workspace?.id} workspacePath={workspacePath} isActive={isActive} />;
     }
-  }, [activeView, isActive, workspacePath, workspace?.id]);
+  }, [activeView, isActive, workspacePath, workspace?.id, hostLabel]);
 
   if (!isActive) {
     return <div className="openbitfun-git-scene" aria-hidden="true" data-openbitfun-scene="git" data-openbitfun-part="root" data-openbitfun-view="hidden" />;
diff --git a/src/web-ui/src/app/scenes/git/views/WorkingCopyView.scss b/src/web-ui/src/app/scenes/git/views/WorkingCopyView.scss
index 16cfb2cd63..a34e4f919a 100644
--- a/src/web-ui/src/app/scenes/git/views/WorkingCopyView.scss
+++ b/src/web-ui/src/app/scenes/git/views/WorkingCopyView.scss
@@ -190,3 +190,12 @@
   opacity: 0.7;
   pointer-events: none;
 }
+
+.openbitfun-git-scene-working-copy__overview {
+  margin: auto;
+  padding: var(--openbitfun-space-6);
+  max-inline-size: 640px;
+}
+.openbitfun-git-scene-working-copy__repository-path {
+  overflow-wrap: anywhere;
+}
diff --git a/src/web-ui/src/app/scenes/git/views/WorkingCopyView.test.tsx b/src/web-ui/src/app/scenes/git/views/WorkingCopyView.test.tsx
new file mode 100644
index 0000000000..5917dd4b83
--- /dev/null
+++ b/src/web-ui/src/app/scenes/git/views/WorkingCopyView.test.tsx
@@ -0,0 +1,69 @@
+// @vitest-environment jsdom
+import React, { act } from 'react';
+import { createRoot, type Root } from 'react-dom/client';
+import { afterEach, beforeEach, expect, it, vi } from 'vitest';
+import WorkingCopyView from './WorkingCopyView';
+import { useGitSceneStore } from '../gitSceneStore';
+const mock = vi.hoisted(() => ({
+  state: { currentBranch: 'main', staged: [] as Array<{ path: string; status: string }>,
+    unstaged: [] as Array<{ path: string; status: string }>, untracked: [] as string[], conflicts: [] as string[],
+    ahead: 0, behind: 0, error: null as string | null, state: { lastRefreshTime: { status: 123 } } },
+  push: vi.fn(), pull: vi.fn(), refresh: vi.fn(), scope: vi.fn(),
+}));
+vi.mock('@/tools/git/hooks', () => ({
+  useGitState: (options: unknown) => { mock.scope(options); return { ...mock.state, refresh: mock.refresh }; },
+  useGitOperations: () => ({ isOperating: false, push: mock.push, pull: mock.pull }),
+  useGitAgent: () => ({ isGeneratingCommit: false }),
+}));
+vi.mock('@/infrastructure/hooks/useShortcut', () => ({ useShortcut: vi.fn() }));
+vi.mock('@/infrastructure/i18n/hooks/useI18n', () => ({ useI18n: () => ({
+  t: (key: string, values?: Record<string, unknown>) => `${key}${values ? JSON.stringify(values) : ''}`, formatNumber: String,
+}) }));
+vi.mock('@/app/components/panels/content-canvas', () => ({ ContentCanvas: ({ emptyState }: { emptyState: React.ReactNode }) => <div>{emptyState}</div> }));
+vi.mock('@/shared/utils/tabUtils', () => ({ createGitDiffEditorTab: vi.fn(), createGitCodeEditorTab: vi.fn() }));
+vi.mock('@/tools/git/services', () => ({ gitService: {} }));
+vi.mock('@/shared/notification-system', () => ({ useNotification: () => ({}) }));
+let root: Root, host: HTMLDivElement;
+beforeEach(() => {
+  vi.clearAllMocks();
+  Object.assign(mock.state, { staged: [], unstaged: [], untracked: [], conflicts: [], ahead: 0, behind: 0, error: null });
+  host = document.createElement('div'); document.body.append(host); root = createRoot(host);
+  useGitSceneStore.getState().setActiveView('working-copy');
+});
+afterEach(async () => { await act(async () => root.unmount()); host.remove(); });
+const render = async () => { await act(async () => root.render(<WorkingCopyView workspaceId="ssh-project" workspacePath="/srv/project" hostLabel="Build host" />)); };
+it('shows clean status, repository identity and real history/branch actions without a commit form', async () => {
+  await render();
+  expect(host.textContent).toContain('workingCopy.clean');
+  expect(host.textContent).toContain('Build host · /srv/project');
+  expect(host.querySelector('textarea')).toBeNull();
+  expect(mock.scope).toHaveBeenCalledWith(expect.objectContaining({ repositoryPath: { workspaceId: 'ssh-project', repositoryPath: '/srv/project' } }));
+  const button = (label: string) => Array.from(host.querySelectorAll('button')).find(button => button.textContent === label)!;
+  await act(async () => button('tabs.commits').click());
+  expect(useGitSceneStore.getState().activeView).toBe('graph');
+  await act(async () => button('tabs.branches').click());
+  expect(useGitSceneStore.getState().activeView).toBe('branches');
+  expect(mock.push).not.toHaveBeenCalled();
+});
+it('distinguishes a clean tree from unpublished commits and only pushes on explicit action', async () => {
+  mock.state.ahead = 2; mock.state.behind = 1;
+  await render();
+  expect(host.textContent).toContain('workingCopy.unpushed');
+  expect(host.textContent).toContain('"ahead":"2","behind":"1"');
+  expect(mock.push).not.toHaveBeenCalled();
+  await act(async () => host.querySelector<HTMLButtonElement>('[aria-label="actions.push"]')!.click());
+  expect(mock.push).toHaveBeenCalledExactlyOnceWith({ force: false });
+});
+it.each(['untracked', 'conflicts'] as const)('never claims a clean tree with %s', async field => {
+  mock.state[field] = ['new.txt'];
+  await render();
+  expect(host.textContent).not.toContain('workingCopy.clean');
+  expect(host.querySelector('textarea')).not.toBeNull();
+});
+it('surfaces a failed status read instead of claiming a clean tree', async () => {
+  mock.state.error = 'Peer disconnected';
+  await render();
+  expect(host.textContent).toContain('workingCopy.statusUnavailable');
+  expect(host.textContent).toContain('Peer disconnected');
+  expect(host.textContent).not.toContain('workingCopy.clean');
+});
diff --git a/src/web-ui/src/app/scenes/git/views/WorkingCopyView.tsx b/src/web-ui/src/app/scenes/git/views/WorkingCopyView.tsx
index cef47b8ae1..f9d23eebfb 100644
--- a/src/web-ui/src/app/scenes/git/views/WorkingCopyView.tsx
+++ b/src/web-ui/src/app/scenes/git/views/WorkingCopyView.tsx
@@ -2,9 +2,8 @@
  * WorkingCopyView — Git working copy: commit bar + file list + diff area (ContentCanvas mode=git).
  */
 
-import { OverflowText, Button, Icon, IconButton, SearchField, Textarea, Tooltip } from '@openbitfun/ui';
+import { OverflowText, Button, Empty, Icon, IconButton, SearchField, Textarea, Tooltip } from '@openbitfun/ui';
 import React, { useCallback, useState, useMemo, useEffect, useRef } from 'react';
-import { useTranslation } from 'react-i18next';
 import { Minus, RotateCcw, Square, FileCode2 } from 'lucide-react';
 import { useI18n } from '@/infrastructure/i18n/hooks/useI18n';
 import { ContentCanvas } from '@/app/components/panels/content-canvas';
@@ -15,6 +14,7 @@ import { createGitDiffEditorTab, createGitCodeEditorTab } from '@/shared/utils/t
 import { useNotification } from '@/shared/notification-system';
 import { createLogger } from '@/shared/utils/logger';
 import './WorkingCopyView.scss';
+import { useGitSceneStore } from '../gitSceneStore';
 
 const log = createLogger('WorkingCopyView');
 
@@ -43,14 +43,16 @@ interface WorkingCopyViewProps {
   workspacePath?: string;
   workspaceId?: string;
   isActive?: boolean;
+  hostLabel?: string;
 }
 
 const WorkingCopyView: React.FC<WorkingCopyViewProps> = ({
   workspacePath,
   workspaceId,
   isActive = true,
+  hostLabel,
 }) => {
-  const { t } = useTranslation('panels/git');
+  const { t, formatNumber } = useI18n('panels/git');
   const { t: tComponents } = useI18n('components');
   const notification = useNotification();
 
@@ -63,6 +65,9 @@ const WorkingCopyView: React.FC<WorkingCopyViewProps> = ({
   const mainRef = useRef<HTMLDivElement>(null);
 
   const {
+    state,
+    error: statusError,
+    conflicts,
     currentBranch,
     staged,
     unstaged,
@@ -85,6 +90,10 @@ const WorkingCopyView: React.FC<WorkingCopyViewProps> = ({
     [currentBranch, staged, unstaged, untracked, ahead, behind]
   );
 
+  const hasChanges = Boolean(staged.length || unstaged.length || untracked.length || conflicts.length);
+  const statusReady = Boolean(state?.lastRefreshTime.status) && !statusError;
+  const clean = statusReady && !hasChanges;
+
   const { isOperating, addFiles, commit, push, pull } = useGitOperations({
     repositoryPath: { workspaceId: workspaceId ?? '', repositoryPath: workspacePath },
     autoRefresh: false,
@@ -311,7 +320,7 @@ const WorkingCopyView: React.FC<WorkingCopyViewProps> = ({
         <div className="openbitfun-git-scene-working-copy__placeholder" data-openbitfun-component="working-copy-view" data-openbitfun-part="placeholder">
           <FileCode2 size={48} aria-hidden />
           <p>{t('tabs.changes')}</p>
-          <p className="openbitfun-git-scene-working-copy__hint">Open a workspace to see changes.</p>
+          <p className="openbitfun-git-scene-working-copy__hint">{t('workingCopy.openWorkspace')}</p>
         </div>
       </div>
     );
@@ -354,6 +363,7 @@ const WorkingCopyView: React.FC<WorkingCopyViewProps> = ({
             </Tooltip>
           </div>
         </div>
+        {!clean && <>
         <div className="openbitfun-git-scene-working-copy__commit-input-row" data-openbitfun-component="working-copy-view" data-openbitfun-part="commitInput">
           <Textarea
             className="openbitfun-git-scene-working-copy__message"
@@ -393,9 +403,11 @@ const WorkingCopyView: React.FC<WorkingCopyViewProps> = ({
             {status?.staged?.length ? t('actions.commitWithCount', { count: status.staged.length }) : t('actions.commit')}
           </Button>
         </div>
+        </>}
       </div>
 
       <div className="openbitfun-git-scene-working-copy__main" ref={mainRef} data-openbitfun-component="working-copy-view" data-openbitfun-part="main">
+        {!clean && <>
         <div className="openbitfun-git-scene-working-copy__file-list" style={{ width: fileListWidth }} data-openbitfun-component="working-copy-view" data-openbitfun-part="fileList">
           <div className="openbitfun-git-scene-working-copy__search" data-openbitfun-component="working-copy-view" data-openbitfun-part="search">
             <SearchField
@@ -409,8 +421,9 @@ const WorkingCopyView: React.FC<WorkingCopyViewProps> = ({
               onClear={searchQuery ? () => setSearchQuery('') : undefined}
             />
           </div>
-          {status && (status.unstaged?.length || status.untracked?.length || status.staged?.length) ? (
+          {status && hasChanges ? (
             <>
+              {conflicts.length > 0 && <p role="status">{t('workingCopy.conflicts', { count: conflicts.length })}</p>}
               {filteredFiles.unstaged.length > 0 && (
                 <>
                   <div
@@ -593,7 +606,7 @@ const WorkingCopyView: React.FC<WorkingCopyViewProps> = ({
               )}
             </>
           ) : (
-            <div className="openbitfun-git-scene-working-copy__empty" data-openbitfun-component="working-copy-view" data-openbitfun-part="empty">{t('empty.noChanges')}</div>
+            <div className="openbitfun-git-scene-working-copy__empty" data-openbitfun-component="working-copy-view" data-openbitfun-part="empty">{t(statusError ? 'workingCopy.statusUnavailable' : !statusReady ? 'loading.text' : 'empty.noChanges')}</div>
           )}
         </div>
         <div
@@ -606,9 +619,28 @@ const WorkingCopyView: React.FC<WorkingCopyViewProps> = ({
           aria-valuenow={fileListWidth}
           title={t('tooltips.resizeFileList')}
         />
+        </>}
         <div className="openbitfun-git-scene-working-copy__diff-area" data-openbitfun-component="working-copy-view" data-openbitfun-part="diffArea">
           <CanvasStoreModeContext.Provider value="git">
-            <ContentCanvas workspacePath={workspacePath} mode="git" onInteraction={handleInteraction} onBeforeClose={handleBeforeClose} />
+            <ContentCanvas workspacePath={workspacePath} mode="git" emptyState={
+              <Empty className="openbitfun-git-scene-working-copy__overview" icon={<Icon name="git" size="lg" />}
+                title={t(statusError ? 'workingCopy.statusUnavailable' : !statusReady ? 'loading.text'
+                  : clean ? 'workingCopy.clean' : 'workingCopy.selectFile')}
+                description={<>
+                  <p className="openbitfun-git-scene-working-copy__repository-path">{hostLabel ? `${hostLabel} · ` : ''}{workspacePath}</p>
+                  {statusError ? <p role="alert">{statusError}</p> : clean && <>
+                    <p>{t('workingCopy.cleanDescription')}</p>
+                    {(ahead > 0 || behind > 0) && <p>{t('workingCopy.upstreamComparison', { ahead: formatNumber(ahead), behind: formatNumber(behind) })}</p>}
+                    <p>{t(ahead > 0 ? 'workingCopy.unpushed' : 'workingCopy.remoteSnapshot')}</p>
+                  </>}
+                </>}
+                actions={<>
+                  <Button size="sm" variant="outline" onClick={() => useGitSceneStore.getState().setActiveView('graph')}>{t('tabs.commits')}</Button>
+                  <Button size="sm" variant="outline" onClick={() => useGitSceneStore.getState().setActiveView('branches')}>{t('tabs.branches')}</Button>
+                  <Button size="sm" variant="quiet" onClick={() => void handleRefresh()}>{t('actions.refresh')}</Button>
+                </>}
+              />
+            } onInteraction={handleInteraction} onBeforeClose={handleBeforeClose} />
           </CanvasStoreModeContext.Provider>
         </div>
       </div>
diff --git a/src/web-ui/src/app/scenes/personal-overview/PersonalOverviewScene.actions.test.tsx b/src/web-ui/src/app/scenes/personal-overview/PersonalOverviewScene.actions.test.tsx
index d2553dded8..691175948c 100644
--- a/src/web-ui/src/app/scenes/personal-overview/PersonalOverviewScene.actions.test.tsx
+++ b/src/web-ui/src/app/scenes/personal-overview/PersonalOverviewScene.actions.test.tsx
@@ -186,6 +186,7 @@ describe('overview catalog actions', () => {
     expect(mocks.getAgentDetail).not.toHaveBeenCalled();
     expect(useAgentsStore.getState()).toBe(agentsState);
     expect(mocks.openScene).not.toHaveBeenCalled();
+    await fillAgentField('name', 'New agent');
     await fillAgentField('id', 'new-agent');
     await fillAgentField('description', 'A new agent');
     await clickDialogButton('agentsOverview.form.wizard.next');
@@ -221,7 +222,7 @@ describe('overview catalog actions', () => {
     let finish!: () => void;
     mocks.createAgent.mockReturnValue(new Promise<void>(resolve => { finish = resolve; }));
     await act(async () => { root.render(<CreateAgentPage />); });
-    for (const [field, value] of [['id', 'page-agent'], ['description', 'Page agent'], ['prompt', 'Original prompt']]) {
+    for (const [field, value] of [['name', 'Page agent'], ['id', 'page-agent'], ['description', 'Page agent'], ['prompt', 'Original prompt']]) {
       await fillAgentField(field, value, container);
     }
     const submit = container.querySelector<HTMLButtonElement>('.th-create-page__footer button[type="submit"]')!;
@@ -238,6 +239,7 @@ describe('overview catalog actions', () => {
     mocks.createAgent.mockReturnValue(new Promise<void>(resolve => { finish = resolve; }));
     await render();
     await click('personal-overview-create-agent');
+    await fillAgentField('name', 'Old agent');
     await fillAgentField('id', 'old-agent');
     await fillAgentField('description', 'Created on the original device');
     await clickDialogButton('agentsOverview.form.wizard.next');
@@ -248,7 +250,8 @@ describe('overview catalog actions', () => {
     await act(async () => { activateSurface('peer-host'); });
     await act(async () => { finish(); });
     expect(document.querySelector('[role="dialog"]')).not.toBeNull();
-    expect(document.querySelector<HTMLInputElement>('[role="dialog"] [id$="custom-agent-id"]')?.value).toBe('');
+    expect(document.querySelector<HTMLInputElement>('[role="dialog"] [id$="custom-agent-id"]')?.value).toMatch(/^agent-[a-f0-9]{8}$/);
+    expect(document.querySelector<HTMLInputElement>('[role="dialog"] [id$="custom-agent-name"]')?.value).toBe('');
     expect(mocks.refresh).not.toHaveBeenCalled();
     expect(mocks.success).not.toHaveBeenCalled();
     expect(mocks.error).not.toHaveBeenCalled();
diff --git a/src/web-ui/src/app/scenes/session/AuxPane.scss b/src/web-ui/src/app/scenes/session/AuxPane.scss
index b3c77546d6..8dfae3e061 100644
--- a/src/web-ui/src/app/scenes/session/AuxPane.scss
+++ b/src/web-ui/src/app/scenes/session/AuxPane.scss
@@ -62,3 +62,11 @@
     min-width: 50px;
   }
 }
+
+.openbitfun-aux-pane__empty-actions {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: center;
+  gap: var(--openbitfun-space-2);
+}
+.openbitfun-aux-pane__empty-path { overflow-wrap: anywhere; }
diff --git a/src/web-ui/src/app/scenes/session/AuxPane.tsx b/src/web-ui/src/app/scenes/session/AuxPane.tsx
index c8447a3084..04a6a19cc8 100644
--- a/src/web-ui/src/app/scenes/session/AuxPane.tsx
+++ b/src/web-ui/src/app/scenes/session/AuxPane.tsx
@@ -21,6 +21,7 @@ import { flowChatStore } from '@/flow_chat/store/FlowChatStore';
 import { isCanvasTabVisibleForSession } from '../../components/panels/content-canvas/types';
 
 import './AuxPane.scss';
+import { AuxPaneEmptyState } from './AuxPaneEmptyState';
 
 const log = createLogger('AuxPane');
 
@@ -181,15 +182,7 @@ const AuxPane = forwardRef<AuxPaneRef, AuxPaneProps>(
           terminalResizeSuspended={terminalResizeSuspended}
           resizeSuspended={resizeSuspended}
           missionControlEnabled={false}
-          emptyState={
-            <div
-              className="openbitfun-aux-pane__empty-state"
-              data-openbitfun-component="aux-pane"
-              data-openbitfun-part="emptyState"
-            >
-              {t('canvas.noContentOpen')}
-            </div>
-          }
+          emptyState={<AuxPaneEmptyState workspacePath={workspacePath} sessionId={activeSessionId} />}
         />
       </div>
     );
diff --git a/src/web-ui/src/app/scenes/session/AuxPaneEmptyState.test.tsx b/src/web-ui/src/app/scenes/session/AuxPaneEmptyState.test.tsx
new file mode 100644
index 0000000000..9ec177a92c
--- /dev/null
+++ b/src/web-ui/src/app/scenes/session/AuxPaneEmptyState.test.tsx
@@ -0,0 +1,64 @@
+// @vitest-environment jsdom
+import React, { act } from 'react';
+import { createRoot, type Root } from 'react-dom/client';
+import { afterEach, beforeEach, expect, it, vi } from 'vitest';
+import type { ClosedTabRecord } from '@/app/components/panels/content-canvas/types';
+import { activateSurface, resetDeviceSurfaceForTest } from '@/infrastructure/peer-device/deviceSurface';
+import { useNavSceneStore } from '@/app/stores/navSceneStore';
+import { AuxPaneEmptyState } from './AuxPaneEmptyState';
+const mock = vi.hoisted(() => ({
+  workspace: { id: 'remote-project', rootPath: '/srv/project', workspaceKind: 'remote', connectionId: 'ssh-1', connectionName: 'Build host' } as { id: string; rootPath: string; workspaceKind: string; connectionId?: string; connectionName?: string } | null,
+  canvas: { closedTabs: [] as ClosedTabRecord[], scopeKey: 'session-a', reopenClosedTab: vi.fn() },
+  expand: vi.fn(), hide: vi.fn(),
+}));
+vi.mock('@/infrastructure/contexts/WorkspaceContext', () => ({ useCurrentWorkspace: () => ({ workspace: mock.workspace }) }));
+vi.mock('@/infrastructure/i18n', () => ({ useI18n: () => ({ t: (key: string, options?: { title?: string }) => options?.title ? `${key}:${options.title}` : key }) }));
+vi.mock('@/app/components/panels/content-canvas', () => ({ useCanvasStore: (selector: (state: typeof mock.canvas) => unknown) => selector(mock.canvas) }));
+vi.mock('./sessionPanelLayout', () => ({ expandSessionAuxPane: mock.expand, hideSessionAuxPane: mock.hide }));
+let host: HTMLDivElement, root: Root;
+const render = async () => { await act(async () => root.render(<AuxPaneEmptyState workspacePath="/srv/project" sessionId="session-a" />)); };
+const button = (name: string) => Array.from(host.querySelectorAll('button')).find(button => button.textContent === name)!;
+beforeEach(() => {
+  vi.clearAllMocks(); resetDeviceSurfaceForTest();
+  mock.workspace = { id: 'remote-project', rootPath: '/srv/project', workspaceKind: 'remote', connectionId: 'ssh-1', connectionName: 'Build host' };
+  mock.canvas.closedTabs = []; mock.canvas.scopeKey = 'session-a';
+  host = document.createElement('div'); document.body.append(host); root = createRoot(host);
+});
+afterEach(async () => { await act(async () => root.unmount()); host.remove(); resetDeviceSurfaceForTest(); useNavSceneStore.getState().closeNavScene(); });
+it('routes file browsing and terminal creation to the explicit workspace on the active peer', async () => {
+  activateSurface('peer-host');
+  const requested = vi.fn(); window.addEventListener('terminal-create-requested', requested);
+  await render();
+  expect(host.textContent).toContain('Build host · /srv/project');
+  await act(async () => button('canvas.empty.browseFiles').click());
+  expect(useNavSceneStore.getState().resourceWorkspace).toEqual({ surfaceId: 'peer-host', workspaceId: 'remote-project' });
+  await act(async () => button('canvas.empty.newTerminal').click());
+  expect(requested.mock.calls[0][0].detail).toEqual({ surfaceId: 'peer-host', resourceScope: { surfaceId: 'peer-host', workspaceId: 'remote-project', workspacePath: '/srv/project', remoteConnectionId: 'ssh-1' } });
+  window.removeEventListener('terminal-create-requested', requested);
+  await act(async () => button('canvas.hidePanel').click());
+  expect(mock.hide).toHaveBeenCalledOnce();
+});
+it.each(['missing', 'disconnected', 'other-workspace'] as const)('gates actions for a %s workspace without a local fallback', async state => {
+  if (state === 'missing') mock.workspace = null;
+  else if (state === 'disconnected') mock.workspace!.connectionId = undefined;
+  else mock.workspace!.rootPath = '/another-project';
+  await render();
+  expect(button('canvas.empty.browseFiles').disabled).toBe(true);
+  expect(button('canvas.empty.newTerminal').disabled).toBe(true);
+  expect(host.textContent).toContain(state === 'disconnected' ? 'canvas.empty.workspaceUnavailable' : 'canvas.empty.selectWorkspace');
+});
+it('reopens only content owned by this session, workspace and surface', async () => {
+  mock.canvas.closedTabs = [{ tab: { title: 'Notes', content: { type: 'markdown-viewer', title: 'Notes', metadata: {
+    resourceScope: { surfaceId: 'local', workspaceId: 'remote-project' },
+  } } } } as ClosedTabRecord];
+  await render();
+  await act(async () => button('canvas.empty.reopen:Notes').click());
+  expect(mock.canvas.reopenClosedTab).toHaveBeenCalledOnce();
+  expect(mock.expand).toHaveBeenCalledOnce();
+  mock.canvas.scopeKey = 'other-session';
+  await render();
+  expect(button('canvas.empty.reopen:Notes')).toBeUndefined();
+  mock.canvas.scopeKey = 'session-a';
+  await act(async () => activateSurface('new-peer'));
+  expect(button('canvas.empty.reopen:Notes')).toBeUndefined();
+});
diff --git a/src/web-ui/src/app/scenes/session/AuxPaneEmptyState.tsx b/src/web-ui/src/app/scenes/session/AuxPaneEmptyState.tsx
new file mode 100644
index 0000000000..f367043645
--- /dev/null
+++ b/src/web-ui/src/app/scenes/session/AuxPaneEmptyState.tsx
@@ -0,0 +1,59 @@
+import { useSyncExternalStore } from 'react';
+import { Button, Empty, Icon } from '@openbitfun/ui';
+import { useI18n } from '@/infrastructure/i18n';
+import { useCurrentWorkspace } from '@/infrastructure/contexts/WorkspaceContext';
+import { getActiveSurfaceScope, onSurfaceActivated } from '@/infrastructure/peer-device/deviceSurface';
+import { usePeerDeviceModeOptional } from '@/infrastructure/peer-device/peerDeviceContextState';
+import { useNavSceneStore } from '@/app/stores/navSceneStore';
+import { useWorkspaceResourceState } from '@/app/scenes/workspace-resources/workspaceResourceState';
+import { useCanvasStore } from '@/app/components/panels/content-canvas';
+import { isCanvasTabVisibleForSession } from '@/app/components/panels/content-canvas/types';
+import type { ContentResourceScope } from '@/shared/types/contentResource';
+import { expandSessionAuxPane, hideSessionAuxPane } from './sessionPanelLayout';
+
+export function AuxPaneEmptyState({ workspacePath, sessionId }: { workspacePath?: string; sessionId: string | null }) {
+  const { t } = useI18n('components');
+  const { workspace } = useCurrentWorkspace();
+  const scope = useSyncExternalStore(onSurfaceActivated, getActiveSurfaceScope, getActiveSurfaceScope);
+  const peer = usePeerDeviceModeOptional();
+  const target = workspace && (!workspacePath || workspace.rootPath === workspacePath) ? workspace : null;
+  const canOpen = Boolean(target && (target.workspaceKind !== 'remote' || target.connectionId));
+  const lastClosed = useCanvasStore(state => state.closedTabs[0]);
+  const canvasScopeKey = useCanvasStore(state => state.scopeKey);
+  const reopenClosedTab = useCanvasStore(state => state.reopenClosedTab);
+  const lastScope = lastClosed?.tab.content.metadata?.resourceScope as ContentResourceScope | undefined;
+  const canReopen = Boolean(lastClosed && canvasScopeKey === (sessionId || '__none__')
+    && isCanvasTabVisibleForSession(lastClosed.tab, sessionId)
+    && lastScope?.surfaceId === scope.surfaceId && lastScope.workspaceId === target?.id);
+  const hostLabel = target?.connectionName || (peer?.peerMode.active ? peer.peerMode.deviceName : t('canvas.empty.currentHost'));
+  const browseFiles = () => {
+    if (!canOpen || !target || !scope.isCurrent()) return;
+    useWorkspaceResourceState.getState().updateLayout(scope.key('workspace-resources', target.id), { filesCollapsed: false, fileView: 'tree' });
+    useNavSceneStore.getState().openWorkspaceResources(target.id);
+  };
+  const createTerminal = () => {
+    if (!canOpen || !target || !scope.isCurrent()) return;
+    window.dispatchEvent(new CustomEvent('terminal-create-requested', { detail: {
+      surfaceId: scope.surfaceId,
+      resourceScope: { surfaceId: scope.surfaceId, workspaceId: target.id, workspacePath: target.rootPath, remoteConnectionId: target.connectionId },
+    } }));
+  };
+  return <div className="openbitfun-aux-pane__empty-state" data-openbitfun-component="aux-pane" data-openbitfun-part="emptyState">
+    <Empty icon={<Icon name="files" size="lg" />} title={t('canvas.empty.title')}
+      description={<>
+        <p>{t('canvas.empty.description')}</p>
+        {target && <p className="openbitfun-aux-pane__empty-path">{hostLabel} · {target.rootPath}</p>}
+        {!canOpen && <p>{t(target ? 'canvas.empty.workspaceUnavailable' : 'canvas.empty.selectWorkspace')}</p>}
+      </>}
+      actions={<div className="openbitfun-aux-pane__empty-actions">
+        <Button size="sm" variant="outline" disabled={!canOpen} onClick={browseFiles}>{t('canvas.empty.browseFiles')}</Button>
+        <Button size="sm" variant="outline" disabled={!canOpen} onClick={createTerminal}>{t('canvas.empty.newTerminal')}</Button>
+        {canReopen && <Button size="sm" variant="outline" onClick={() => {
+          if (!scope.isCurrent()) return;
+          reopenClosedTab();
+          expandSessionAuxPane();
+        }}>{t('canvas.empty.reopen', { title: lastClosed!.tab.title })}</Button>}
+        <Button size="sm" variant="quiet" onClick={hideSessionAuxPane}>{t('canvas.hidePanel')}</Button>
+      </div>} />
+  </div>;
+}
diff --git a/src/web-ui/src/app/scenes/settings/pages/application/KeyboardShortcutsSection.tsx b/src/web-ui/src/app/scenes/settings/pages/application/KeyboardShortcutsSection.tsx
index b7dd24a376..44a8427796 100644
--- a/src/web-ui/src/app/scenes/settings/pages/application/KeyboardShortcutsSection.tsx
+++ b/src/web-ui/src/app/scenes/settings/pages/application/KeyboardShortcutsSection.tsx
@@ -25,6 +25,7 @@ import { confirmWarning } from '@/infrastructure/confirm-dialog';
 import { useI18n } from '@/infrastructure/i18n';
 import {
   buildStoredKeybindings,
+  getReservedShortcutReason,
   parseStoredKeybindings,
   shortcutManager,
   type KeybindingOverrides,
@@ -331,7 +332,12 @@ const KeyboardShortcutsSection: React.FC = () => {
     () => buildFinalConflictMap(displayRegistrations, pendingChanges),
     [displayRegistrations, pendingChanges],
   );
-  const hasBlockingConflicts = finalConflicts.size > 0;
+  const reservedBindings = useMemo(() => new Map(displayRegistrations.flatMap(reg => {
+    const reason = getReservedShortcutReason(getEffectiveConfig(reg, pendingChanges[reg.id]));
+    return reason ? [[reg.id, reason] as const] : [];
+  })), [displayRegistrations, pendingChanges]);
+  const hasBlockingConflicts = finalConflicts.size > 0
+    || [...reservedBindings.keys()].some(id => pendingChanges[id] !== undefined);
 
   // Key capture during recording mode
   useEffect(() => {
@@ -800,6 +806,7 @@ const KeyboardShortcutsSection: React.FC = () => {
               const pending = pendingChanges[reg.id];
               const isRecording = recordingId === reg.id;
               const conflict = finalConflicts.get(reg.id) ?? null;
+              const reserved = reservedBindings.get(reg.id);
               const displayName = shortcutDisplayName(reg, t);
               const formattedKey = formatKey(reg, pending);
 
@@ -825,7 +832,11 @@ const KeyboardShortcutsSection: React.FC = () => {
                       {displayName}
                     </OverflowText>
                   )}
-                  description={conflict ? (
+                  description={reserved ? (
+                    <span className="kb-shortcuts__item-conflict-hint">
+                      {t(`keyboard.reserved.${reserved}`)}
+                    </span>
+                  ) : conflict ? (
                     <span className="kb-shortcuts__item-conflict-hint">
                       {t('keyboard.conflict')}: {shortcutDisplayName(conflict, t)}
                     </span>
diff --git a/src/web-ui/src/app/scenes/skills/SkillsScene.scss b/src/web-ui/src/app/scenes/skills/SkillsScene.scss
index 14e18a3953..1ab892f22c 100644
--- a/src/web-ui/src/app/scenes/skills/SkillsScene.scss
+++ b/src/web-ui/src/app/scenes/skills/SkillsScene.scss
@@ -483,3 +483,23 @@
 .skills-main > .skills-main__empty {
   margin-block: var(--openbitfun-space-4);
 }
+
+.skill-scan-diagnostics {
+  margin-block-end: var(--openbitfun-space-4);
+  border: 1px solid var(--openbitfun-color-border-default);
+  border-radius: var(--openbitfun-radius-base);
+  padding: var(--openbitfun-space-3);
+
+  summary { cursor: pointer; }
+  p { margin-block: var(--openbitfun-space-2); }
+
+  &__content { padding-block-start: var(--openbitfun-space-2); }
+  &__items {
+    display: grid;
+    gap: var(--openbitfun-space-4);
+    padding: 0;
+    list-style: none;
+  }
+  &__path { display: block; overflow-wrap: anywhere; }
+  &__actions { display: flex; flex-wrap: wrap; gap: var(--openbitfun-space-2); }
+}
diff --git a/src/web-ui/src/app/scenes/skills/SkillsScene.tsx b/src/web-ui/src/app/scenes/skills/SkillsScene.tsx
index 164b88f77c..ce1d667a4c 100644
--- a/src/web-ui/src/app/scenes/skills/SkillsScene.tsx
+++ b/src/web-ui/src/app/scenes/skills/SkillsScene.tsx
@@ -42,6 +42,7 @@ import { createLogger } from '@/shared/utils/logger';
 import { useInstalledSkills } from './hooks/useInstalledSkills';
 import { useSkillsPagination } from './hooks/useSkillsPagination';
 import { useSkillsPageLayout } from './hooks/useSkillsPageLayout';
+import { SkillScanDiagnostics } from './components/SkillScanDiagnostics';
 import { SkillsPagination } from './components/SkillsPagination';
 import { useSkillMarket } from './hooks/useSkillMarket';
 import { SkillMarketSettings } from '@/infrastructure/config/components/SkillMarketSettings';
@@ -420,6 +421,18 @@ const SkillsScene: React.FC = () => {
             {activeTab === 'installed' && (
               <div className="skills-installed" id="skills-panel-installed" role="region" aria-label={t('installed.titleAll')} data-openbitfun-scene="skills" data-openbitfun-part="installed">
                 <div className="skills-main" data-openbitfun-scene="skills" data-openbitfun-part="main">
+                  {desktopConfigAvailable && (
+                    <SkillScanDiagnostics
+                      key={installed.catalogContextKey}
+                      diagnostics={installed.diagnostics}
+                      diagnosticsAvailable={installed.diagnosticsAvailable}
+                      loading={installed.loading}
+                      canRevealPath={canRevealSkillPath}
+                      onRetry={() => { void installed.loadSkills(true); }}
+                      onCopyPath={handleCopySkillPath}
+                      onRevealPath={handleRevealSkillPath}
+                    />
+                  )}
                   {!desktopConfigAvailable ? (
                     <div className="skills-main__empty" data-testid="skills-management-unavailable" data-openbitfun-scene="skills" data-openbitfun-part="empty">
                       <Icon name="book-open" size="lg" />
diff --git a/src/web-ui/src/app/scenes/skills/components/SkillScanDiagnostics.test.tsx b/src/web-ui/src/app/scenes/skills/components/SkillScanDiagnostics.test.tsx
new file mode 100644
index 0000000000..0d490ba83c
--- /dev/null
+++ b/src/web-ui/src/app/scenes/skills/components/SkillScanDiagnostics.test.tsx
@@ -0,0 +1,41 @@
+// @vitest-environment jsdom
+import React, { act } from 'react';
+import { createRoot } from 'react-dom/client';
+import { describe, expect, it, vi } from 'vitest';
+import { SkillScanDiagnostics } from './SkillScanDiagnostics';
+
+vi.mock('@/infrastructure/i18n/hooks/useI18n', () => ({ useI18n: () => ({
+  t: (key: string, values?: { count?: number }) => values?.count ? `${key}:${values.count}` : key,
+}) }));
+
+describe('SkillScanDiagnostics', () => {
+  it('keeps actionable scan details on the page and disables revealing remote paths', async () => {
+    const container = document.createElement('div');
+    document.body.appendChild(container);
+    const root = createRoot(container);
+    const onRetry = vi.fn(), onCopyPath = vi.fn(), onRevealPath = vi.fn();
+    const props = { diagnostics: [{ sourceId: 'codex', path: '/remote/bad/SKILL.md', message: 'missing description' }],
+      diagnosticsAvailable: true, loading: false, canRevealPath: false, onRetry, onCopyPath, onRevealPath };
+    await act(async () => root.render(<SkillScanDiagnostics {...props} />));
+    expect(container.querySelector('summary')?.textContent).toBe('list.diagnostics.title:1');
+    expect(container.textContent).toContain('Codex');
+    expect(container.textContent).toContain('/remote/bad/SKILL.md');
+    expect(container.textContent).toContain('missing description');
+    expect(container.textContent).toContain('list.item.revealPathUnavailableRemote');
+    const button = (text: string) => Array.from(container.querySelectorAll('button')).find(item => item.textContent === text)!;
+    await act(async () => { button('file.copyPath').click(); button('list.retry').click(); });
+    expect(onCopyPath).toHaveBeenCalledWith('/remote/bad/SKILL.md');
+    expect(onRetry).toHaveBeenCalledOnce();
+    expect(button('list.item.openPathInExplorer').disabled).toBe(true);
+    expect(onRevealPath).not.toHaveBeenCalled();
+    await act(async () => root.render(<SkillScanDiagnostics {...props} canRevealPath />));
+    await act(async () => button('list.item.openPathInExplorer').click());
+    expect(onRevealPath).toHaveBeenCalledWith('/remote/bad/SKILL.md');
+    await act(async () => root.render(<SkillScanDiagnostics {...props} diagnostics={[]} />));
+    expect(container.textContent).toBe('');
+    await act(async () => root.render(<SkillScanDiagnostics {...props} diagnostics={[]} diagnosticsAvailable={false} />));
+    expect(container.textContent).toContain('list.diagnosticsUnavailable');
+    await act(async () => root.unmount());
+    container.remove();
+  });
+});
diff --git a/src/web-ui/src/app/scenes/skills/components/SkillScanDiagnostics.tsx b/src/web-ui/src/app/scenes/skills/components/SkillScanDiagnostics.tsx
new file mode 100644
index 0000000000..63b4fd3352
--- /dev/null
+++ b/src/web-ui/src/app/scenes/skills/components/SkillScanDiagnostics.tsx
@@ -0,0 +1,48 @@
+import { Button } from '@openbitfun/ui';
+import type { SkillScanDiagnostic } from '@/infrastructure/config/types';
+import { getEcosystemSourceLabel } from '@/infrastructure/config/skillSourcePresentation';
+import { useI18n } from '@/infrastructure/i18n/hooks/useI18n';
+
+interface SkillScanDiagnosticsProps {
+  diagnostics: SkillScanDiagnostic[];
+  diagnosticsAvailable: boolean;
+  loading: boolean;
+  canRevealPath: boolean;
+  onRetry: () => void;
+  onCopyPath: (path: string) => void;
+  onRevealPath: (path: string) => void;
+}
+
+export function SkillScanDiagnostics({ diagnostics, diagnosticsAvailable, loading, canRevealPath,
+  onRetry, onCopyPath, onRevealPath }: SkillScanDiagnosticsProps) {
+  const { t } = useI18n('scenes/skills');
+  const { t: tCommon } = useI18n('common');
+  if (diagnostics.length === 0 && diagnosticsAvailable) return null;
+
+  return (
+    <details className="skill-scan-diagnostics">
+      <summary>{diagnostics.length > 0
+        ? t('list.diagnostics.title', { count: diagnostics.length })
+        : t('list.diagnosticsUnavailable')}</summary>
+      <div className="skill-scan-diagnostics__content">
+        <p>{t('list.diagnostics.description')}</p>
+        {!diagnosticsAvailable && diagnostics.length > 0 && <p>{t('list.diagnosticsUnavailable')}</p>}
+        <ul className="skill-scan-diagnostics__items">
+          {diagnostics.map((item, index) => (
+            <li key={`${item.sourceId}:${item.path}:${index}`}>
+              <strong>{getEcosystemSourceLabel(item.sourceId) || t('list.item.unknownSource')}</strong>
+              <code className="skill-scan-diagnostics__path">{item.path}</code>
+              <p>{item.unsupportedField ? t('list.unsupportedField', { field: item.unsupportedField }) : item.message}</p>
+              <div className="skill-scan-diagnostics__actions">
+                <Button size="sm" variant="quiet" disabled={!item.path.trim()} onClick={() => onCopyPath(item.path)}>{tCommon('file.copyPath')}</Button>
+                <Button size="sm" variant="quiet" disabled={!canRevealPath || !item.path.trim()} onClick={() => onRevealPath(item.path)}>{t('list.item.openPathInExplorer')}</Button>
+              </div>
+            </li>
+          ))}
+        </ul>
+        {!canRevealPath && diagnostics.length > 0 && <p>{t('list.item.revealPathUnavailableRemote')}</p>}
+        <Button size="sm" variant="outline" disabled={loading} onClick={onRetry}>{t('list.retry')}</Button>
+      </div>
+    </details>
+  );
+}
diff --git a/src/web-ui/src/app/scenes/skills/hooks/useInstalledSkills.test.tsx b/src/web-ui/src/app/scenes/skills/hooks/useInstalledSkills.test.tsx
index 7ce4f3d0a0..73f92078f8 100644
--- a/src/web-ui/src/app/scenes/skills/hooks/useInstalledSkills.test.tsx
+++ b/src/web-ui/src/app/scenes/skills/hooks/useInstalledSkills.test.tsx
@@ -8,6 +8,7 @@ import { globalEventBus } from '@/infrastructure/event-bus';
 import { useInstalledSkills } from './useInstalledSkills';
 import type { InstalledFilter } from '../skillsSceneStore';
 
+const workspaceMock = vi.hoisted(() => ({ id: 'workspace-id' }));
 const getSkillConfigsMock = vi.hoisted(() => vi.fn());
 const translateMock = vi.hoisted(() => (key: string, options?: { field?: string }) => options?.field ? `${key}:${options.field}` : key);
 const diagnosticsMock = vi.hoisted(() => ({
@@ -42,7 +43,7 @@ vi.mock('@/infrastructure/api', () => ({
 }));
 vi.mock('@/infrastructure/hooks/useWorkspaceManagerSync', () => ({
   useWorkspaceManagerSync: () => ({
-    workspace: { id: 'workspace-id' },
+    workspace: workspaceMock,
     workspacePath: 'D:/workspace/project',
     hasWorkspace: true,
     isRemoteWorkspace: false,
@@ -91,6 +92,7 @@ describe('useInstalledSkills', () => {
     notificationMocks.info.mockReset();
     notificationMocks.error.mockReset();
     currentInstalled = null;
+    workspaceMock.id = 'workspace-id';
     diagnosticsMock.items = [];
     diagnosticsMock.available = true;
   });
@@ -115,6 +117,33 @@ describe('useInstalledSkills', () => {
     });
   });
 
+  it('clears repaired diagnostics after a forced rescan and keeps healthy skills', async () => {
+    const good = { key: 'good', name: 'good', sourceId: 'openbitfun', level: 'user', path: '/skills/good' };
+    getSkillConfigsMock.mockResolvedValue([good]);
+    diagnosticsMock.items = [{ path: '/skills/bad', sourceId: 'codex', message: 'invalid metadata' }];
+    await act(async () => root.render(<Harness enabled />));
+    diagnosticsMock.items = [];
+    getSkillConfigsMock.mockResolvedValue([good, { ...good, key: 'repaired', name: 'repaired' }]);
+    await act(async () => { await currentInstalled?.loadSkills(true); });
+    expect(getSkillConfigsMock).toHaveBeenLastCalledWith({ forceRefresh: true, workspaceId: 'workspace-id' });
+    expect(currentInstalled?.diagnostics).toEqual([]);
+    expect(currentInstalled?.skills.map(skill => skill.key)).toEqual(['good', 'repaired']);
+  });
+
+  it('hides the previous workspace catalog while the new workspace scan is pending', async () => {
+    getSkillConfigsMock.mockResolvedValue([{ key: 'old', name: 'old', level: 'user', path: '/old/private' }]);
+    diagnosticsMock.items = [{ path: '/old/private/bad', sourceId: 'codex', message: 'invalid metadata' }];
+    await act(async () => root.render(<Harness enabled />));
+    getSkillConfigsMock.mockReturnValue(new Promise(() => {}));
+    workspaceMock.id = 'different-workspace';
+    await act(async () => root.render(<Harness enabled />));
+    expect(currentInstalled?.skills).toEqual([]);
+    expect(currentInstalled?.filteredSkills).toEqual([]);
+    expect(currentInstalled?.diagnostics).toEqual([]);
+    expect(currentInstalled?.catalogReady).toBe(false);
+    expect(currentInstalled?.counts.all).toBe(0);
+  });
+
   it('reports unsupported skill capabilities without claiming a scan failure', async () => {
     diagnosticsMock.items = [{
       path: '/skills/guard/SKILL.md', sourceId: 'claude-code',
diff --git a/src/web-ui/src/app/scenes/skills/hooks/useInstalledSkills.ts b/src/web-ui/src/app/scenes/skills/hooks/useInstalledSkills.ts
index fdbc7805f6..8506bdde84 100644
--- a/src/web-ui/src/app/scenes/skills/hooks/useInstalledSkills.ts
+++ b/src/web-ui/src/app/scenes/skills/hooks/useInstalledSkills.ts
@@ -12,6 +12,8 @@ import { createLogger } from '@/shared/utils/logger';
 import type { InstalledFilter } from '../skillsSceneStore';
 
 const log = createLogger('SkillsScene:useInstalledSkills');
+const EMPTY_SKILLS: SkillInfo[] = [];
+const EMPTY_DIAGNOSTICS: SkillScanDiagnostic[] = [];
 
 function installedSkillGroup(skill: SkillInfo): InstalledFilter {
   if (skill.isBuiltin) return 'builtin';
@@ -37,9 +39,9 @@ export function useInstalledSkills({
 
   const scope = useSyncExternalStore(onSurfaceActivated, getActiveSurfaceScope, getActiveSurfaceScope);
   const [loadedContextKey, setLoadedContextKey] = useState<string | null>(null);
-  const [skills, setSkills] = useState<SkillInfo[]>([]);
-  const [diagnostics, setDiagnostics] = useState<SkillScanDiagnostic[]>([]);
-  const [diagnosticsAvailable, setDiagnosticsAvailable] = useState(true);
+  const [loadedSkills, setSkills] = useState<SkillInfo[]>([]);
+  const [loadedDiagnostics, setDiagnostics] = useState<SkillScanDiagnostic[]>([]);
+  const [loadedDiagnosticsAvailable, setDiagnosticsAvailable] = useState(true);
   const [globallyDisabledSkillKeys, setGloballyDisabledSkillKeys] = useState<Set<string>>(new Set());
   const [directManagementSupported, setDirectManagementSupported] = useState(false);
   const [savingGlobalSkillKey, setSavingGlobalSkillKey] = useState<string | null>(null);
@@ -419,6 +421,11 @@ export function useInstalledSkills({
     workspace?.id,
   ]);
 
+  const catalogCurrent = enabled && loadedContextKey === capabilityKey;
+  const skills = catalogCurrent ? loadedSkills : EMPTY_SKILLS;
+  const diagnostics = catalogCurrent ? loadedDiagnostics : EMPTY_DIAGNOSTICS;
+  const diagnosticsAvailable = !catalogCurrent || loadedDiagnosticsAvailable;
+
   const normalizedQuery = searchQuery.trim().toLowerCase();
 
   const filteredSkills = useMemo(() => {
diff --git a/src/web-ui/src/app/scenes/todos/components/TodoEditor.test.tsx b/src/web-ui/src/app/scenes/todos/components/TodoEditor.test.tsx
index 2af7ae8be5..86b91358e5 100644
--- a/src/web-ui/src/app/scenes/todos/components/TodoEditor.test.tsx
+++ b/src/web-ui/src/app/scenes/todos/components/TodoEditor.test.tsx
@@ -14,7 +14,7 @@ import TodoEditor from './TodoEditor';
 
 vi.mock('@/infrastructure/i18n', () => ({
   useI18n: () => ({
-    t: (key: string) => key,
+    t: (key: string) => key === 'shared:agents.Standard' ? '标准' : key,
   }),
 }));
 
@@ -225,6 +225,8 @@ describeWithJsdom('TodoEditor', () => {
     expect(container.textContent).toContain('editor.smartExecution.title');
     expect(container.textContent).toContain('editor.sections.prompt');
     expect(container.querySelector('textarea')?.maxLength).toBe(1000);
+    expect(container.textContent).toContain('标准');
+    expect(container.textContent).not.toContain('Agentic');
 
     const advancedToggle = container.querySelector<HTMLButtonElement>(
       '[data-testid="todos-editor-advanced-toggle"]',
diff --git a/src/web-ui/src/app/scenes/todos/components/TodoEditor.tsx b/src/web-ui/src/app/scenes/todos/components/TodoEditor.tsx
index a42493fa42..ebcdce0116 100644
--- a/src/web-ui/src/app/scenes/todos/components/TodoEditor.tsx
+++ b/src/web-ui/src/app/scenes/todos/components/TodoEditor.tsx
@@ -1,3 +1,4 @@
+import { agentName } from '@/shared/agents/identity';
 /**
  * Create / edit form for a Todo.
  *
@@ -113,18 +114,18 @@ const TodoEditor: React.FC<TodoEditorProps> = ({
 
   const agentTypeOptions = useMemo(() => {
     if (isAssistantWorkspace) {
-      return [{ value: ASSISTANT_WORKSPACE_AGENT_TYPE, label: ASSISTANT_WORKSPACE_AGENT_TYPE }];
+      return [{ value: ASSISTANT_WORKSPACE_AGENT_TYPE, label: agentName({ id: ASSISTANT_WORKSPACE_AGENT_TYPE, name: ASSISTANT_WORKSPACE_AGENT_TYPE }, t) }];
     }
 
     const options = availableModes
       .filter((mode) => mode.id !== ASSISTANT_WORKSPACE_AGENT_TYPE)
-      .map((mode) => ({ value: mode.id, label: mode.name?.trim() || mode.id }));
+      .map((mode) => ({ value: mode.id, label: agentName(mode, t) }));
 
     if (draft.agentType && !options.some((option) => option.value === draft.agentType)) {
-      options.push({ value: draft.agentType, label: draft.agentType });
+      options.push({ value: draft.agentType, label: agentName({ id: draft.agentType, name: draft.agentType }, t) });
     }
     return options;
-  }, [availableModes, draft.agentType, isAssistantWorkspace]);
+  }, [availableModes, draft.agentType, isAssistantWorkspace, t]);
 
   const workspaceSelectOptions = useMemo(
     () => workspaceOptions.map((option) => ({
diff --git a/src/web-ui/src/app/scenes/todos/components/TodoItemRow.test.tsx b/src/web-ui/src/app/scenes/todos/components/TodoItemRow.test.tsx
index 56d86d59a9..79d61c74f3 100644
--- a/src/web-ui/src/app/scenes/todos/components/TodoItemRow.test.tsx
+++ b/src/web-ui/src/app/scenes/todos/components/TodoItemRow.test.tsx
@@ -5,6 +5,7 @@ import { createRoot, type Root } from 'react-dom/client';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import type { CronJob } from '@/infrastructure/api';
 import TodoItemRow from './TodoItemRow';
+import { formatJobTargetLabel } from '../todoPresentation';
 
 globalThis.IS_REACT_ACT_ENVIRONMENT = true;
 
@@ -89,3 +90,9 @@ describe('TodoItemRow actions', () => {
     expect(onEdit).toHaveBeenCalledTimes(1);
   });
 });
+
+it('localizes built-in target labels without changing persisted agent IDs', () => {
+  const translate = (key: string, params?: Record<string, unknown>) => key === 'shared:agents.Standard' ? '标准' : `${params?.agentType}`;
+  expect(formatJobTargetLabel(job, translate)).toBe('标准');
+  expect(job.target.kind === 'workspace' && job.target.launch.agentType).toBe('Standard');
+});
diff --git a/src/web-ui/src/app/scenes/todos/todoPresentation.ts b/src/web-ui/src/app/scenes/todos/todoPresentation.ts
index 0afd7425dc..307472279f 100644
--- a/src/web-ui/src/app/scenes/todos/todoPresentation.ts
+++ b/src/web-ui/src/app/scenes/todos/todoPresentation.ts
@@ -1,3 +1,4 @@
+import { agentName } from '@/shared/agents/identity';
 /**
  * Label helpers shared by the Todos list, calendar and editor.
  *
@@ -113,7 +114,8 @@ export function formatJobTargetLabel(job: CronJob, t: Translate): string {
   if (job.target.kind === 'session') {
     return t('target.existingSession');
   }
-  return t('target.newSession', { agentType: job.target.launch.agentType });
+  const id = job.target.launch.agentType;
+  return t('target.newSession', { agentType: agentName({ id, name: id }, t) });
 }
 
 export interface TodoWorkspaceOption {
diff --git a/src/web-ui/src/app/workbench/AGENTS.md b/src/web-ui/src/app/workbench/AGENTS.md
index 5ac83d5d63..e1cf366747 100644
--- a/src/web-ui/src/app/workbench/AGENTS.md
+++ b/src/web-ui/src/app/workbench/AGENTS.md
@@ -33,3 +33,11 @@ pnpm --dir src/web-ui exec vitest run src/shared/ui/SplitView.test.tsx src/app/w
 
 These DOM fixtures cover split/overlay gestures, cancellation, resize bounds and
 measurement recovery. They do not establish native frame timing or live remote behavior.
+
+For the empty content pane's workspace-scoped file/terminal actions and closed-content recovery:
+
+```bash
+pnpm --dir src/web-ui run test:run src/app/scenes/session/AuxPaneEmptyState.test.tsx src/app/scenes/session/AuxPane.session-switch.test.tsx src/app/scenes/terminal/TerminalActionBridge.test.tsx src/app/workbench/workbenchContent.test.ts src/app/workbench/WorkbenchLayout.test.tsx
+```
+
+These fixtures verify routing and ownership; verify native presentation separately.
diff --git a/src/web-ui/src/features/ssh-remote/SSHConnectionDialog.test.tsx b/src/web-ui/src/features/ssh-remote/SSHConnectionDialog.test.tsx
index b933ba8396..3e0c3591c7 100644
--- a/src/web-ui/src/features/ssh-remote/SSHConnectionDialog.test.tsx
+++ b/src/web-ui/src/features/ssh-remote/SSHConnectionDialog.test.tsx
@@ -253,6 +253,8 @@ describe('SSHConnectionDialog', () => {
       if (target === 'wsl') {
         expect(sshApiMock.listWslDistributions).toHaveBeenCalled();
         expect(container.querySelector('input[aria-label="ssh.remote.host"]')).toBeNull();
+      } else if (target === 'localDocker') {
+        expect(sshApiMock.listWslDistributions).toHaveBeenCalled();
       } else {
         expect(sshApiMock.listWslDistributions).not.toHaveBeenCalled();
       }
@@ -480,8 +482,8 @@ describe('SSHConnectionDialog', () => {
     },
   );
   async function selectWsl(): Promise<void> {
-    selectTarget('wsl');
-    await act(async () => { await Promise.resolve(); });
+    await act(async () => sourceOption(0, 'current').click());
+    await act(async () => sourceOption(1, 'wsl').click());
     openAdvanced();
   }
 
@@ -535,8 +537,11 @@ describe('SSHConnectionDialog', () => {
     await selectWsl();
     expect(container.textContent).toContain('ssh.remote.wslDiscoveryFailed');
     expect(findConnectButton()?.disabled).toBe(true);
-    const refresh = container.querySelector<HTMLButtonElement>('button[aria-label="ssh.remote.wslRefresh"]');
-    await act(async () => { refresh?.click(); });
+    expect(sourceOption(1, 'wsl').disabled).toBe(true);
+    const refresh = Array.from(container.querySelectorAll('button')).find(button => button.textContent === 'workspaceSource.refreshOptions')!;
+    await act(async () => refresh.click());
+    expect(sourceOption(1, 'wsl').disabled).toBe(false);
+    await selectWsl();
     expect(findConnectButton()?.disabled).toBe(false);
   });
 
diff --git a/src/web-ui/src/features/ssh-remote/WorkspaceSourceSelector.tsx b/src/web-ui/src/features/ssh-remote/WorkspaceSourceSelector.tsx
index e25e451d2d..23749a8a15 100644
--- a/src/web-ui/src/features/ssh-remote/WorkspaceSourceSelector.tsx
+++ b/src/web-ui/src/features/ssh-remote/WorkspaceSourceSelector.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useId, useState, type ReactNode } from 'react';
-import { OverflowText, SegmentedControl } from '@openbitfun/ui';
+import { Button, OverflowText, SegmentedControl } from '@openbitfun/ui';
 import { useI18n } from '@/infrastructure/i18n';
 import { usePeerDeviceModeOptional } from '@/infrastructure/peer-device/peerDeviceContextState';
 import { DeviceSystemGlyph } from '@/app/components/NavPanel/components/DeviceSystemGlyph';
@@ -10,6 +10,7 @@ import {
   type WorkspaceEnvironment, type WorkspaceLocation, type WorkspaceSource,
 } from './workspaceSource';
 import './WorkspaceSourceSelector.scss';
+import { useWslSupport } from './useWslSupport';
 
 interface WorkspaceSourceSelectorProps {
   value: WorkspaceSource;
@@ -22,10 +23,11 @@ interface WorkspaceSourceSelectorProps {
   locationActions?: ReactNode;
   environmentActions?: ReactNode;
   showEnvironment?: boolean;
+  onWslSupportChange?: (supported: boolean) => void;
 }
 
 export function WorkspaceSourceSelector({
-  value, onValueChange, disabled, allowHostDirectory = true, locationOptions, environmentOptions, locationActions, environmentActions, showEnvironment = true,
+  value, onValueChange, disabled, allowHostDirectory = true, locationOptions, environmentOptions, locationActions, environmentActions, showEnvironment = true, onWslSupportChange,
 }: WorkspaceSourceSelectorProps) {
   const { t } = useI18n('common');
   const peer = usePeerDeviceModeOptional();
@@ -35,6 +37,10 @@ export function WorkspaceSourceSelector({
   const locationId = useId();
   const environmentId = useId();
   const { location, environment } = workspaceSourceCoordinates(value);
+  const wsl = useWslSupport(location === 'current' && showEnvironment);
+  const wslSupported = wsl.status === 'supported';
+  useEffect(() => { onWslSupportChange?.(wslSupported); }, [onWslSupportChange, wslSupported]);
+  const wslHintId = useId();
   const peerActive = peer?.peerMode.active === true;
   useEffect(() => {
     if (peerActive || location !== 'current') return;
@@ -80,15 +86,20 @@ export function WorkspaceSourceSelector({
       <div className="workspace-source-selector__heading">
       <span id={environmentId} className="workspace-source-selector__label" data-openbitfun-component="ssh-remote" data-openbitfun-part="sourceLabel">{t('workspaceSource.environment')}</span>
       <SegmentedControl className="workspace-source-selector__control" size="sm" distribution="content" aria-labelledby={environmentId}
-        value={environment} disabled={disabled}
+        value={environment} disabled={disabled} aria-describedby={location === 'current' && !wslSupported ? wslHintId : undefined}
         options={[
           { value: 'system', label: t('workspaceSource.system'), disabled: location === 'current' && !allowHostDirectory },
           { value: 'container', label: t('workspaceSource.container') },
-          { value: 'wsl', label: t('workspaceSource.wsl'), disabled: location === 'other' },
+          { value: 'wsl', label: t('workspaceSource.wsl'), disabled: location === 'other' || !wslSupported },
         ]}
         onValueChange={value => onValueChange?.(workspaceSourceFor(location, value as WorkspaceEnvironment))} />
       {environmentActions && <div className="workspace-source-selector__actions">{environmentActions}</div>}
       </div>
+      {location === 'current' && !wslSupported && <div id={wslHintId} className="workspace-source-selector__device" role="status">
+        <span>{t(wsl.status === 'checking' ? 'workspaceSource.checkingWsl'
+          : wsl.status === 'unsupported' ? 'ssh.remote.wslUnsupported' : 'ssh.remote.wslDiscoveryFailed')}</span>
+        {wsl.status === 'unavailable' && <Button size="sm" variant="quiet" disabled={disabled} onClick={wsl.retry}>{t('workspaceSource.refreshOptions')}</Button>}
+      </div>}
       {environmentOptions}
     </div>}
   </div>;
diff --git a/src/web-ui/src/features/ssh-remote/useWslSupport.test.tsx b/src/web-ui/src/features/ssh-remote/useWslSupport.test.tsx
new file mode 100644
index 0000000000..833f7d700b
--- /dev/null
+++ b/src/web-ui/src/features/ssh-remote/useWslSupport.test.tsx
@@ -0,0 +1,42 @@
+// @vitest-environment jsdom
+import React, { act } from 'react';
+import { createRoot, type Root } from 'react-dom/client';
+import { afterEach, beforeEach, expect, it, vi } from 'vitest';
+import { activateSurface, resetDeviceSurfaceForTest } from '@/infrastructure/peer-device/deviceSurface';
+import { useWslSupport } from './useWslSupport';
+const list = vi.hoisted(() => vi.fn());
+vi.mock('./sshApi', () => ({ sshApi: { listWslDistributions: list } }));
+let result: ReturnType<typeof useWslSupport>;
+function Fixture() { result = useWslSupport(true); return <div>{result.status}</div>; }
+let root: Root, host: HTMLDivElement;
+beforeEach(() => {
+  resetDeviceSurfaceForTest(); list.mockReset();
+  host = document.createElement('div'); document.body.append(host); root = createRoot(host);
+});
+afterEach(async () => { await act(async () => root.unmount()); host.remove(); resetDeviceSurfaceForTest(); });
+it('probes each active host and discards stale support from the previous host', async () => {
+  list.mockResolvedValueOnce({ supported: false });
+  await act(async () => root.render(<Fixture />));
+  expect(result.status).toBe('unsupported');
+  let finish!: (value: unknown) => void;
+  list.mockReturnValueOnce(new Promise(resolve => { finish = resolve; }));
+  await act(async () => activateSurface('windows-peer'));
+  expect(result.status).toBe('checking');
+  list.mockResolvedValueOnce({ supported: true });
+  await act(async () => activateSurface('other-peer'));
+  expect(result.status).toBe('supported');
+  await act(async () => finish({ supported: false }));
+  expect(result.status).toBe('supported');
+  expect(list).toHaveBeenCalledTimes(3);
+});
+it('offers retry for a failed probe and treats a legacy host capability error as unsupported', async () => {
+  list.mockRejectedValueOnce(new Error('Host offline'));
+  await act(async () => root.render(<Fixture />));
+  expect(result.status).toBe('unavailable');
+  list.mockResolvedValueOnce({ supported: true });
+  await act(async () => result.retry());
+  expect(result.status).toBe('supported');
+  list.mockRejectedValueOnce(new Error('wsl_workspaces_v1_unsupported'));
+  await act(async () => activateSurface('legacy-peer'));
+  expect(result.status).toBe('unsupported');
+});
diff --git a/src/web-ui/src/features/ssh-remote/useWslSupport.ts b/src/web-ui/src/features/ssh-remote/useWslSupport.ts
new file mode 100644
index 0000000000..2ecc145d01
--- /dev/null
+++ b/src/web-ui/src/features/ssh-remote/useWslSupport.ts
@@ -0,0 +1,27 @@
+import { useEffect, useState, useSyncExternalStore } from 'react';
+import { getActiveSurfaceScope, onSurfaceActivated } from '@/infrastructure/peer-device/deviceSurface';
+import { sshApi } from './sshApi';
+import { workspaceSourceErrorKey } from './workspaceSourceError';
+
+type WslSupport = 'checking' | 'supported' | 'unsupported' | 'unavailable';
+
+/** Probe the active runtime through the transport; the controller OS is irrelevant. */
+export function useWslSupport(enabled: boolean) {
+  const scope = useSyncExternalStore(onSurfaceActivated, getActiveSurfaceScope, getActiveSurfaceScope);
+  const [result, setResult] = useState<{ scope: typeof scope; status: WslSupport }>();
+  const [attempt, setAttempt] = useState(0);
+  useEffect(() => {
+    if (!enabled) return;
+    let cancelled = false;
+    setResult({ scope, status: 'checking' });
+    void sshApi.listWslDistributions().then(data => {
+      if (!cancelled && scope.isCurrent()) setResult({ scope, status: data.supported ? 'supported' : 'unsupported' });
+    }).catch(error => {
+      if (!cancelled && scope.isCurrent()) setResult({ scope, status:
+        workspaceSourceErrorKey('wsl', error) === 'ssh.remote.wslUnsupported' ? 'unsupported' : 'unavailable' });
+    });
+    return () => { cancelled = true; };
+  }, [enabled, scope, attempt]);
+  return { status: enabled && result?.scope === scope ? result.status : 'checking' as WslSupport,
+    retry: () => setAttempt(value => value + 1) };
+}
diff --git a/src/web-ui/src/flow_chat/components/ChatInputWorkspaceStrip.test.tsx b/src/web-ui/src/flow_chat/components/ChatInputWorkspaceStrip.test.tsx
index 1e9b641e39..8ed6ae46bd 100644
--- a/src/web-ui/src/flow_chat/components/ChatInputWorkspaceStrip.test.tsx
+++ b/src/web-ui/src/flow_chat/components/ChatInputWorkspaceStrip.test.tsx
@@ -8,6 +8,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { ChatInputWorkspaceStrip } from './ChatInputWorkspaceStrip';
 import type { WorkspaceInfo } from '@/shared/types';
+import { formatDuration } from '@/shared/utils/format';
 
 const mocks = vi.hoisted(() => ({
   refreshBasic: vi.fn(async () => undefined),
@@ -1342,7 +1343,7 @@ describe('ChatInputWorkspaceStrip git refresh behavior', () => {
     expect(control?.getAttribute('aria-haspopup')).toBe('dialog');
     expect(control?.getAttribute('aria-label')).toBe('Open thread goal');
     expect(control?.textContent).toContain('Active');
-    expect(control?.textContent).toContain('1h 30m');
+    expect(control?.textContent).toContain(formatDuration(5_400_000));
     // The objective is long-form, so it stays in the tooltip rather than
     // competing with the state for the width of the track.
     expect(control?.textContent).not.toContain('Ship the goal entry');
@@ -1478,13 +1479,13 @@ describe('ChatInputWorkspaceStrip git refresh behavior', () => {
         );
       });
 
-      expect(readout()).toContain('5s');
+      expect(readout()).toContain(formatDuration(5_000));
 
       act(() => {
         vi.advanceTimersByTime(3_000);
       });
 
-      expect(readout()).toContain('8s');
+      expect(readout()).toContain(formatDuration(8_000));
     } finally {
       vi.useRealTimers();
     }
@@ -1518,7 +1519,7 @@ describe('ChatInputWorkspaceStrip git refresh behavior', () => {
         vi.advanceTimersByTime(3_000);
       });
 
-      expect(readout()).toContain('5s');
+      expect(readout()).toContain(formatDuration(5_000));
     } finally {
       vi.useRealTimers();
     }
diff --git a/src/web-ui/src/flow_chat/components/modern/SessionFilesBadge.test.tsx b/src/web-ui/src/flow_chat/components/modern/SessionFilesBadge.test.tsx
index cb2a2f9779..6f8fef86f7 100644
--- a/src/web-ui/src/flow_chat/components/modern/SessionFilesBadge.test.tsx
+++ b/src/web-ui/src/flow_chat/components/modern/SessionFilesBadge.test.tsx
@@ -10,6 +10,7 @@ import { notificationService } from '../../../shared/notification-system';
 globalThis.IS_REACT_ACT_ENVIRONMENT = true;
 
 const mocks = vi.hoisted(() => ({
+  quickActions: [] as Array<{ id: string; label: string; prompt: string; enabled: boolean }>,
   files: [] as Array<{ filePath: string; sessionId: string }>,
   getSessionFileDiffStats: vi.fn(),
   getOperationDiff: vi.fn(),
@@ -25,8 +26,9 @@ vi.mock('react-i18next', () => ({
     type: '3rdParty',
     init: vi.fn(),
   },
-  useTranslation: () => ({
+  useTranslation: (namespace: string) => ({
     t: (key: string, options?: Record<string, unknown>) => {
+      if (namespace === 'settings/quick-actions' && key === 'quickActions.defaults.commit.label') return '提交';
       const messages: Record<string, string> = {
         'sessionFilesBadge.actionsButton': 'Actions',
         'sessionFilesBadge.actionsMenuHint': 'Quick actions',
@@ -131,7 +133,7 @@ vi.mock('../../hooks/useSessionStateMachine', () => ({
 vi.mock('@/infrastructure/config/services/AIExperienceConfigService', () => ({
   DEFAULT_QUICK_ACTIONS: [{ id: 'fixture-default', label: 'Default fixture action', prompt: 'fixture', enabled: true }],
   aiExperienceConfigService: {
-    getSettings: () => ({ quick_actions: [] }),
+    getSettings: () => ({ quick_actions: mocks.quickActions }),
     addChangeListener: (listener: (settings: { quick_actions: unknown[] }) => void) => {
       mocks.settingsListeners.add(listener);
       return () => mocks.settingsListeners.delete(listener);
@@ -139,9 +141,6 @@ vi.mock('@/infrastructure/config/services/AIExperienceConfigService', () => ({
   },
 }));
 
-vi.mock('@/infrastructure/config/services/quickActionLocalization', () => ({
-  resolveQuickActionText: vi.fn(),
-}));
 
 vi.mock('../../utils/deepReviewCapacityGuard', () => ({
   deriveDeepReviewSessionConcurrencyGuard: vi.fn(),
@@ -167,6 +166,7 @@ describe('SessionFilesBadge', () => {
     container = dom.window.document.getElementById('root') as HTMLDivElement;
     root = createRoot(container);
 
+    mocks.quickActions = [];
     mocks.files = [
       { filePath: 'src/current-session.ts', sessionId: 'session-1' },
       { filePath: 'src/stale-session.ts', sessionId: 'session-1' },
@@ -270,6 +270,20 @@ describe('SessionFilesBadge', () => {
     expect(dom.window.document.body.textContent).not.toContain('Default fixture action');
   });
 
+  it('loads built-in action names from their owning namespace and retains custom names', async () => {
+    mocks.quickActions = [
+      { id: 'commit', label: 'Commit', prompt: 'Commit all current code changes', enabled: true },
+      { id: 'custom', label: 'My workflow', prompt: 'custom task', enabled: true },
+    ];
+    await act(async () => { root.render(<SessionFilesBadge sessionId="session-1" />); });
+    await act(async () => {
+      container.querySelector<HTMLButtonElement>('.session-files-badge__review-btn')!.click();
+    });
+    expect(dom.window.document.body.textContent).toContain('提交');
+    expect(dom.window.document.body.textContent).toContain('My workflow');
+    expect(dom.window.document.body.textContent).not.toContain('Commit');
+  });
+
   it('shows a localized error when Review cannot be prepared', async () => {
     vi.mocked(prepareReviewLaunchFromSessionFiles).mockRejectedValueOnce(
       new Error('review policy unavailable'),
diff --git a/src/web-ui/src/flow_chat/components/modern/SessionFilesBadge.tsx b/src/web-ui/src/flow_chat/components/modern/SessionFilesBadge.tsx
index f05e6491bb..ddbf29ef39 100644
--- a/src/web-ui/src/flow_chat/components/modern/SessionFilesBadge.tsx
+++ b/src/web-ui/src/flow_chat/components/modern/SessionFilesBadge.tsx
@@ -6,6 +6,7 @@
 import React, { useState, useCallback, useMemo, useEffect, useRef } from 'react';
 import { FilePlus, SearchCheck, Zap, GitPullRequest } from 'lucide-react';
 import { useTranslation } from 'react-i18next';
+import { useI18n } from '@/infrastructure/i18n';
 import { createOverlayPortal, useDismissibleLayer, OverflowText, Icon, IconButton, Menu, MenuItem, MenuSeparator, Tooltip } from '@openbitfun/ui';
 import { useSnapshotState } from '../../../tools/snapshot_system/hooks/useSnapshotState';
 import { createDiffEditorTab } from '../../../shared/utils/tabUtils';
@@ -155,6 +156,7 @@ export const SessionFilesBadge: React.FC<SessionFilesBadgeProps> = ({
   disabled = false,
 }) => {
   const { t } = useTranslation('flow-chat');
+  const { t: tQuickActions } = useI18n('settings/quick-actions');
   const canLaunchReview = isTauriRuntime();
   const { files } = useSnapshotState(sessionId);
   const { currentWorkspace } = useWorkspaceContext();
@@ -710,7 +712,7 @@ export const SessionFilesBadge: React.FC<SessionFilesBadgeProps> = ({
   const handleQuickActionClick = useCallback(async (action: QuickAction) => {
     if (!sessionId || isSessionProcessing) return;
     setIsReviewMenuOpen(false);
-    const actionText = resolveQuickActionText(action, t);
+    const actionText = resolveQuickActionText(action, tQuickActions);
     try {
       const { FlowChatManager } = await import('../../services/FlowChatManager');
       await FlowChatManager.getInstance().sendMessage(
@@ -721,7 +723,7 @@ export const SessionFilesBadge: React.FC<SessionFilesBadgeProps> = ({
     } catch (error) {
       log.error('Failed to trigger quick action', { actionId: action.id, error });
     }
-  }, [sessionId, isSessionProcessing, t]);
+  }, [sessionId, isSessionProcessing, tQuickActions]);
 
   const getOperationIcon = (operationType: 'write' | 'edit' | 'delete') => {
     switch (operationType) {
@@ -820,7 +822,7 @@ export const SessionFilesBadge: React.FC<SessionFilesBadgeProps> = ({
             )}
 
             {quickActions.filter(a => a.enabled).map(action => {
-              const actionText = resolveQuickActionText(action, t);
+              const actionText = resolveQuickActionText(action, tQuickActions);
               return (
                 <MenuItem data-openbitfun-component="session-files-badge" data-openbitfun-part="reviewItem"
                   key={action.id}
diff --git a/src/web-ui/src/flow_chat/components/usage/SessionUsageComponents.test.tsx b/src/web-ui/src/flow_chat/components/usage/SessionUsageComponents.test.tsx
index 51e560c08f..f01606dbf4 100644
--- a/src/web-ui/src/flow_chat/components/usage/SessionUsageComponents.test.tsx
+++ b/src/web-ui/src/flow_chat/components/usage/SessionUsageComponents.test.tsx
@@ -3,6 +3,7 @@ import { createRoot, type Root } from 'react-dom/client';
 import { JSDOM } from 'jsdom';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import fs from 'node:fs';
+import { formatDuration } from '@/shared/utils/format';
 import path from 'node:path';
 
 import type { SessionUsageReport } from '@/infrastructure/api/service-api/SessionAPI';
@@ -532,6 +533,28 @@ describe('Session usage report UI components', () => {
     });
   };
 
+  it.each([undefined, null])('distinguishes a new session from missing telemetry with a %s file count', changedFiles => {
+    const report = usageReport({
+      scope: { kind: 'entire_session', turnCount: 0, includesSubagents: false },
+      tokens: { source: 'unavailable', cacheCoverage: 'unavailable' },
+      models: [{ modelId: 'unknown_model', callCount: 0 }],
+      tools: [], files: { scope: 'unavailable', files: [] },
+      errors: { totalErrors: 0, toolErrors: 0, modelErrors: 0, examples: [] },
+      compression: { compactionCount: 0, manualCompactionCount: 0, automaticCompactionCount: 0 },
+    });
+    // Rust Option serializes as null; legacy payloads may omit the field.
+    Object.assign(report.files, { changedFiles });
+    for (const Component of [SessionUsageReportCard, SessionUsagePanel]) {
+      render(<Component report={report} />);
+      expect(container.querySelector('[data-testid="session-usage-empty"]')).not.toBeNull();
+      expect(container.textContent).not.toContain('Unavailable');
+      render(<Component report={{ ...report, scope: { ...report.scope, turnCount: 1 } }} />);
+      expect(container.querySelector('[data-testid="session-usage-empty"]')).toBeNull();
+      render(<Component report={{ ...report, models: [{ modelId: 'unknown_model', callCount: 1 }] }} />);
+      expect(container.querySelector('[data-testid="session-usage-empty"]')).toBeNull();
+    }
+  });
+
   it('renders localized partial coverage and cache unavailable without showing zero', () => {
     const onOpenDetails = vi.fn();
     const report = usageReport();
@@ -1035,7 +1058,7 @@ describe('Session usage report UI components', () => {
     });
 
     expect(container.textContent).toContain('Recorded time');
-    expect(container.textContent).toContain('40s');
+    expect(container.textContent).toContain(formatDuration(40000));
 
     const reportWithoutModelDuration = usageReport({
       models: [
@@ -1662,7 +1685,7 @@ describe('Session usage report UI components', () => {
     // is hard-coded English numbered from zero.
     expect(container.textContent).toContain('Turn 3');
     expect(container.textContent).not.toContain('turn 2');
-    expect(container.textContent).toContain('1m 35s');
+    expect(container.textContent).toContain(formatDuration(95000));
     expect(container.textContent).toContain('Redacted');
     expect(container.textContent).not.toContain('secret shell command');
 
@@ -1727,7 +1750,7 @@ describe('Session usage report UI components', () => {
     expect(container.textContent).toContain('28');
     expect(container.textContent).toContain('Timed out');
     expect(container.textContent).toContain('Execution');
-    expect(container.textContent).toContain('1m 35s');
+    expect(container.textContent).toContain(formatDuration(95000));
     expect(container.textContent).toContain('operation timed out');
 
     const toolLink = container.querySelector<HTMLButtonElement>('.session-usage-panel__turn-link');
diff --git a/src/web-ui/src/flow_chat/components/usage/SessionUsageEmptyState.tsx b/src/web-ui/src/flow_chat/components/usage/SessionUsageEmptyState.tsx
new file mode 100644
index 0000000000..84a015ed5f
--- /dev/null
+++ b/src/web-ui/src/flow_chat/components/usage/SessionUsageEmptyState.tsx
@@ -0,0 +1,14 @@
+import { Empty } from '@openbitfun/ui';
+import { useTranslation } from 'react-i18next';
+
+export function SessionUsageEmptyState() {
+  const { t } = useTranslation('flow-chat');
+  return (
+    <Empty
+      data-testid="session-usage-empty"
+      role="status"
+      title={t('usage.empty.session')}
+      description={t('usage.empty.sessionDescription')}
+    />
+  );
+}
diff --git a/src/web-ui/src/flow_chat/components/usage/SessionUsagePanel.tsx b/src/web-ui/src/flow_chat/components/usage/SessionUsagePanel.tsx
index 626372db84..9b9f5c8b9c 100644
--- a/src/web-ui/src/flow_chat/components/usage/SessionUsagePanel.tsx
+++ b/src/web-ui/src/flow_chat/components/usage/SessionUsagePanel.tsx
@@ -15,6 +15,7 @@ import {
 import {
   calculateShare,
   buildSessionUsageExportMarkdown,
+  isUnusedSession,
   formatHitRatePercent,
   formatUsageDuration,
   formatUsageNumber,
@@ -39,6 +40,7 @@ import {
   subscribeUsageExportRedactPathsPreference,
   getDisplayTurnIndex,
 } from './usageReportUtils';
+import { SessionUsageEmptyState } from './SessionUsageEmptyState';
 import type { SessionUsagePanelTab } from './sessionUsagePanelTypes';
 import { sessionWorkspaceId } from '../../session-drivers/sessionFileNavigation';
 import './SessionUsagePanel.scss';
@@ -136,6 +138,10 @@ export const SessionUsagePanel: React.FC<SessionUsagePanelProps> = ({
     );
   }
 
+  if (isUnusedSession(report)) {
+    return <SessionUsageEmptyState />;
+  }
+
   const coverageTone = getCoverageTone(report.coverage.level);
   const effectiveSessionId = sessionId ?? report.sessionId;
   const effectiveWorkspacePath = workspacePath ?? report.workspace.pathLabel;
diff --git a/src/web-ui/src/flow_chat/components/usage/SessionUsageReportCard.tsx b/src/web-ui/src/flow_chat/components/usage/SessionUsageReportCard.tsx
index 3da3649b22..a6c5321c3b 100644
--- a/src/web-ui/src/flow_chat/components/usage/SessionUsageReportCard.tsx
+++ b/src/web-ui/src/flow_chat/components/usage/SessionUsageReportCard.tsx
@@ -8,6 +8,7 @@ import type { SessionUsageReport } from '@/infrastructure/api/service-api/Sessio
 import { copyTextToClipboard } from '@/shared/utils/textSelection';
 import {
   buildSessionUsageExportMarkdown,
+  isUnusedSession,
   formatHitRateSuffix,
   formatUsageDuration,
   formatUsageNumber,
@@ -30,6 +31,7 @@ import {
   setUsageExportRedactPathsPreference,
   subscribeUsageExportRedactPathsPreference,
 } from './usageReportUtils';
+import { SessionUsageEmptyState } from './SessionUsageEmptyState';
 import type { SessionUsagePanelTab } from './sessionUsagePanelTypes';
 import './SessionUsageReportCard.scss';
 
@@ -160,6 +162,10 @@ export const SessionUsageReportCard: React.FC<SessionUsageReportCardProps> = ({
     );
   }
 
+  if (isUnusedSession(report)) {
+    return <SessionUsageEmptyState />;
+  }
+
   const coverageTone = getCoverageTone(report.coverage.level);
   const tokenTotal = report.tokens.totalTokens;
   const cachedTokenText = report.tokens.cacheCoverage === 'unavailable'
diff --git a/src/web-ui/src/flow_chat/components/usage/usageReportUtils.ts b/src/web-ui/src/flow_chat/components/usage/usageReportUtils.ts
index 9df10da8ba..9b713b6948 100644
--- a/src/web-ui/src/flow_chat/components/usage/usageReportUtils.ts
+++ b/src/web-ui/src/flow_chat/components/usage/usageReportUtils.ts
@@ -1,3 +1,4 @@
+import { formatDuration } from '@/shared/utils/format';
 import type { SessionUsageReport } from '@/infrastructure/api/service-api/SessionAPI';
 import { i18nService } from '@/infrastructure/i18n';
 import {
@@ -15,9 +16,19 @@ export const USAGE_EXPORT_REDACT_PATHS_STORAGE_KEY = 'openbitfun.sessionUsage.ex
 type UsageRedactPathsPreferenceListener = (redactPaths: boolean) => void;
 const usageRedactPathsPreferenceListeners = new Set<UsageRedactPathsPreferenceListener>();
 
+/** A missing telemetry field is not evidence that a session never ran. */
+export function isUnusedSession(report: SessionUsageReport): boolean {
+  return report.scope.kind === 'entire_session' && report.scope.turnCount === 0 &&
+    !report.models.some(model => model.callCount > 0) &&
+    !report.tools.some(tool => tool.callCount > 0) &&
+    !(report.tokens.totalTokens || report.tokens.inputTokens || report.tokens.outputTokens) &&
+    report.errors.totalErrors === 0 && report.compression.compactionCount === 0 &&
+    report.slowest.length === 0 && hasNoRecordedFileChanges(report);
+}
+
 export function hasNoRecordedFileChanges(report: SessionUsageReport): boolean {
   return report.files.files.length === 0 &&
-    (report.files.changedFiles === undefined || report.files.changedFiles === 0);
+    (report.files.changedFiles == null || report.files.changedFiles === 0);
 }
 
 export function isSessionUsageReport(value: unknown): value is SessionUsageReport {
@@ -64,36 +75,7 @@ export function formatUsageDuration(value: number | undefined, t: Translator): s
   if (typeof value !== 'number' || !Number.isFinite(value)) {
     return t('usage.unavailable');
   }
-  if (value < 1000) {
-    return t('usage.duration.ms', { value: Math.max(0, Math.round(value)) });
-  }
-
-  const seconds = Math.round(value / 1000);
-  if (seconds < 60) {
-    return t('usage.duration.seconds', { value: seconds });
-  }
-
-  const minutes = Math.floor(seconds / 60);
-  const remainingSeconds = seconds % 60;
-  if (minutes < 60) {
-    return remainingSeconds === 0
-      ? t('usage.duration.minutes', { value: minutes })
-      : t('usage.duration.minutesSeconds', { minutes, seconds: remainingSeconds });
-  }
-
-  const hours = Math.floor(minutes / 60);
-  const remainingMinutes = minutes % 60;
-  if (hours < 24) {
-    return remainingMinutes === 0
-      ? t('usage.duration.hours', { value: hours })
-      : t('usage.duration.hoursMinutes', { hours, minutes: remainingMinutes });
-  }
-
-  const days = Math.floor(hours / 24);
-  const remainingHours = hours % 24;
-  return remainingHours === 0
-    ? t('usage.duration.days', { value: days })
-    : t('usage.duration.daysHours', { days, hours: remainingHours });
+  return formatDuration(value);
 }
 
 export function formatUsageTimestamp(value: number | undefined, t: Translator): string {
diff --git a/src/web-ui/src/flow_chat/tool-cards/ToolTimeoutIndicator.test.tsx b/src/web-ui/src/flow_chat/tool-cards/ToolTimeoutIndicator.test.tsx
index 371b01e2ee..6ff5f41d88 100644
--- a/src/web-ui/src/flow_chat/tool-cards/ToolTimeoutIndicator.test.tsx
+++ b/src/web-ui/src/flow_chat/tool-cards/ToolTimeoutIndicator.test.tsx
@@ -1,3 +1,4 @@
+import { formatDuration } from '@/shared/utils/format';
 import React from 'react';
 import { act } from 'react';
 import { createRoot, type Root } from 'react-dom/client';
@@ -131,8 +132,8 @@ describe('ToolTimeoutIndicator', () => {
     );
 
     expect(html).toContain('duration-text--completed-success');
-    expect(html).toContain('Completed in 1.3s');
-    expect(html).toContain('1.3s');
+    expect(html).toContain(`Completed in ${formatDuration(1250)}`);
+    expect(html).toContain(formatDuration(1250));
     expect(html).not.toContain('<svg');
   });
 
@@ -160,8 +161,8 @@ describe('ToolTimeoutIndicator', () => {
     );
 
     expect(html).toContain('duration-text--completed-error');
-    expect(html).toContain('Failed after 2.4s: provider timed out');
-    expect(html).toContain('2.4s');
+    expect(html).toContain(`Failed after ${formatDuration(2400)}: provider timed out`);
+    expect(html).toContain(formatDuration(2400));
     expect(html).not.toContain('<svg');
   });
 
diff --git a/src/web-ui/src/flow_chat/tool-cards/ToolTimeoutIndicator.tsx b/src/web-ui/src/flow_chat/tool-cards/ToolTimeoutIndicator.tsx
index ec2a41f4f4..40c2b61770 100644
--- a/src/web-ui/src/flow_chat/tool-cards/ToolTimeoutIndicator.tsx
+++ b/src/web-ui/src/flow_chat/tool-cards/ToolTimeoutIndicator.tsx
@@ -1,7 +1,8 @@
+import { formatDuration } from '@/shared/utils/format';
 import React, { useRef, useEffect } from 'react';
 import { subscribeOverlayInteraction, createOverlayPortal, Menu, MenuItem, Icon } from '@openbitfun/ui';
 import { Infinity as InfinityIcon } from 'lucide-react';
-import { ToolDuration, formatDurationPrecise } from '@openbitfun/ui/flow-chat';
+import { ToolDuration } from '@openbitfun/ui/flow-chat';
 import { useTranslation } from 'react-i18next';
 import { getAppearanceOverlayHost } from '@/infrastructure/appearance/runtime/AppearanceOverlayHost';
 import { useAnchoredPopoverPosition } from '@/shared/utils/useAnchoredPopoverPosition';
@@ -106,7 +107,7 @@ export const ToolTimeoutIndicator: React.FC<ToolTimeoutIndicatorProps> = ({
 
   // Completed state: show precise duration when the card is expanded.
   if (!isRunning && completedDurationMs != null && showCompletedDuration) {
-    const durationLabel = formatDurationPrecise(completedDurationMs);
+    const durationLabel = formatDuration(completedDurationMs);
     const completionLabel = completedTooltip || (
       completedStatus === 'success'
         ? t('toolCards.timeout.completedDurationTooltip', {
@@ -130,7 +131,7 @@ export const ToolTimeoutIndicator: React.FC<ToolTimeoutIndicatorProps> = ({
             })
     );
 
-    return <ToolDuration isRunning={false} showIcon={showIcon} completedDurationMs={completedDurationMs}
+    return <ToolDuration formatDuration={formatDuration} isRunning={false} showIcon={showIcon} completedDurationMs={completedDurationMs}
       completedStatus={completedStatus} completionLabel={completionLabel} />;
   }
 
@@ -140,7 +141,7 @@ export const ToolTimeoutIndicator: React.FC<ToolTimeoutIndicatorProps> = ({
   const hasTimeout = Boolean(timeoutMs && timeoutMs > 0);
   const canControlTimeout = showControls && hasTimeout && Boolean(subagentSessionId);
   return (
-    <ToolDuration isRunning showIcon={showIcon} elapsedMs={elapsedMs} remainingMs={remainingMs} timeoutMs={timeoutMs}
+    <ToolDuration formatDuration={formatDuration} isRunning showIcon={showIcon} elapsedMs={elapsedMs} remainingMs={remainingMs} timeoutMs={timeoutMs}
       timeoutDisabled={isTimeoutDisabled} open={isPopoverOpen}>
       {canControlTimeout && (
         <div data-openbitfun-component="tool-timeout-indicator" data-openbitfun-part="controls" className="timeout-control-wrapper" ref={controlRef}>
diff --git a/src/web-ui/src/flow_chat/utils/tokenUsageDisplay.test.ts b/src/web-ui/src/flow_chat/utils/tokenUsageDisplay.test.ts
index e7fb4d406c..61ee390f24 100644
--- a/src/web-ui/src/flow_chat/utils/tokenUsageDisplay.test.ts
+++ b/src/web-ui/src/flow_chat/utils/tokenUsageDisplay.test.ts
@@ -1,3 +1,4 @@
+import { formatDuration } from '@/shared/utils/format';
 import { describe, expect, it } from 'vitest';
 import type { DialogTurn, Session, TokenUsage } from '../types/flow-chat';
 import {
@@ -187,7 +188,7 @@ describe('tokenUsageDisplay', () => {
       t,
     })).toEqual([
       { key: 'completed', label: 'Completed', value: '12:00:00 PM' },
-      { key: 'duration', label: 'Duration', value: '5m23s' },
+      { key: 'duration', label: 'Duration', value: formatDuration(323000) },
     ]);
   });
 
@@ -200,7 +201,7 @@ describe('tokenUsageDisplay', () => {
       t,
     })).toEqual([
       { key: 'completed', label: 'Stopped', value: '12:00:00' },
-      { key: 'duration', label: 'Duration', value: '12.3s' },
+      { key: 'duration', label: 'Duration', value: formatDuration(12345) },
     ]);
   });
 
@@ -210,7 +211,7 @@ describe('tokenUsageDisplay', () => {
     expect(buildModelRoundCompletionMeta({ completedAt: NaN, durationMs: Infinity, formatTime, t })).toEqual([]);
     expect(buildModelRoundCompletionMeta({ durationMs: -1, formatTime, t })).toEqual([]);
     expect(buildModelRoundCompletionMeta({ durationMs: 0, formatTime, t })).toEqual([
-      { key: 'duration', label: 'Duration', value: '0ms' },
+      { key: 'duration', label: 'Duration', value: formatDuration(0) },
     ]);
   });
 
diff --git a/src/web-ui/src/flow_chat/utils/tokenUsageDisplay.ts b/src/web-ui/src/flow_chat/utils/tokenUsageDisplay.ts
index 2419fabd42..e11623e100 100644
--- a/src/web-ui/src/flow_chat/utils/tokenUsageDisplay.ts
+++ b/src/web-ui/src/flow_chat/utils/tokenUsageDisplay.ts
@@ -1,3 +1,4 @@
+import { formatDuration } from '@/shared/utils/format';
 import type { DialogTurn, Session, TokenUsage } from '../types/flow-chat';
 import { LONG_CONTEXT_WARNING_THRESHOLD_TOKENS } from '@/shared/constants/modelContext';
 import { i18nService } from '@/infrastructure/i18n';
@@ -148,10 +149,6 @@ export function buildModelSelectorTooltipDetails(params: {
   };
 }
 
-function formatCompactNumber(value: number): string {
-  return Number.isInteger(value) ? String(value) : value.toFixed(1).replace(/\.0$/, '');
-}
-
 /**
  * Derive the latest terminal turn-with-usage's token usage as a
  * context-usage approximation when it represents exactly one model round.
@@ -241,26 +238,7 @@ export function buildContextUsageTooltip(params: {
 }
 
 export function formatElapsedDuration(durationMs: number): string {
-  const safeMs = Math.max(0, Math.round(durationMs));
-  if (safeMs < 1000) {
-    return `${safeMs}ms`;
-  }
-
-  const seconds = safeMs / 1000;
-  if (seconds < 60) {
-    return `${formatCompactNumber(Math.round(seconds * 10) / 10)}s`;
-  }
-
-  const wholeSeconds = Math.round(seconds);
-  const minutes = Math.floor(wholeSeconds / 60);
-  const remainingSeconds = wholeSeconds % 60;
-  if (minutes < 60) {
-    return remainingSeconds === 0 ? `${minutes}m` : `${minutes}m${remainingSeconds}s`;
-  }
-
-  const hours = Math.floor(minutes / 60);
-  const remainingMinutes = minutes % 60;
-  return remainingMinutes === 0 ? `${hours}h` : `${hours}h${remainingMinutes}m`;
+  return formatDuration(durationMs);
 }
 
 export function buildModelRoundCompletionMeta(params: {
diff --git a/src/web-ui/src/infrastructure/config/components/common/ConfigPageLayout.test.tsx b/src/web-ui/src/infrastructure/config/components/common/ConfigPageLayout.test.tsx
index 2513e3276e..893cce4a44 100644
--- a/src/web-ui/src/infrastructure/config/components/common/ConfigPageLayout.test.tsx
+++ b/src/web-ui/src/infrastructure/config/components/common/ConfigPageLayout.test.tsx
@@ -3,7 +3,10 @@
 import { readFileSync } from 'node:fs';
 import { resolve } from 'node:path';
 import {
+  Checkbox,
   Combobox,
+  Field,
+  Textarea,
   Input,
   MultiSelect,
   NumberInput,
@@ -45,6 +48,51 @@ describe('ConfigPageLayout', () => {
     container.remove();
   });
 
+  it.each([
+    ['switch', <Switch />, 'input'],
+    ['input', <Input />, 'input'],
+    ['search', <SearchField />, 'input'],
+    ['checkbox', <Checkbox />, 'input'],
+    ['textarea', <Textarea hint="Additional help" />, 'textarea'],
+    ['select', <Select size="sm" options={[{ label: 'English', value: 'en' }]} />, 'button'],
+    ['combobox', <Combobox size="sm" options={[]} />, 'button'],
+    ['multi-select', <MultiSelect size="sm" options={[]} />, 'button'],
+    ['number', <NumberInput value={1} onValueChange={() => {}} />, 'input'],
+  ])('names a wrapped %s from its visible settings label', (_name, control, selector) => {
+    act(() => root.render(
+      <ConfigPageRow label="Setting name" description="Setting explanation">
+        <div><div>{control}</div></div>
+      </ConfigPageRow>,
+    ));
+    const element = container.querySelector(String(selector))!;
+    const label = document.getElementById(element.getAttribute('aria-labelledby')!);
+    expect(label?.textContent).toBe('Setting name');
+    const descriptions = element.getAttribute('aria-describedby')!.split(' ')
+      .map(id => document.getElementById(id)?.textContent);
+    expect(descriptions).toContain('Setting explanation');
+    if (_name === 'textarea') expect(descriptions).toContain('Additional help');
+  });
+
+  it('preserves individual names and descriptions in composite and nested fields', () => {
+    act(() => root.render(
+      <ConfigPageRow label="Connection" description="Connection explanation">
+        <Input aria-label="Host" aria-describedby="host-help" />
+        <span id="host-help">Host explanation</span>
+        <Input aria-labelledby="port-label" />
+        <span id="port-label">Port</span>
+        <Field label="Nested field" description="Nested explanation"><Input id="nested" /></Field>
+      </ConfigPageRow>,
+    ));
+    const [host, port, nested] = container.querySelectorAll('input');
+    expect(host.getAttribute('aria-label')).toBe('Host');
+    expect(host.hasAttribute('aria-labelledby')).toBe(false);
+    expect(host.getAttribute('aria-describedby')?.split(' ')[0]).toBe('host-help');
+    expect(port.getAttribute('aria-labelledby')).toBe('port-label');
+    expect(nested.hasAttribute('aria-labelledby')).toBe(false);
+    expect(nested.getAttribute('aria-describedby')).toBe('nested-description');
+    expect(container.querySelector('label[for="nested"]')?.textContent).toBe('Nested field');
+  });
+
   it('preserves the standard section stack inside a shared wrapper', () => {
     act(() => {
       root.render(
diff --git a/src/web-ui/src/infrastructure/config/components/common/ConfigPageLayout.tsx b/src/web-ui/src/infrastructure/config/components/common/ConfigPageLayout.tsx
index 66a59d434b..437e5a175b 100644
--- a/src/web-ui/src/infrastructure/config/components/common/ConfigPageLayout.tsx
+++ b/src/web-ui/src/infrastructure/config/components/common/ConfigPageLayout.tsx
@@ -1,11 +1,12 @@
 import {
   FieldGroup,
+  FieldAccessibilityProvider,
   FormSection,
   ScrollArea,
   type FieldGroupFieldSurface,
   type FormSectionProps,
 } from '@openbitfun/ui';
-import React from 'react';
+import React, { useId } from 'react';
 import { formatStandaloneUiCopy } from './standaloneUiCopy';
 import './ConfigPageLayout.scss';
 
@@ -187,6 +188,9 @@ export const ConfigPageRow: React.FC<ConfigPageRowProps> = ({
   balanced = false,
   ...props
 }) => {
+  const fieldId = useId();
+  const labelId = `config-row-${fieldId}-label`;
+  const descriptionId = description ? `config-row-${fieldId}-description` : undefined;
   const hasControl = children !== null && children !== undefined && children !== false;
   const cls = [
     'openbitfun-config-page-row',
@@ -201,6 +205,9 @@ export const ConfigPageRow: React.FC<ConfigPageRowProps> = ({
   return (
     <div
       className={cls}
+      role="group"
+      aria-labelledby={labelId}
+      aria-describedby={descriptionId}
       data-openbitfun-component="config"
       data-openbitfun-part="row"
       data-openbitfun-align={align}
@@ -210,7 +217,7 @@ export const ConfigPageRow: React.FC<ConfigPageRowProps> = ({
     >
       <div className="openbitfun-config-page-row__meta">
         {/* div (not p): label may contain buttons; button-in-p freezes React event path */}
-        <div className="openbitfun-config-page-row__label" data-openbitfun-component="config" data-openbitfun-part="rowLabel">
+        <div id={labelId} className="openbitfun-config-page-row__label" data-openbitfun-component="config" data-openbitfun-part="rowLabel">
           {label}
           {required ? (
             <span
@@ -224,12 +231,14 @@ export const ConfigPageRow: React.FC<ConfigPageRowProps> = ({
           ) : null}
         </div>
         {description ? (
-          <div className="openbitfun-config-page-row__description" data-openbitfun-component="config" data-openbitfun-part="rowDescription">{formatStandaloneUiCopy(description)}</div>
+          <div id={descriptionId} className="openbitfun-config-page-row__description" data-openbitfun-component="config" data-openbitfun-part="rowDescription">{formatStandaloneUiCopy(description)}</div>
         ) : null}
       </div>
       {hasControl ? (
         <div className="openbitfun-config-page-row__control" data-openbitfun-component="config" data-openbitfun-part="rowControl">
-          {children}
+          <FieldAccessibilityProvider aria-labelledby={labelId} aria-describedby={descriptionId}>
+            {children}
+          </FieldAccessibilityProvider>
         </div>
       ) : null}
     </div>
diff --git a/src/web-ui/src/infrastructure/markdown/MermaidBlock.appearance.ts b/src/web-ui/src/infrastructure/markdown/MermaidBlock.appearance.ts
index 2b5c651158..4b99a53818 100644
--- a/src/web-ui/src/infrastructure/markdown/MermaidBlock.appearance.ts
+++ b/src/web-ui/src/infrastructure/markdown/MermaidBlock.appearance.ts
@@ -3,7 +3,7 @@ export const mermaidBlockAppearanceDescriptor: AppearanceSurfaceDescriptor = {
   id: 'mermaid-block',
   parts: [
     { id: 'root' }, { id: 'streaming' }, { id: 'codePreview' }, { id: 'code' },
-    { id: 'hint' }, { id: 'loading' }, { id: 'rendered' }, { id: 'diagram' },
+    { id: 'loading' }, { id: 'rendered' }, { id: 'diagram' },
     { id: 'actions' }, { id: 'action' }, { id: 'source' }, { id: 'error' },
   ],
   states: [
diff --git a/src/web-ui/src/infrastructure/markdown/MermaidBlock.scss b/src/web-ui/src/infrastructure/markdown/MermaidBlock.scss
index 08fd94730b..adbe707085 100644
--- a/src/web-ui/src/infrastructure/markdown/MermaidBlock.scss
+++ b/src/web-ui/src/infrastructure/markdown/MermaidBlock.scss
@@ -42,23 +42,6 @@
     }
   }
 
-  &--incomplete {
-    .mermaid-block__hint {
-      display: flex;
-      align-items: center;
-      gap: var(--openbitfun-control-flow-chat-inline-gap);
-      padding: var(--openbitfun-control-flow-chat-card-padding-block) var(--openbitfun-control-flow-chat-card-padding-inline);
-      background: var(--openbitfun-color-status-warning-surface);
-      border-top: 1px solid var(--openbitfun-color-status-warning-border);
-      color: var(--openbitfun-color-status-warning-content);
-      font-size: var(--openbitfun-type-flow-support-font-size);
-
-      svg {
-        flex-shrink: 0;
-      }
-    }
-  }
-
   &--waiting,
   &--rendering {
     .mermaid-block__loading {
diff --git a/src/web-ui/src/infrastructure/markdown/MermaidBlock.test.tsx b/src/web-ui/src/infrastructure/markdown/MermaidBlock.test.tsx
new file mode 100644
index 0000000000..2f0f83b49a
--- /dev/null
+++ b/src/web-ui/src/infrastructure/markdown/MermaidBlock.test.tsx
@@ -0,0 +1,52 @@
+// @vitest-environment jsdom
+import React, { act } from 'react';
+import { createRoot, type Root } from 'react-dom/client';
+import { afterEach, beforeEach, expect, it, vi } from 'vitest';
+import { MermaidBlock } from './MermaidBlock';
+const renderDiagram = vi.hoisted(() => vi.fn());
+vi.mock('@/tools/mermaid-editor/services/MermaidService', () => ({ MermaidService: { getInstance: () => ({ renderDiagram }) } }));
+vi.mock('@/infrastructure/i18n', () => {
+  const t = (key: string) => key;
+  return { useI18n: () => ({ t }) };
+});
+vi.mock('@/infrastructure/appearance/adapters/MermaidAppearanceAdapter', () => ({ mermaidAppearanceAdapter: { getRevision: () => 0, subscribe: () => () => {} } }));
+let root: Root, host: HTMLDivElement;
+beforeEach(() => {
+  vi.useFakeTimers(); renderDiagram.mockReset().mockResolvedValue('<svg><text>diagram</text></svg>');
+  host = document.createElement('div'); document.body.append(host); root = createRoot(host);
+});
+afterEach(async () => { await act(async () => root.unmount()); host.remove(); vi.useRealTimers(); });
+const render = async (code: string, isStreaming = false) => {
+  await act(async () => root.render(<MermaidBlock code={code} isStreaming={isStreaming} />));
+  await act(async () => vi.advanceTimersByTimeAsync(201));
+};
+it.each(['block-beta\ncolumns 2\na b', 'flowchart LR\nA-->B'])('delegates completed %s syntax to the rendering service', async code => {
+  await render(code);
+  expect(renderDiagram).toHaveBeenCalledWith(code);
+  expect(host.querySelector('svg')).not.toBeNull();
+  expect(host.textContent).not.toContain('mermaidBlock.codeIncomplete');
+});
+it('reports the actual parser failure for completed invalid syntax', async () => {
+  renderDiagram.mockRejectedValue(new Error('Unknown diagram type'));
+  await render('not-a-diagram');
+  expect(host.querySelector('[role="alert"]')?.textContent).toContain('Unknown diagram type');
+  expect(host.querySelector('code')?.textContent).toBe('not-a-diagram');
+  expect(host.textContent).not.toContain('mermaidBlock.codeIncomplete');
+});
+it('waits during a streaming fence and parses when the stream completes', async () => {
+  await render('block-be', true);
+  expect(renderDiagram).not.toHaveBeenCalled();
+  expect(host.querySelector('[data-openbitfun-part="streaming"]')).not.toBeNull();
+  await render('block-beta\ncolumns 1\nc');
+  expect(renderDiagram).toHaveBeenCalledOnce();
+  expect(host.querySelector('svg')).not.toBeNull();
+});
+it('ignores a late render after the block starts streaming newer content', async () => {
+  let finish!: (svg: string) => void;
+  renderDiagram.mockReturnValue(new Promise(resolve => { finish = resolve; }));
+  await render('flowchart LR\nC-->D');
+  await render('sequenceDiagram\nparticipant', true);
+  await act(async () => finish('<svg><text>obsolete</text></svg>'));
+  expect(host.querySelector('svg')).toBeNull();
+  expect(host.querySelector('[data-openbitfun-part="streaming"]')).not.toBeNull();
+});
diff --git a/src/web-ui/src/infrastructure/markdown/MermaidBlock.tsx b/src/web-ui/src/infrastructure/markdown/MermaidBlock.tsx
index 8b124a807d..4a02922a2b 100644
--- a/src/web-ui/src/infrastructure/markdown/MermaidBlock.tsx
+++ b/src/web-ui/src/infrastructure/markdown/MermaidBlock.tsx
@@ -35,13 +35,7 @@ export interface MermaidBlockProps {
   className?: string;
 }
 
-type RenderState = 'streaming' | 'incomplete' | 'loading' | 'rendered' | 'error';
-
-const isCodeComplete = (code: string): boolean => {
-  const trimmed = code.trim();
-  if (!trimmed) return false;
-  return /^(graph|flowchart|sequenceDiagram|classDiagram|stateDiagram|erDiagram|gantt|pie|journey|gitGraph|mindmap|timeline|quadrantChart)/m.test(trimmed);
-};
+type RenderState = 'streaming' | 'loading' | 'rendered' | 'error';
 
 export const MermaidBlock: React.FC<MermaidBlockProps> = ({
   code,
@@ -53,9 +47,8 @@ export const MermaidBlock: React.FC<MermaidBlockProps> = ({
   const cachedSvg = svgCache.get(cacheKey);
   
   const [state, setState] = useState<RenderState>(() => {
-    if (cachedSvg) return 'rendered';
     if (isStreaming) return 'streaming';
-    if (!code.trim() || !isCodeComplete(code)) return 'incomplete';
+    if (cachedSvg) return 'rendered';
     return 'loading';
   });
   const [svgContent, setSvgContent] = useState<string>(cachedSvg || '');
@@ -68,18 +61,14 @@ export const MermaidBlock: React.FC<MermaidBlockProps> = ({
   );
   
   const mermaidService = useRef(MermaidService.getInstance());
-  const renderTimeoutRef = useRef<NodeJS.Timeout | null>(null);
-  const currentCodeRef = useRef<string>('');
-
-  const renderDiagram = useCallback(async (codeToRender: string) => {
-    const trimmedCode = codeToRender.trim();
-    const key = getCacheKey(trimmedCode);
-    
-    if (!isCodeComplete(trimmedCode)) {
-      setState('incomplete');
+  useEffect(() => {
+    if (isStreaming) {
+      setState('streaming');
       return;
     }
 
+    const trimmedCode = code.trim();
+    const key = getCacheKey(trimmedCode);
     const cached = svgCache.get(key);
     if (cached) {
       setSvgContent(cached);
@@ -87,61 +76,25 @@ export const MermaidBlock: React.FC<MermaidBlockProps> = ({
       return;
     }
 
+    // The Mermaid parser owns supported syntax. A completed code fence must
+    // either render or report a real parse error, never wait for more content.
+    let cancelled = false;
     setState('loading');
     setError('');
-
-    try {
-      const svg = await mermaidService.current.renderDiagram(trimmedCode);
-      if (currentCodeRef.current === trimmedCode) {
+    const timeout = setTimeout(() => {
+      void mermaidService.current.renderDiagram(trimmedCode).then(svg => {
+        if (cancelled) return;
         svgCache.set(key, svg, (key.length + svg.length) * 2);
         setSvgContent(svg);
         setState('rendered');
-      }
-    } catch (err) {
-      if (currentCodeRef.current === trimmedCode) {
+      }).catch(err => {
+        if (cancelled) return;
         setError(err instanceof Error ? err.message : t('mermaidBlock.renderFailed'));
         setState('error');
-      }
-    }
-  }, [t]);
-
-  useEffect(() => {
-    const trimmedCode = code.trim();
-    currentCodeRef.current = trimmedCode;
-
-    if (renderTimeoutRef.current) {
-      clearTimeout(renderTimeoutRef.current);
-      renderTimeoutRef.current = null;
-    }
-
-    if (isStreaming) {
-      setState('streaming');
-      return;
-    }
-
-    if (!trimmedCode || !isCodeComplete(trimmedCode)) {
-      setState('incomplete');
-      return;
-    }
-
-    const key = getCacheKey(trimmedCode);
-    const cached = svgCache.get(key);
-    if (cached) {
-      setSvgContent(cached);
-      setState('rendered');
-      return;
-    }
-
-    renderTimeoutRef.current = setTimeout(() => {
-      renderDiagram(trimmedCode);
+      });
     }, 200);
-
-    return () => {
-      if (renderTimeoutRef.current) {
-        clearTimeout(renderTimeoutRef.current);
-      }
-    };
-  }, [code, isStreaming, renderDiagram, currentAppearanceRevision]);
+    return () => { cancelled = true; clearTimeout(timeout); };
+  }, [code, isStreaming, t, currentAppearanceRevision]);
 
   useEffect(() => {
     return mermaidAppearanceAdapter.subscribe(() => {
@@ -176,21 +129,6 @@ export const MermaidBlock: React.FC<MermaidBlockProps> = ({
           </div>
         );
 
-      case 'incomplete':
-        return (
-          <div className="mermaid-block__incomplete">
-            <div data-openbitfun-component="mermaid-block" data-openbitfun-part="codePreview" className="mermaid-block__code-preview">
-              <pre data-openbitfun-component="mermaid-block" data-openbitfun-part="code" className="mermaid-code">
-                <code>{code}</code>
-              </pre>
-            </div>
-            <div data-openbitfun-component="mermaid-block" data-openbitfun-part="hint" className="mermaid-block__hint">
-              <AlertCircle size={14} />
-              <span>{t('mermaidBlock.codeIncomplete')}</span>
-            </div>
-          </div>
-        );
-
       case 'loading':
         return (
           <div data-openbitfun-component="mermaid-block" data-openbitfun-part="loading" className="mermaid-block__loading">
@@ -246,7 +184,7 @@ export const MermaidBlock: React.FC<MermaidBlockProps> = ({
       case 'error':
         return (
           <div data-openbitfun-component="mermaid-block" data-openbitfun-part="error" className="mermaid-block__error">
-            <div className="mermaid-block__error-message">
+            <div className="mermaid-block__error-message" role="alert">
               <AlertCircle size={16} />
               <span>{t('mermaidBlock.renderFailed')}: {error}</span>
             </div>
diff --git a/src/web-ui/src/infrastructure/services/ShortcutManager.test.ts b/src/web-ui/src/infrastructure/services/ShortcutManager.test.ts
index 19f074887c..fc6162704b 100644
--- a/src/web-ui/src/infrastructure/services/ShortcutManager.test.ts
+++ b/src/web-ui/src/infrastructure/services/ShortcutManager.test.ts
@@ -6,8 +6,8 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { act, createElement, createRef } from 'react';
 import { createRoot } from 'react-dom/client';
 import { Portal } from '@openbitfun/ui';
-import { EDITOR_SHORTCUTS } from '@/shared/constants/shortcuts';
-import { parseStoredKeybindings, shortcutManager } from './ShortcutManager';
+import { CANVAS_OVERVIEW_SHORTCUT, EDITOR_SHORTCUTS } from '@/shared/constants/shortcuts';
+import { buildStoredKeybindings, getReservedShortcutReason, parseStoredKeybindings, shortcutManager } from './ShortcutManager';
 
 function setPlatform(platform: string): void {
   Object.defineProperty(window.navigator, 'platform', {
@@ -42,6 +42,32 @@ describe('ShortcutManager platform primary modifier', () => {
     document.body.innerHTML = '';
   });
 
+  it('uses a reachable overview default on macOS and preserves legacy overrides', () => {
+    setPlatform('MacIntel');
+    const callback = vi.fn();
+    shortcutManager.register('canvas.missionControl', CANVAS_OVERVIEW_SHORTCUT, callback);
+    dispatchScopedKey('canvas', { key: 'E', metaKey: true, shiftKey: true });
+    expect(callback).toHaveBeenCalledOnce();
+    expect(getReservedShortcutReason(CANVAS_OVERVIEW_SHORTCUT)).toBeUndefined();
+    const legacy = { 'canvas.missionControl': { key: 'Tab', ctrl: true } };
+    const loaded = parseStoredKeybindings(legacy);
+    shortcutManager.loadUserOverrides(loaded);
+    expect(shortcutManager.getEffectiveConfig('canvas.missionControl', CANVAS_OVERVIEW_SHORTCUT).key).toBe('Tab');
+    expect(parseStoredKeybindings(buildStoredKeybindings(loaded))).toEqual(legacy);
+    expect(getReservedShortcutReason(loaded['canvas.missionControl'])).toBe('appSwitch');
+  });
+
+  it.each([
+    ['MacIntel', { key: 'Tab', meta: true }, 'appSwitch'],
+    ['MacIntel', { key: ' ', ctrl: true }, 'systemSearch'],
+    ['Win32', { key: 'Tab', alt: true }, 'appSwitch'],
+    ['Win32', { key: 'Delete', ctrl: true, alt: true }, 'secureAttention'],
+    ['Linux', { key: 'Tab', ctrl: true }, undefined],
+    ['Win32', CANVAS_OVERVIEW_SHORTCUT, undefined],
+  ])('recognizes OS interception for %s', (platform, config, reason) => {
+    expect(getReservedShortcutReason(config, platform)).toBe(reason);
+  });
+
   it('keeps the same tab command independently registered in the main and side regions', () => {
     setPlatform('Win32');
     const main = vi.fn();
diff --git a/src/web-ui/src/infrastructure/services/ShortcutManager.ts b/src/web-ui/src/infrastructure/services/ShortcutManager.ts
index 46998dd51e..fb906196f2 100644
--- a/src/web-ui/src/infrastructure/services/ShortcutManager.ts
+++ b/src/web-ui/src/infrastructure/services/ShortcutManager.ts
@@ -93,6 +93,28 @@ function isMacPlatform(): boolean {
   return typeof navigator !== 'undefined' && navigator.platform.toUpperCase().includes('MAC');
 }
 
+/** OS interception happens before a WebView receives keydown. Keep stored overrides,
+ * but warn at the editing boundary instead of claiming these keys are available.
+ */
+export function getReservedShortcutReason(
+  config: ShortcutConfig,
+  platform = typeof navigator === 'undefined' ? '' : navigator.platform,
+): 'appSwitch' | 'systemSearch' | 'secureAttention' | 'systemKey' | undefined {
+  const key = config.key.toLowerCase();
+  if (platform.toUpperCase().includes('MAC')) {
+    const command = config.ctrl || config.meta;
+    if (command && key === 'tab') return 'appSwitch';
+    if (command && (key === ' ' || key === 'space')) return 'systemSearch';
+    return undefined;
+  }
+  if (config.alt && (key === 'tab' || key === 'escape')) return 'appSwitch';
+  if (platform.toUpperCase().includes('WIN')) {
+    if (config.ctrl && config.alt && key === 'delete') return 'secureAttention';
+    if (config.meta) return 'systemKey';
+  }
+  return undefined;
+}
+
 function normalizeShortcutConfig(config: ShortcutConfig): { primary: boolean; meta: boolean } {
   if (isMacPlatform()) {
     return {
diff --git a/src/web-ui/src/locales/en-US/common.json b/src/web-ui/src/locales/en-US/common.json
index e6ef99f71d..2c6d61a29d 100644
--- a/src/web-ui/src/locales/en-US/common.json
+++ b/src/web-ui/src/locales/en-US/common.json
@@ -192,7 +192,9 @@
         "activationFailed": "Could not open that result",
         "remoteFileSearchUnavailable": "File search is unavailable for remote project {{workspace}}",
         "sessionUnavailable": "This session is no longer available"
-      }
+      },
+      "diagnosticTarget": "Search device: {{host}}",
+      "retrySource": "Retry this source"
     },
     "displayModes": {
       "pro": "Expert Mode",
@@ -798,7 +800,8 @@
     "hostDiscoveryFailed": "Could not load hosts. Try again.",
     "existingHostRequired": "Choose an existing SSH host.",
     "sshHost": "SSH host",
-    "sourceUnsupported": "This host does not support this environment."
+    "sourceUnsupported": "This host does not support this environment.",
+    "checkingWsl": "Checking WSL availability on this host…"
   },
   "newProject": {
     "title": "Create project",
diff --git a/src/web-ui/src/locales/en-US/components.json b/src/web-ui/src/locales/en-US/components.json
index 5f995258fd..94ac5b1a3e 100644
--- a/src/web-ui/src/locales/en-US/components.json
+++ b/src/web-ui/src/locales/en-US/components.json
@@ -584,7 +584,17 @@
     "dropRight": "Right",
     "dropTop": "Top",
     "dropBottom": "Bottom",
-    "dropCenter": "Drop"
+    "dropCenter": "Drop",
+    "empty": {
+      "title": "Open something alongside your conversation",
+      "description": "Files, terminals, and previews appear here.",
+      "currentHost": "Current host",
+      "workspaceUnavailable": "This workspace is disconnected. Reconnect to browse files or start a terminal.",
+      "selectWorkspace": "Select a workspace to browse files or start a terminal.",
+      "browseFiles": "Browse files",
+      "newTerminal": "New terminal",
+      "reopen": "Reopen {{title}}"
+    }
   },
   "flexiblePanel": {
     "empty": {
diff --git a/src/web-ui/src/locales/en-US/flow-chat.json b/src/web-ui/src/locales/en-US/flow-chat.json
index 9440d9cff9..9ca6bf6786 100644
--- a/src/web-ui/src/locales/en-US/flow-chat.json
+++ b/src/web-ui/src/locales/en-US/flow-chat.json
@@ -314,7 +314,9 @@
       "errors": "No error examples",
       "errorsDescription": "No sampled tool or model errors were recorded.",
       "slowest": "No slow spans",
-      "slowestDescription": "No timed turn, model-call, or tool spans were recorded."
+      "slowestDescription": "No timed turn, model-call, or tool spans were recorded.",
+      "session": "No activity yet",
+      "sessionDescription": "Send a message in this session to start. Model usage, tools and timing will appear here after the session runs."
     },
     "help": {
       "wall": "Span from the first recorded turn start to the last recorded turn end. Idle gaps can be included.",
diff --git a/src/web-ui/src/locales/en-US/panels/git.json b/src/web-ui/src/locales/en-US/panels/git.json
index 0f89a8532e..6815f3e232 100644
--- a/src/web-ui/src/locales/en-US/panels/git.json
+++ b/src/web-ui/src/locales/en-US/panels/git.json
@@ -454,5 +454,17 @@
     "unavailable": "Git ownership trust for \"{{path}}\" could not be granted from here. Grant it on the machine that owns the repository.",
     "unavailableWithCommand": "Git ownership trust for \"{{path}}\" could not be granted from here. Run this command on the machine that holds the repository:\n\n{{command}}",
     "required": "Git will not read \"{{path}}\" until you trust its ownership."
+  },
+  "workingCopy": {
+    "openWorkspace": "Open a workspace to see changes.",
+    "currentHost": "Current host",
+    "clean": "Working tree is clean",
+    "cleanDescription": "There are no uncommitted changes in this repository.",
+    "upstreamComparison": "Compared with upstream: {{ahead}} ahead · {{behind}} behind",
+    "unpushed": "Local commits are waiting to be pushed. Use Push above when you are ready.",
+    "remoteSnapshot": "Check branch tracking and remote synchronization in Branches.",
+    "statusUnavailable": "Git status is unavailable",
+    "selectFile": "Select a file to review its changes",
+    "conflicts": "{{count}} files have unresolved conflicts."
   }
 }
diff --git a/src/web-ui/src/locales/en-US/scenes/agents.json b/src/web-ui/src/locales/en-US/scenes/agents.json
index 2a32517100..70248bc6c3 100644
--- a/src/web-ui/src/locales/en-US/scenes/agents.json
+++ b/src/web-ui/src/locales/en-US/scenes/agents.json
@@ -317,11 +317,11 @@
       "idPlaceholder": "Used by the model, config, and routing; cannot be changed after creation",
       "idRequired": "ID is required",
       "idFormat": "Must start with a letter and contain only letters, numbers, underscores, or hyphens",
-      "name": "Name (optional)",
+      "name": "Name",
       "namePlaceholder": "Used for display only; defaults to the Agent ID",
       "level": "Level",
       "modeUserOnly": "Custom Agents that accept tasks directly are user-level in the current release.",
-      "description": "Description",
+      "description": "Task goal",
       "descPlaceholder": "Briefly describe what this agent does",
       "descRequired": "Description is required",
       "prompt": "System Prompt",
@@ -350,7 +350,17 @@
       "createSuccess": "Created agent \"{{name}}\"",
       "createFailed": "Create failed: ",
       "review": "Review",
-      "reviewToolsHint": "Additional checks use only read-only tools."
+      "reviewToolsHint": "Additional checks use only read-only tools.",
+      "nameRequired": "Give your agent a name.",
+      "identityDetails": "Identifier (generated automatically)",
+      "idHelp": "Used in files and references. You can edit it before creation; existing identifiers stay fixed.",
+      "promptGuide": "Describe how to work, what to avoid, and what a useful result looks like. You can start with an outline based on your task goal.",
+      "usePromptTemplate": "Start from task outline",
+      "promptTemplate": "## Goal\n{{goal}}\n\n## Approach\nRead the available context, identify missing information, and work through the task. Ask when a missing decision would change the result.\n\n## Constraints\nRespect the project instructions and granted permissions. Distinguish evidence from assumptions.\n\n## Deliverable\nProvide the result, supporting evidence, and any unresolved questions.",
+      "permissionsReadonly": "Read-only access · adjust permissions",
+      "permissionsStandard": "Standard permissions · adjust access",
+      "customizeTools": "Customize selected tools",
+      "createNamePlaceholder": "For example, Research helper"
     }
   },
   "reviewTeams": {
diff --git a/src/web-ui/src/locales/en-US/scenes/capabilities.json b/src/web-ui/src/locales/en-US/scenes/capabilities.json
index 80f27898c3..ecc38160ee 100644
--- a/src/web-ui/src/locales/en-US/scenes/capabilities.json
+++ b/src/web-ui/src/locales/en-US/scenes/capabilities.json
@@ -18,5 +18,631 @@
   "serverType": "Type",
   "clickToCopy": "Click to copy path",
   "pathCopied": "Path copied",
-  "pathCopyFailed": "Failed to copy path"
+  "pathCopyFailed": "Failed to copy path",
+  "search": {
+    "categories": {
+      "assistant": "AI & collaboration",
+      "workspace": "Projects & development",
+      "automation": "Extensions & automation",
+      "connect": "Connect & publish",
+      "application": "Application settings",
+      "data": "Data & diagnostics"
+    },
+    "kinds": {
+      "feature": "Feature",
+      "setting": "$t(shared:features.settings)"
+    },
+    "capabilities": {
+      "feature": {
+        "ai-assistant": {
+          "title": "AI assistant & sessions",
+          "summary": "Work with AI in project context, create sessions, continue tasks, answer permission requests, and keep a durable work record.",
+          "items": {
+            "create-session": "Open and create a new AI session",
+            "session-lifecycle": "Rename, archive, restore, delete, copy, fork, and export sessions",
+            "model-mode-permissions": "Choose the model, work mode, memory mode, and permission mode per session",
+            "creative-frontend-authoring": "Extend client UI and runtime capabilities in Creative mode",
+            "turn-control": "Start, steer, interrupt, cancel, or recover an agent turn",
+            "permission-mailbox": "Review and answer pending permission requests individually or in a batch",
+            "history-search": "Page through, search, and backfill historical turns and session content",
+            "session-storage-directory": "Open session storage from workspace or session menus for backups and manual troubleshooting",
+            "agent-session-coordination": "Let an agent create, list, cancel, or delete sessions and send messages to another session",
+            "mcp-mentions": "Use @ in chat to select MCP servers available to the current mode",
+            "tool-activity": "Inspect tool calls and background commands, read output, send input, or stop them",
+            "goals": "Inspect, create, complete, or block the current session goal",
+            "goal-maintenance": "Edit the goal objective or clear the current session goal",
+            "working-plan": "Let an agent maintain a task list, produce an implementation plan, and ask the user when needed",
+            "usage": "View request, token, and cost usage for an individual session",
+            "context-memory": "Reload session context, initialize AGENTS.md, and manage long-term memory",
+            "btw-editor-ai": "Use lightweight BTW questions and inline editor AI, with cancellation"
+          }
+        },
+        "agents": {
+          "title": "Agents",
+          "summary": "Manage built-in, custom, and subagents so specialized roles can handle research, coding, review, and more.",
+          "items": {
+            "browse-agents": "Browse built-in, user, project, and currently visible agents",
+            "custom-agent-create": "Create custom agents with a name, description, and role",
+            "custom-agent-manage": "Inspect, edit, reload, or delete custom agents",
+            "subagent-manage": "Create, configure, inspect, and delete delegatable subagents",
+            "capability-summary": "Inspect each agent's tools, Skills, read-only state, and capability summary",
+            "tools-skills": "Choose tool groups, individual tools, skill groups, and Skills per agent",
+            "delegation": "Let the primary agent delegate parallel research, coding, and review work and coordinate their lifecycle"
+          }
+        },
+        "personal-assistants": {
+          "title": "Personal assistants",
+          "summary": "Create and manage persistent AI assistants, define their identity and persona, and start chats or scheduled work from one place.",
+          "items": {
+            "assistant-gallery": "Browse existing assistants, create a new one, and review each assistant's identity and capability summary",
+            "assistant-open-close": "Close sidebar assistants and cancel running sessions, preserve configuration and history, and reopen them from the assistant gallery",
+            "primary-delete-reset": "Set the primary assistant, delete non-primary assistants, or reset an assistant workspace to defaults",
+            "identity-avatar": "Edit an assistant's name, creature type, and vibe, then choose an official avatar, emoji, or custom avatar character",
+            "persona-documents": "Read and edit IDENTITY.md, SOUL.md, and USER.md with autosaved Markdown body and frontmatter",
+            "assistant-sessions": "Choose a model, send a message, and browse an assistant's sessions from its detail page",
+            "assistant-schedules": "Review and manage scheduled sessions and automated jobs scoped to the current assistant workspace"
+          }
+        },
+        "projects": {
+          "title": "Projects & workspaces",
+          "summary": "Open a local directory or create a project so files, sessions, terminals, and agents share one workspace.",
+          "items": {
+            "open-create": "Open an existing project or enter the new-project flow",
+            "close-switch-reorder": "Close, switch, and reorder multiple open workspaces",
+            "recent-workspaces": "Review, clean up, and reopen recently used projects",
+            "workspace-metadata": "Scan and maintain workspace names, metadata, related directories, and persona files",
+            "file-watch": "Watch project file changes, inspect watch status, and recover a stopped watcher",
+            "workspace-search": "Search local workspaces by filename, path, or file content",
+            "remote-open": "Open SSH and other remote workspaces from the project flow",
+            "project-health": "Inspect the current workspace, app state, health, and statistics"
+          }
+        },
+        "files-editor": {
+          "title": "Files & code editing",
+          "summary": "Browse, search, and edit project files while inspecting diffs, language-aware editor actions, and agent changes.",
+          "items": {
+            "file-tree": "Browse, create, read, edit, rename, and delete files and directories",
+            "reveal-in-system": "Reveal a file or directory in the operating-system file manager",
+            "indexed-search": "Search the active workspace by filename pattern and full-text content",
+            "search-index-management": "Build or rebuild the UI search index",
+            "edit-save": "Read, edit, and save files while synchronizing editor state",
+            "diffs": "Inspect diffs and statistics by file, session, turn, or operation",
+            "accept-reject": "Accept or reject agent changes by file, operation, or whole session",
+            "snapshots-rollback": "Review file history and snapshots, then roll back a session or selected turn",
+            "language-actions": "Show formatting, definition and type navigation, references, rename, quick fixes, and symbol navigation only when supported by the active language provider",
+            "attachments": "Paste or drop local files, folders, and images into Desktop local sessions",
+            "image-analysis": "View and analyze images from the workspace or session context"
+          }
+        },
+        "terminal": {
+          "title": "Terminal",
+          "summary": "Run a shell in the current project, inspect output, keep command history, and share the same terminal context with agents.",
+          "items": {
+            "create-terminal": "Open the terminal panel and create a terminal session",
+            "terminal-session-management": "List, switch, and close multiple terminal sessions",
+            "shells": "Detect available shells and choose a default or explicit shell",
+            "working-directory": "Create terminals in the current project or a chosen starting directory",
+            "command-control": "Execute commands, write input, and send interrupt or other signals",
+            "resize": "Synchronize terminal rows and columns as the panel resizes",
+            "history-integration": "Review command history and detect shell-integration support",
+            "shutdown": "Acknowledge output and safely shut down one or all terminals"
+          }
+        },
+        "git": {
+          "title": "Git version control",
+          "summary": "Inspect changes, branches, and commits; stage, commit, merge, cherry-pick, and work with Git worktrees.",
+          "items": {
+            "status-diff": "Inspect repository status, changed files, and per-file diffs",
+            "stage-reset": "Stage files, unstage changes, and reset to a selected commit",
+            "commit": "Preview or generate a commit message and create the commit",
+            "sync": "Pull from and push to remotes",
+            "branches": "Browse, create, check out, and delete local branches",
+            "graph-history": "Browse the commit graph and repository history, including recent-history persistence",
+            "revision-content": "Resolve revisions and inspect file content from any commit",
+            "cherry-pick": "Start, continue, or abort a cherry-pick",
+            "trust-worktrees": "Manage repository trust and create, bind, promote, recreate, or remove worktrees"
+          }
+        },
+        "code-review": {
+          "title": "Code review & pull requests",
+          "summary": "Review changes and pull-request context, inspect CI logs, generate commit messages, and run deeper code reviews.",
+          "items": {
+            "workspace-context": "Load repository, branch, workspace snapshot, and review-target context",
+            "pull-request": "Inspect pull-request details, paged content, and related changes",
+            "ci-logs": "Read CI run logs for a pull request",
+            "issues": "Read the title, body, and context of linked issues",
+            "authentication": "Store or clear review-platform access tokens",
+            "commit-message": "Preview, generate, or quickly apply a commit message",
+            "deep-review": "Run Deep Review against a workspace, commit, or pull request and consolidate a structured review"
+          }
+        },
+        "browser": {
+          "title": "Built-in browser",
+          "summary": "Open webpages and local services inside OpenBitFun, where an agent can inspect the page and select, click, fill, scroll, or capture elements directly.",
+          "items": {
+            "open-urls": "Open full URLs, local hostnames, or development-service ports inside OpenBitFun",
+            "agent-web-research": "Let an agent search the web and fetch selected page content on demand",
+            "history-navigation": "Navigate page history with Back, Forward, and the address bar",
+            "reload-status": "Reload pages and synchronize the current URL, loading state, and errors",
+            "scene-and-panel": "Use the browser as a standalone scene or an auxiliary panel beside a session",
+            "element-picker": "Start the element picker to highlight hovered elements and show tag, ID, and class details",
+            "element-context": "Click an element to capture its CSS path, attributes, text, and HTML into the current session context",
+            "element-picker-cancel": "Click the picker again or press Escape to cancel selection and remove overlays",
+            "agent-page-automation": "Let an agent snapshot, read, click, hover, fill, press keys, scroll, wait, evaluate scripts, and capture the built-in page",
+            "shared-browser-action-contract": "Use one BrowserActions parameter, element-ref, result, and error contract across the built-in WebView and external CDP browsers",
+            "browser-target-selection": "Choose the built-in or external browser with target and locate a page by session_id, URL, or title",
+            "embedded-webview": "Use a native WebView on desktop, a sandboxed iframe on web, and open new-window links in place"
+          }
+        },
+        "computer-use": {
+          "title": "Browser & desktop control",
+          "summary": "Allow agents to operate a browser or local UI while explicitly managing accessibility, screen-recording, and browser connection access.",
+          "items": {
+            "status": "Check Computer Use availability plus accessibility and screen-recording permission status",
+            "request-permissions": "Request the operating-system permissions required for desktop control",
+            "system-settings": "Open the matching operating-system privacy and security settings",
+            "browser-discovery": "Discover supported browsers and inspect the current CDP connection state",
+            "launch-connect": "Launch browser control, or connect to and disconnect from a browser configured for CDP",
+            "default-cdp": "Enable the default CDP setup and restart the browser when required",
+            "agent-actions": "After authorization, let agents capture, click, type, scroll, and inspect the visible interface",
+            "control-session-preview": "Inspect the current target, mode, and authorized capture preview in the control card",
+            "stop-control-session": "Stop the current desktop-control session and release capture and input resources",
+            "app-sharing": "Select an App window and separately grant or revoke control",
+            "preview-input": "Click, drag, scroll and type through the shared preview",
+            "remembered-control": "Remember or forget control by application executable and input mode"
+          }
+        },
+        "skills": {
+          "title": "Skills",
+          "summary": "Install and manage reusable expert workflows for agents, and control which modes can use them.",
+          "items": {
+            "installed-catalog": "Browse installed Skills from user, project, local, and remote sources in one catalog",
+            "market": "Browse, search, and refresh the Skill market",
+            "market-install": "Download a market Skill for the user or current project",
+            "local-add": "Validate a local Skill path and add it at user or project scope",
+            "remove": "Remove an installed user-level or project-level Skill",
+            "global-enable": "Enable or disable an individual Skill globally",
+            "mode-selection": "Choose Skills and skill groups per agent mode and restore defaults",
+            "shadowing": "Understand user-versus-project shadowing precedence for same-named Skills",
+            "invoke": "Load and execute a Skill visible to the current agent on demand"
+          }
+        },
+        "miniapps": {
+          "title": "Mini Apps",
+          "summary": "Install, create, and run lightweight apps inside OpenBitFun, combining UI, data, and agent workflows.",
+          "items": {
+            "gallery-lifecycle": "Inspect, create, update, and delete installed MiniApps",
+            "market": "Browse the market, inspect listings, and install or update releases",
+            "market-account": "Sign in to the market, favorite and rate apps, and inspect installed origins",
+            "permissions": "Grant path or workspace access and review permission changes before customization",
+            "runtime": "Run Mini App host and worker calls, inspect status, and stop background workers",
+            "storage": "Read and save persistent state separately for installed apps and customization drafts",
+            "agent-ai": "Use model completion, chat, and dedicated agent sessions inside Mini Apps",
+            "customization": "Create customization drafts, preview them live, and apply, sync, or discard changes",
+            "versions": "Inspect version history and roll back to an earlier release",
+            "agent-authoring": "Let an agent initialize, author, and validate a Mini App",
+            "agent-market-submit": "Let an agent submit a completed Mini App for market review when explicitly requested",
+            "publishing": "Withdraw and review market releases, and render slide pages"
+          }
+        },
+        "canvas": {
+          "title": "Canvas & interactive artifacts",
+          "summary": "Display and save visualizations, interactive pages, and structured artifacts generated beside a session.",
+          "items": {
+            "artifact-open": "Load and open persistent Canvas artifacts from session tool results",
+            "html-react": "Render and iteratively edit HTML or React interfaces, charts, and interactive visualizations",
+            "inline-generative-ui": "Generate compact HTML/SVG charts, explainers, or interactive widgets inline in a session",
+            "state": "Load and save interactive state when a Canvas is reopened or refreshed",
+            "source-inspection": "Inspect Canvas source, compiled revisions, and the last known good revision",
+            "element-context": "Select an element inside Canvas and add its reference to session context",
+            "runtime-errors": "Capture runtime errors, report diagnostics, and ask the agent to repair them",
+            "export-html": "Export the current Canvas as a standalone HTML file"
+          }
+        },
+        "tasks-automation": {
+          "title": "Task board & scheduled jobs",
+          "summary": "Track work in one task board and let scheduled jobs run at a chosen time or host.",
+          "items": {
+            "board-views": "Browse tasks in Pending, Calendar, and Inactive views",
+            "create-edit": "Create, edit, enable, disable, and delete scheduled jobs",
+            "schedule-types": "Choose one-time, daily, weekly, or custom cron schedules",
+            "calendar-occurrences": "Preview the next and future job occurrences on a calendar",
+            "agent-workspace": "Choose the agent, model, work mode, and workspace for a job",
+            "local-remote-target": "Schedule jobs to run on the current host or a connected remote target",
+            "host-readiness": "List jobs and wait for desktop-host readiness before reliable execution"
+          }
+        },
+        "insights": {
+          "title": "Insights",
+          "summary": "Turn session and project activity into readable insights about working patterns, usage, and progress.",
+          "items": {
+            "availability": "Check whether the current account and sessions contain analyzable insight data",
+            "generate": "Generate a work-insights report for a selected date range and model",
+            "cancel": "Cancel an in-progress insights generation job",
+            "latest-report": "Open the latest report or load a selected historical report",
+            "usage-statistics": "Relate work activity to model, token, and cache-usage statistics",
+            "patterns": "Review project distribution, working hours, task types, and collaboration patterns"
+          }
+        },
+        "ecosystem-compatibility": {
+          "title": "External Import",
+          "summary": "Inspect external AI content and status, import supported Skills, MCP, Hooks, and Codex or Zcode sessions, and continue conversations in OpenBitFun.",
+          "items": {
+            "source-discovery": "Discover OpenCode, Claude Code, Codex, and other external AI sources and content",
+            "source-policy": "Enable or disable each source and choose managed, preview, or read-only policy",
+            "codex-session-import": "Discover, remove and restore Codex source sessions, then continue in OpenBitFun branches",
+            "zcode-session-import": "Discover, remove and restore Zcode source sessions, then continue in OpenBitFun branches",
+            "prompts-commands": "Expand external prompt/command content and resolve conflicts with native commands",
+            "subagents": "Enable external agents, resolve naming conflicts, and bind models",
+            "mcp-import": "Preview MCP import plans, resolve server conflicts individually, and apply them",
+            "tool-targets": "Choose external tool targets, resolve conflicts, and control activation",
+            "hooks": "Inspect external hook catalogs, plan imports, edit selections, and apply",
+            "security-review": "Review conflicts, security impact, and source-control snapshots before migration",
+            "reveal-source": "Reveal external configuration sources in the file manager or remote environment"
+          }
+        },
+        "remote-workspaces": {
+          "title": "Remote workspaces",
+          "summary": "Open projects over SSH or in containers so files, search, terminal, and agents all execute in the target environment.",
+          "items": {
+            "ssh-profiles": "Save, list, test, and delete SSH connection profiles",
+            "ssh-auth": "Connect with passwords, private keys, certificates, SSH config hosts, and jump hosts",
+            "docker": "Discover remote Docker containers and use a container as the work environment",
+            "wsl": "Choose a WSL distribution on the Windows host as a workspace",
+            "remote-open": "Open, close, and remove remote workspaces, and inspect server information",
+            "remote-files": "Browse, read, write, create, rename, and remove remote files and directories",
+            "transfer": "Upload local files, download remote files, and cancel active transfers",
+            "remote-execution": "Execute commands on the target so terminals, search, and agents use the remote data plane",
+            "port-forwarding": "Discover remote listening ports and start, inspect, or stop port forwarding",
+            "connection-lifecycle": "Inspect connection status and disconnect one or all SSH sessions"
+          }
+        },
+        "remote-connect": {
+          "title": "Remote Connect & devices",
+          "summary": "Connect to this host from mobile, a bot, or another OpenBitFun device to inspect sessions, answer permissions, and continue work remotely.",
+          "items": {
+            "connection-methods": "Choose LAN or the official Relay",
+            "start-stop-status": "Start or stop Remote Connect and inspect live status and device information",
+            "network": "Inspect LAN IP, network details, and shareable connection configuration",
+            "bots": "Configure Feishu, Telegram, WeChat, and other bots, and stop a bot independently",
+            "account": "Sign in with GitHub, sign out, and inspect identity status",
+            "devices": "List, connect, inspect model and OS, set aliases, and remove same-account devices",
+            "peer-device": "Enter Peer Device Mode and use another OpenBitFun device as the command and event data plane"
+          }
+        },
+        "detached-dispatch": {
+          "title": "Detached Dispatch",
+          "summary": "Dispatch durable work to another OpenBitFun host; the controller may disconnect while the target continues and keeps the record.",
+          "items": {
+            "targets": "List dispatch targets and probe their version, connectivity, and runtime capabilities",
+            "provision": "Provision the target runtime and install or update the OpenBitFun CLI",
+            "model-sync": "Synchronize required model configuration before submitting a job",
+            "submit": "Submit a durable job with workspace, session, model, and permission policy to the target",
+            "status-list": "List dispatched jobs and query their status, result, and errors",
+            "transcript": "Save, append, and reload reconnectable execution transcripts",
+            "permission-continuation": "Answer permission requests remotely and continue or cancel target-side work",
+            "result-sync": "Synchronize target-side results back without treating the controller as a remote-filesystem proxy"
+          }
+        },
+        "pages": {
+          "title": "Pages publishing",
+          "summary": "Save page versions and publish them to public or private URLs while managing titles, visibility, history, and share links.",
+          "items": {
+            "pages-list": "List account Pages and inspect each page's current publishing state",
+            "immutable-versions": "Save immutable page versions and browse version history",
+            "publish": "Publish or redeploy a selected page version",
+            "visibility": "Update titles, public/private visibility, and access settings",
+            "share-open": "Create an openable, shareable link for a page",
+            "unpublish": "Unpublish a page while retaining versions for later publication",
+            "delete": "Delete an individual version or an entire Page"
+          }
+        },
+        "voice-input": {
+          "title": "Voice input and realtime calls",
+          "summary": "Transcribe recordings or hold a client-wide realtime voice call that can enter projects, run tasks, and speak concise progress updates.",
+          "items": {
+            "composer-recording": "Start, finish, or cancel a recording from the chat composer",
+            "stream-audio": "Stream audio chunks during recording and show recognition progress",
+            "realtime-assistant-call": "Start or end a client-wide realtime voice call, hear replies, and ask the assistant to run or stop project tasks",
+            "realtime-assistant-config": "Read or save realtime voice service settings",
+            "local-models": "Browse local speech models and their install, download, verify, repair, and delete states",
+            "cancel-download": "Cancel an in-progress speech-model download",
+            "language-microphone": "Use automatic language detection or choose a language and system microphone",
+            "diagnostic-test": "Test the microphone and speech recognition in Settings, including timing and errors",
+            "edit-transcript": "Return the transcript to the composer for editing before sending"
+          }
+        },
+        "desktop-pet": {
+          "title": "Agent desktop companion",
+          "summary": "Show an agent companion on the desktop, and choose, import, or manage Petdex character packs.",
+          "items": {
+            "enable": "Enable or disable the agent desktop companion globally",
+            "presets": "Browse and switch among built-in or imported Petdex characters",
+            "petdex-import": "Import and use a new character and animations from a local Petdex package",
+            "petdex-delete": "Delete an imported Petdex package and fall back to an available character",
+            "desktop-window": "Show, hide, and resize the desktop companion window, and return to the main window"
+          }
+        },
+        "desktop-cards": {
+          "title": "Desktop cards",
+          "summary": "Let agents place draggable cards outside the main window for glanceable information such as countdowns, checklists, PR status, weather, or stock prices, restored after the app reopens.",
+          "items": {
+            "agent-cards": "Create countdown, checklist, note, progress, metrics, scheduled-job, and custom cards on request or during a task, optionally refreshed from an HTTP endpoint or a local command",
+            "home-management": "See every card in the Home Desktop cards section, and show, hide, or delete individual cards",
+            "card-actions": "Refresh data, check off list items, toggle always-on-top, open the link, or return to the source session from a card",
+            "drag-restore": "Drag cards anywhere on the desktop and resize them from their edges or corners; they disappear when OpenBitFun closes and return with the same position and size when it reopens"
+          }
+        }
+      },
+      "setting": {
+        "application": {
+          "general": {
+            "title": "General settings",
+            "summary": "Manage app-level preferences for startup, updates, close behavior, notifications, and sleep prevention.",
+            "items": {
+              "automatic-updates": "Enable or disable automatic update checks",
+              "manual-update": "Check and download updates in the background, then confirm installation and restart or install later from About",
+              "launch-at-login": "Choose whether OpenBitFun launches automatically after system sign-in",
+              "prevent-sleep": "Choose whether OpenBitFun prevents the computer from sleeping while it runs",
+              "close-behavior": "Choose whether closing the main window quits, minimizes to tray, or asks each time",
+              "notifications": "Control completion and permission-request notifications independently"
+            }
+          },
+          "appearance": {
+            "title": "Appearance & language",
+            "summary": "Switch themes and languages, tune typography, and install or import appearance packs.",
+            "items": {
+              "built-in-appearance": "Choose system, light, dark, monochrome, Midnight, China, Cyber, Slate, Tokyo Night, and other built-in appearances",
+              "language": "Switch among Simplified Chinese, Traditional Chinese, English, and other supported UI languages",
+              "ui-font-size": "Adjust the global UI font size, including custom pixel values",
+              "local-packages": "Import, preview, apply, export, and delete local appearance packages",
+              "appearance-market": "Browse, search, filter, install, and update appearances from the Skin market",
+              "agent-market-submit": "Let an agent submit a local Appearance package for Skin-market review when explicitly requested",
+              "market-submissions": "Review and withdraw your appearance-market submissions",
+              "market-review": "When authorized, inspect and approve or reject appearance submissions"
+            }
+          },
+          "pet": {
+            "title": "Companion settings",
+            "summary": "Enable the desktop agent companion, manage the active character, and turn desktop cards on or off.",
+            "items": {
+              "enabled": "Enable or disable the agent companion",
+              "desktop-cards-enabled": "Turn desktop cards on or off; when off, all cards are hidden and agents no longer see the desktop card tool",
+              "preset-selection": "Choose the active companion from built-in and imported characters",
+              "import": "Import a local Petdex character package",
+              "delete-refresh": "Refresh the character list and delete imported packages you no longer need"
+            }
+          },
+          "input": {
+            "title": "Input & interaction",
+            "summary": "Configure conversation text selection actions, voice input, microphones, recognition language, and local models.",
+            "items": {
+              "auto-show-selection-toolbar": "Enable or disable automatic actions after selecting conversation text",
+              "voice-enabled": "Enable or disable voice input in the chat composer",
+              "language": "Choose automatic detection or Chinese, Cantonese, English, Japanese, and other recognition languages",
+              "microphone-test": "Choose a microphone and run a speech-recognition test",
+              "local-models": "Download, select, verify, repair, or delete local speech models",
+              "recording-limit": "Set the maximum duration of one voice-input recording"
+            }
+          },
+          "shortcuts": {
+            "title": "Keyboard shortcuts",
+            "summary": "Search, browse, customize, and reset app, scene, editor, and terminal shortcuts.",
+            "items": {
+              "shortcut-browser": "Search and browse all app, scene, editor, and terminal shortcuts",
+              "shortcut-remap": "Record new shortcuts, detect conflicts, revert one binding, or reset all custom bindings"
+            }
+          },
+          "development": {
+            "title": "Editor",
+            "summary": "Tune code editor font, indentation, wrapping, formatting, and minimap behavior.",
+            "items": {
+              "editor-appearance": "Configure editor font, weight, size, line height, and cursor behavior",
+              "indent-wrap": "Configure tab size, space indentation, word wrapping, line numbers, and smooth scrolling",
+              "editor-display": "Control the minimap, whitespace rendering, current-line highlight, and scroll bounds",
+              "editor-advanced": "Control autosave, semantic highlighting, bracket colors, formatting, and whitespace trimming"
+            }
+          },
+          "terminal": {
+            "title": "Terminal",
+            "summary": "Choose the default terminal shell and where new terminal panels open in a session.",
+            "items": {
+              "default-shell": "Auto-detect or choose the default terminal shell",
+              "terminal-position": "Place the terminal panel on the right or at the bottom"
+            }
+          }
+        },
+        "ai": {
+          "models": {
+            "title": "Models & providers",
+            "summary": "Add AI providers and models, choose defaults, and configure proxy, subscription, and streaming timeouts.",
+            "items": {
+              "providers": "Add, edit, and remove built-in or custom AI providers",
+              "credentials-endpoint": "Configure API keys, base URLs, request formats, and model lists",
+              "subscription-auth": "Sign in, refresh, and sign out of Codex, Antigravity, OpenCode Console (Zen), Grok, Hermes, and other accounts",
+              "default-models": "Choose primary, fast, image-understanding, image-generation, and speech-recognition models",
+              "reasoning": "Choose reasoning presets or a custom reasoning effort per model",
+              "proxy": "Configure network proxies and bypass rules for AI requests",
+              "stream-timeouts": "Set or disable time-to-first-token and streaming idle timeouts",
+              "available-models": "Let an agent inspect models available under the current configuration",
+              "model-catalog": "Inspect models.dev catalog status, refresh it manually, and reveal its local cache",
+              "advanced-request": "Add custom headers, request-body fields, and SSL behavior per provider",
+              "connection-test": "Test provider or model connectivity before saving and refresh the runtime client",
+              "model-pools": "Manage model pools, routing strategies, and session model selection"
+            }
+          },
+          "memory": {
+            "title": "Memory settings",
+            "summary": "Control whether OpenBitFun extracts and uses long-term memory from sessions, including retention, consolidation, and model policy.",
+            "items": {
+              "generation-recall": "Enable or disable long-term memory generation and session recall together",
+              "btw": "Choose whether lightweight BTW sessions contribute memories",
+              "external-context": "When external tool context exists, clear tool results, allow it, or skip the session",
+              "rollout-policy": "Set idle time, maximum age, startup rollout limit, and scan limit",
+              "extraction": "Set memory-extraction concurrency and the raw-candidate limit",
+              "extraction-model": "Choose the memory-extraction model from currently available models or follow the primary model",
+              "retention": "Set how long unused memories are retained",
+              "consolidation": "Choose the consolidation model or make it follow the primary or extraction model",
+              "maintenance": "Open the memory directory, restore defaults, or explicitly erase all memories"
+            }
+          }
+        },
+        "workspace": {
+          "session": {
+            "title": "Session & workspace settings",
+            "summary": "Control the default Agent Harness, session-title generation, accelerated workspace search, and project-context behavior.",
+            "items": {
+              "default-agent-harness": "Make regular new sessions follow the last ChatInput selection or use a fixed Harness",
+              "automatic-titles": "Enable or disable automatic titles generated from session content",
+              "title-model": "Make title generation inherit the primary or fast model, or use a selected model",
+              "next-input-suggestion": "Enable or disable the one-sentence next input suggested in the input box after an Agent reply",
+              "accelerated-search": "Enable Flashgrep-backed accelerated search for local workspaces",
+              "search-index": "Inspect index status and rebuild the workspace index when needed",
+              "remote-behavior": "Use an explicit remote-workspace search path without silently falling back to local files"
+            }
+          },
+          "worktrees": {
+            "title": "Worktree settings",
+            "summary": "Configure the root, branch prefix, and cleanup rules for Git worktrees, and inspect existing isolated workspaces.",
+            "items": {
+              "isolation": "Understand isolated worktrees and configure their creation and cleanup defaults",
+              "root-path": "Set the common root directory for managed worktrees",
+              "branch-prefix": "Set the branch-name prefix used for automatically created branches",
+              "copy-changes": "Choose whether current uncommitted changes are copied into a new isolated workspace",
+              "auto-cleanup": "Enable automatic cleanup and set the maximum number of managed worktrees to retain",
+              "management": "Inspect worktree lifecycle, dirty state, unpublished commits, and linked sessions",
+              "open-restore-delete": "Open or restore linked sessions and delete or force-delete a worktree after protection checks"
+            }
+          }
+        },
+        "tools": {
+          "execution": {
+            "title": "Execution & permissions",
+            "summary": "Manage agent tool permissions, concurrency, timeouts, deferred loading, Computer Use, and browser control.",
+            "items": {
+              "permission-mode": "Choose Ask, Auto-approve, or Full Access permission mode and acknowledge high-risk warnings",
+              "permission-selector": "Choose whether the permission-mode selector appears below the chat composer",
+              "global-project-rules": "Create, reorder, and save global or project-level Allow, Ask, and Deny rules",
+              "remembered-grants": "Review, revoke, or clear remembered project permission grants and audit records",
+              "deferred-tools": "Deferred tool loading on demand to reduce initial agent context",
+              "parallelism": "Set subagent and swarm concurrency plus safe-only, forced-parallel, or serial policy",
+              "timeouts": "Set or disable the per-tool execution timeout",
+              "review-capacity": "Set the maximum parallel Deep Review workers and queue wait time",
+              "computer-use": "Enable or disable Computer Use after operating-system authorization",
+              "computer-use-permissions": "Inspect and request accessibility and screen-recording permissions",
+              "browser-auto-connect": "Choose whether OpenBitFun reconnects browser control at startup",
+              "browser-setup": "Discover and choose a browser, configure default CDP, or restart it when needed",
+              "json-repair": "Choose whether malformed model-generated tool-argument JSON may be repaired within safety boundaries"
+            }
+          },
+          "desktop-control": {
+            "title": "Desktop control",
+            "summary": "Manage Computer Use and inspect accessibility and screen-recording permissions.",
+            "items": {
+              "permissions": "Inspect Computer Use, accessibility, and screen-recording status and complete system authorization"
+            }
+          },
+          "browser-control": {
+            "title": "Browser control",
+            "summary": "Choose a browser, inspect connection status, and configure CDP and startup connection behavior.",
+            "items": {
+              "connection": "Choose a browser and inspect, establish, or disconnect its CDP connection"
+            }
+          },
+          "automation": {
+            "title": "Quick actions & hooks",
+            "summary": "Customize post-coding quick actions and configure hooks that run on agent lifecycle events.",
+            "items": {
+              "built-in-actions": "Enable and tune the built-in Commit and Create Pull Request quick actions",
+              "custom-actions": "Add, edit, and delete custom post-coding quick actions and prompts",
+              "hooks-enabled": "Enable or disable agent lifecycle hooks globally",
+              "project-hooks": "Enable project-level .openbitfun/config/hooks.json separately for trusted repositories",
+              "hook-files": "Locate user and project hook configuration files and apply edits without restarting",
+              "hook-events": "Run handlers on Codex hook events for sessions, agents, tools, permissions, and user input",
+              "external-hooks": "Inspect read-only external-AI hook catalogs and choose entries to import",
+              "hook-import": "Preview, edit, and apply hook import plans while retaining conflict diagnostics"
+            }
+          },
+          "web-search": {
+            "title": "Web Search",
+            "summary": "Choose the search provider used by the WebSearch tool at runtime and configure custom HTTP endpoints and credentials on the current execution host.",
+            "items": {
+              "provider": "Choose free Exa MCP, Exa Search API, Tavily, DeepSeek, or OpenBitFun Search HTTP Protocol as the runtime provider",
+              "http-endpoint": "Configure the endpoint, authentication mode, and restricted credential header for OpenBitFun Search HTTP Protocol",
+              "device-credential": "Inspect credential status on the current execution host and save, replace, or clear an API key or secret",
+              "http-protocol": "Inspect and copy the request, response, and transport limits for OpenBitFun Search HTTP Protocol v1"
+            }
+          },
+          "mcp": {
+            "title": "MCP servers",
+            "summary": "Add and manage Model Context Protocol servers, including tools, resources, prompts, and remote authorization state.",
+            "items": {
+              "json-config": "View and save all MCP server configuration through forms or JSON",
+              "server-types": "Add local-process, remote HTTP/SSE, or container MCP servers",
+              "lifecycle": "Start, stop, restart, and delete individual MCP servers",
+              "status": "Inspect initialization, connection, health, reconnecting, authentication, and failure states",
+              "remote-auth": "Configure remote header/environment authentication or clear stored credentials",
+              "oauth": "Start, poll, cancel, or reconnect remote MCP OAuth",
+              "tools-prompts": "List MCP prompts and load a selected prompt with arguments",
+              "mcp-tool-ui": "Inspect MCP tool catalogs and open tool-provided App/UI surfaces",
+              "resources": "List and read MCP resources",
+              "mcp-apps": "Open MCP App/UI surfaces, exchange messages, and answer interaction requests"
+            }
+          },
+          "acp": {
+            "title": "ACP external agents",
+            "summary": "Configure external agents connected through Agent Client Protocol and inspect adapters, commands, and session options.",
+            "items": {
+              "presets": "Use presets for OpenCode, dsh, OMP, Claude Code, Codex, and others",
+              "json-config": "View, add, and save ACP agent configuration through JSON",
+              "probe": "Probe CLI, adapter, path, version, connection, and permission requirements",
+              "install": "Install external-agent CLIs and predownload ACP client adapters",
+              "remote-detection": "Detect available external agents in SSH workspaces and show explicit unsupported reasons",
+              "session-model-options": "Choose an ACP session model and edit client-declared configuration options",
+              "session-commands": "Browse and run session commands exposed by an external agent",
+              "dialog-permissions": "Start or cancel ACP turns and answer external-agent permission requests remotely"
+            }
+          }
+        },
+        "data": {
+          "usage": {
+            "title": "Token usage",
+            "summary": "Inspect request counts, input and output tokens, cache hits, and estimated cost statistics.",
+            "items": {
+              "time-range": "Review usage for the last 24 hours, today, this week, this month, or all time",
+              "granularity": "Switch trend granularity between hourly and daily views",
+              "filter": "Filter usage by provider, model, or search text",
+              "summary": "View request count, total tokens, cached tokens, and cache-hit rate",
+              "distribution": "Compare distributions by model, provider group, and request endpoint",
+              "trend": "Track input, output, cache creation, cache read, and hit-rate trends separately"
+            }
+          },
+          "archived": {
+            "title": "Archived sessions",
+            "summary": "Find, restore, or permanently delete archived sessions and manage long-term conversation history.",
+            "items": {
+              "browse": "Browse paged archived sessions and metadata by workspace",
+              "search": "Search archived sessions by title, content, and workspace",
+              "restore": "Restore a session, its turns, and original workspace view, then unarchive it",
+              "delete-selected": "Permanently delete a selected archived session after explicit confirmation",
+              "delete-all": "Permanently delete all archived sessions after explicit confirmation"
+            }
+          },
+          "diagnostics": {
+            "title": "Logs & diagnostics",
+            "summary": "Adjust logging level, inspect runtime log locations, and export diagnostic bundles for troubleshooting.",
+            "items": {
+              "log-level": "Set backend logging to Trace, Debug, Info, Warn, Error, or Off",
+              "sensitive-diagnostics": "Choose whether diagnostics may include sensitive context, with an explicit warning before export",
+              "log-path": "Inspect the log path and open the log folder",
+              "export-bundle": "Export a diagnostics bundle containing system, configuration-health, and log information",
+              "crash-recovery": "Inspect previous crashes, unclean shutdowns, startup recovery, and configuration recovery",
+              "devtools": "In development builds, check DevTools availability and open or close them",
+              "element-inspector": "In development builds, inspect main-window elements and report the selected element"
+            }
+          }
+        }
+      }
+    }
+  }
 }
diff --git a/src/web-ui/src/locales/en-US/scenes/skills.json b/src/web-ui/src/locales/en-US/scenes/skills.json
index b5e692d177..a9237bc61a 100644
--- a/src/web-ui/src/locales/en-US/scenes/skills.json
+++ b/src/web-ui/src/locales/en-US/scenes/skills.json
@@ -231,7 +231,11 @@
     "scanIncomplete": "Some skills could not be scanned. Available skills are still listed.",
     "unsupportedSkills": "Some skills require unsupported capabilities and were not loaded.",
     "unsupportedField": "This host does not support the skill's {{field}} declaration. The skill was not loaded.",
-    "diagnosticsUnavailable": "This host does not report skill scan diagnostics."
+    "diagnosticsUnavailable": "This host does not report skill scan diagnostics.",
+    "diagnostics": {
+      "title": "Scan details ({{count}})",
+      "description": "Available skills remain usable. Fix the files below, then scan again."
+    }
   },
   "deleteModal": {
     "title": "Confirm Delete",
diff --git a/src/web-ui/src/locales/en-US/settings.json b/src/web-ui/src/locales/en-US/settings.json
index 25b9049676..c19d33ccfc 100644
--- a/src/web-ui/src/locales/en-US/settings.json
+++ b/src/web-ui/src/locales/en-US/settings.json
@@ -281,7 +281,7 @@
         "toggleBoth": "Collapse All Panels"
       },
       "nav": {
-        "toggleSearch": "Open navigation search"
+        "toggleSearch": "Open global search"
       },
       "scene": {
         "focusMerged": "Switch scene",
@@ -312,7 +312,8 @@
         "stopGeneration": "Stop Generation",
         "activateInput": "Activate Input",
         "newSession": "$t(shared:sessions.new)",
-        "insertNewline": "Insert Newline in Chat Input"
+        "insertNewline": "Insert Newline in Chat Input",
+        "search": "Search this conversation"
       },
       "filetree": {
         "rename": "Rename",
@@ -340,6 +341,12 @@
       "canvas": "Active when the editor canvas or a code editor inside it has focus",
       "filetree": "Active when the file tree has focus",
       "git": "Active when the Git panel has focus"
+    },
+    "reserved": {
+      "appSwitch": "Reserved for switching applications. Choose another shortcut.",
+      "systemSearch": "Reserved for system search. Choose another shortcut.",
+      "secureAttention": "Reserved for Windows security. Choose another shortcut.",
+      "systemKey": "Uses the Windows system key. Choose another shortcut."
     }
   },
   "advanced": {
diff --git a/src/web-ui/src/locales/en-US/settings/appearance.json b/src/web-ui/src/locales/en-US/settings/appearance.json
index f64b31cae1..1ff108c33e 100644
--- a/src/web-ui/src/locales/en-US/settings/appearance.json
+++ b/src/web-ui/src/locales/en-US/settings/appearance.json
@@ -1,6 +1,6 @@
 {
   "title": "Appearance",
-  "subtitle": "Choose the interface language, theme, and text size",
+  "subtitle": "Adjust themes and font size",
   "sessionPanel": {
     "title": "Session panel",
     "displayMode": "Panel layout",
diff --git a/src/web-ui/src/locales/zh-CN/common.json b/src/web-ui/src/locales/zh-CN/common.json
index 0d6a5cf281..7b5ed5089d 100644
--- a/src/web-ui/src/locales/zh-CN/common.json
+++ b/src/web-ui/src/locales/zh-CN/common.json
@@ -192,7 +192,9 @@
         "activationFailed": "无法打开该结果",
         "remoteFileSearchUnavailable": "远程项目 {{workspace}} 暂不支持文件搜索",
         "sessionUnavailable": "该会话已不可用"
-      }
+      },
+      "diagnosticTarget": "搜索设备：{{host}}",
+      "retrySource": "重试此来源"
     },
     "displayModes": {
       "pro": "专业模式",
@@ -523,7 +525,7 @@
         "workspacePath": "请输入工作区路径",
         "session": "请选择或输入会话 ID",
         "optionalSession": "留空则创建新会话后执行",
-        "agentType": "例如：Standard、Cowork 或 Claw",
+        "agentType": "例如：$t(shared:agents.Standard)、$t(shared:agents.Cowork) 或 $t(shared:agents.Claw)",
         "name": "例如：每日全球新闻简报",
         "anchorMs": "留空则使用创建时刻",
         "timezone": "例如：Asia/Shanghai",
@@ -798,7 +800,8 @@
     "hostDiscoveryFailed": "无法加载主机，请重试。",
     "existingHostRequired": "请选择已有的 SSH 主机。",
     "sshHost": "SSH 主机",
-    "sourceUnsupported": "当前主机不支持此环境。"
+    "sourceUnsupported": "当前主机不支持此环境。",
+    "checkingWsl": "正在检查当前主机的 WSL 支持…"
   },
   "newProject": {
     "title": "创建项目",
diff --git a/src/web-ui/src/locales/zh-CN/components.json b/src/web-ui/src/locales/zh-CN/components.json
index 985c008c18..fc5cbdb220 100644
--- a/src/web-ui/src/locales/zh-CN/components.json
+++ b/src/web-ui/src/locales/zh-CN/components.json
@@ -584,7 +584,17 @@
     "dropRight": "右",
     "dropTop": "上",
     "dropBottom": "下",
-    "dropCenter": "放置"
+    "dropCenter": "放置",
+    "empty": {
+      "title": "在会话旁打开工作内容",
+      "description": "文件、终端和预览都会显示在这里。",
+      "currentHost": "当前主机",
+      "workspaceUnavailable": "此工作区已断开连接。重新连接后可浏览文件或新建终端。",
+      "selectWorkspace": "选择工作区后可浏览文件或新建终端。",
+      "browseFiles": "浏览文件",
+      "newTerminal": "新建终端",
+      "reopen": "重新打开 {{title}}"
+    }
   },
   "flexiblePanel": {
     "empty": {
diff --git a/src/web-ui/src/locales/zh-CN/flow-chat.json b/src/web-ui/src/locales/zh-CN/flow-chat.json
index 08a40e3fa5..1f58030624 100644
--- a/src/web-ui/src/locales/zh-CN/flow-chat.json
+++ b/src/web-ui/src/locales/zh-CN/flow-chat.json
@@ -314,7 +314,9 @@
       "filesDescription": "当前会话没有找到文件编辑记录。",
       "errorsDescription": "本次报告没有记录到可展示的工具或模型错误样例。",
       "slowest": "无慢耗时记录",
-      "slowestDescription": "没有记录到带耗时的轮次、模型调用或工具片段。"
+      "slowestDescription": "没有记录到带耗时的轮次、模型调用或工具片段。",
+      "session": "还没有会话活动",
+      "sessionDescription": "在此会话中发送一条消息即可开始。运行后，这里会显示模型用量、工具调用和耗时。"
     },
     "runtime": {
       "open": "生成会话用量",
@@ -435,18 +437,18 @@
     }
   },
   "threadGoal": {
-    "replaceConfirmTitle": "替换线程目标？",
+    "replaceConfirmTitle": "替换会话目标？",
     "replaceConfirmMessage": "是否替换当前目标？\n\n当前：{{existing}}\n\n新目标：{{next}}",
-    "clearConfirmTitle": "清除线程目标？",
+    "clearConfirmTitle": "清除会话目标？",
     "clearConfirmMessage": "是否清除当前目标？\n\n目标：{{objective}}",
-    "menuTitle": "线程目标",
+    "menuTitle": "会话目标",
     "objectiveLabel": "目标描述",
-    "updatedUserMessage": "线程目标已更新：{{objective}}",
-    "kickoffUserMessage": "继续推进线程目标：{{objective}}",
+    "updatedUserMessage": "会话目标已更新：{{objective}}",
+    "kickoffUserMessage": "继续推进会话目标：{{objective}}",
     "continuationCheckHeader": "目标完成检查",
     "continuationCheckHeaderWithAttempt": "目标完成检查（自动续跑 {{attempt}}/{{max}}）",
     "continuationCheckUserMessage": "目标完成检查：{{objective}}",
-    "menuEmpty": "尚未设置线程目标。填写目标描述后，代理会在空闲时持续朝该方向推进。",
+    "menuEmpty": "尚未设置会话目标。填写目标描述后，代理会在空闲时持续朝该方向推进。",
     "workflow": {
       "title": "完成检查",
       "steps": {
@@ -463,8 +465,8 @@
         "budgetLimited": "已达 token 预算上限，可编辑目标或清除后重新设置。"
       }
     },
-    "editTitleCreate": "设置线程目标",
-    "editTitleUpdate": "编辑线程目标",
+    "editTitleCreate": "设置会话目标",
+    "editTitleUpdate": "编辑会话目标",
     "editHint": "输入目标描述并保存；会话空闲时会继续朝该目标推进。",
     "editPlaceholder": "目标描述…",
     "editCancel": "取消",
@@ -474,10 +476,10 @@
     "resumeHint": "标记为进行中后，会话空闲时会继续执行。也可保持暂停，稍后用 /goal resume。",
     "resumeConfirm": "恢复目标",
     "resumeLeavePaused": "保持暂停",
-    "stripTooltipEmpty": "设置或查看线程目标",
+    "stripTooltipEmpty": "设置或查看会话目标",
     "stripTooltipWithGoal": "{{status}}：{{objective}}",
-    "stripOpenEmpty": "打开线程目标",
-    "stripOpenWithGoal": "打开线程目标菜单",
+    "stripOpenEmpty": "打开会话目标",
+    "stripOpenWithGoal": "打开会话目标菜单",
     "stripPauseGoal": "暂停目标",
     "stripResumeGoal": "恢复目标",
     "stripClearGoal": "清除目标",
@@ -972,7 +974,7 @@
       "openDefaultSettings": "打开权限设置"
     },
     "boostSectionContext": "上下文",
-    "boostThreadGoal": "设置线程目标",
+    "boostThreadGoal": "设置会话目标",
     "boostStartBtw": "发起侧问",
     "boostNewSession": "新建会话",
     "boostAddContext": "引用文件或文件夹",
@@ -1008,12 +1010,12 @@
     "goalVerifyFailed": "目标验证失败，请检查模型配置后重试。",
     "goalNoSession": "当前没有可用于 /goal 的会话",
     "goalUsage": "使用 /goal 并可选择附加目标描述，例如 /goal 修复登录问题。",
-    "goalFailed": "线程目标操作失败",
-    "goalActivated": "线程目标已设置",
-    "goalCleared": "线程目标已清除",
-    "goalPaused": "线程目标已暂停",
-    "goalResumed": "线程目标已恢复",
-    "goalEdited": "线程目标已更新",
+    "goalFailed": "会话目标操作失败",
+    "goalActivated": "会话目标已设置",
+    "goalCleared": "会话目标已清除",
+    "goalPaused": "会话目标已暂停",
+    "goalResumed": "会话目标已恢复",
+    "goalEdited": "会话目标已更新",
     "goalNestedDisabled": "目标模式只能从主会话启动。",
     "initAction": "生成 AGENTS.md",
     "initNoSession": "当前没有可用于 /init 的会话",
@@ -1120,7 +1122,7 @@
       "label": "MCP",
       "server": "MCP 服务",
       "empty": "当前模式没有可用的已连接 MCP 工具。请在 MCP 设置中启用并启动服务。",
-      "modeRestricted": "当前模式不提供已连接的 MCP 工具。请切换到 Standard、Ultimate 或 Creative 使用。",
+      "modeRestricted": "当前模式不提供已连接的 MCP 工具。请切换到$t(shared:agents.Standard)、$t(shared:agents.Ultimate) 或 $t(shared:agents.Creative)使用。",
       "loadFailed": "MCP 工具加载失败，请刷新重试。",
       "refresh": "刷新 MCP 工具",
       "remoteWorkspace": "远程工作区暂不支持选择 MCP。",
diff --git a/src/web-ui/src/locales/zh-CN/panels/git.json b/src/web-ui/src/locales/zh-CN/panels/git.json
index 414766b667..70ee62a8f0 100644
--- a/src/web-ui/src/locales/zh-CN/panels/git.json
+++ b/src/web-ui/src/locales/zh-CN/panels/git.json
@@ -454,5 +454,17 @@
     "unavailable": "无法在此处为 \"{{path}}\" 授予 Git 所有权信任，请在持有该仓库的机器上授予。",
     "unavailableWithCommand": "无法在此处为 \"{{path}}\" 授予 Git 所有权信任。请在持有该仓库的机器上执行：\n\n{{command}}",
     "required": "在你信任其所有权之前，Git 不会读取 \"{{path}}\"。"
+  },
+  "workingCopy": {
+    "openWorkspace": "打开工作区后即可查看变更。",
+    "currentHost": "当前主机",
+    "clean": "工作区干净",
+    "cleanDescription": "此仓库没有尚未提交的变更。",
+    "upstreamComparison": "相对上游：领先 {{ahead}} 个提交 · 落后 {{behind}} 个提交",
+    "unpushed": "本地仍有尚未推送的提交。准备好后，可使用上方的推送按钮。",
+    "remoteSnapshot": "可在分支页面查看跟踪关系与远端同步状态。",
+    "statusUnavailable": "无法获取 Git 状态",
+    "selectFile": "选择文件以查看变更",
+    "conflicts": "{{count}} 个文件存在未解决的冲突。"
   }
 }
diff --git a/src/web-ui/src/locales/zh-CN/scenes/agents.json b/src/web-ui/src/locales/zh-CN/scenes/agents.json
index ae77aa7286..86534c0453 100644
--- a/src/web-ui/src/locales/zh-CN/scenes/agents.json
+++ b/src/web-ui/src/locales/zh-CN/scenes/agents.json
@@ -317,11 +317,11 @@
       "idPlaceholder": "用于模型识别、配置和路由，创建后不可修改",
       "idRequired": "ID 不能为空",
       "idFormat": "只能以字母开头，包含字母/数字/下划线/连字符",
-      "name": "名称（选填）",
+      "name": "名称",
       "namePlaceholder": "仅用于展示，留空时使用智能体 ID",
       "level": "级别",
       "modeUserOnly": "当前版本中，直接承接任务的自定义智能体仅支持用户级。",
-      "description": "描述",
+      "description": "任务目标",
       "descPlaceholder": "简要描述该智能体的用途",
       "descRequired": "描述不能为空",
       "prompt": "系统提示词",
@@ -350,7 +350,17 @@
       "createSuccess": "已创建智能体「{{name}}」",
       "createFailed": "创建失败：",
       "review": "评审",
-      "reviewToolsHint": "补充检查仅使用只读工具。"
+      "reviewToolsHint": "补充检查仅使用只读工具。",
+      "nameRequired": "请给智能体起个名字。",
+      "identityDetails": "标识符（已自动生成）",
+      "idHelp": "用于文件和引用。创建前可以修改，已有智能体的标识符保持固定。",
+      "promptGuide": "写清楚工作方法、约束和交付要求。也可以先按任务目标生成一份提示词骨架，再补充细节。",
+      "usePromptTemplate": "按任务目标生成骨架",
+      "promptTemplate": "## 目标\n{{goal}}\n\n## 工作方法\n先阅读已有上下文，识别缺失信息，再逐步完成任务。缺少会影响结果的关键决策时，先询问。\n\n## 约束\n遵守项目说明和已授予的权限。明确区分证据与假设。\n\n## 交付要求\n给出结果、支持结论的证据，以及尚未解决的问题。",
+      "permissionsReadonly": "只读访问 · 调整权限",
+      "permissionsStandard": "标准权限 · 调整访问范围",
+      "customizeTools": "调整已选工具",
+      "createNamePlaceholder": "例如：资料研究助手"
     }
   },
   "reviewTeams": {
diff --git a/src/web-ui/src/locales/zh-CN/scenes/capabilities.json b/src/web-ui/src/locales/zh-CN/scenes/capabilities.json
index d3bbf18c98..40bf864a9d 100644
--- a/src/web-ui/src/locales/zh-CN/scenes/capabilities.json
+++ b/src/web-ui/src/locales/zh-CN/scenes/capabilities.json
@@ -18,5 +18,631 @@
   "serverType": "类型",
   "clickToCopy": "点击复制路径",
   "pathCopied": "路径已复制",
-  "pathCopyFailed": "复制路径失败"
+  "pathCopyFailed": "复制路径失败",
+  "search": {
+    "categories": {
+      "assistant": "AI 与协作",
+      "workspace": "项目与开发",
+      "automation": "扩展与自动化",
+      "connect": "连接与发布",
+      "application": "应用设置",
+      "data": "数据与诊断"
+    },
+    "kinds": {
+      "feature": "功能",
+      "setting": "$t(shared:features.settings)"
+    },
+    "capabilities": {
+      "feature": {
+        "ai-assistant": {
+          "title": "AI 助手与会话",
+          "summary": "在项目上下文中与 AI 协作，创建会话、继续任务、处理权限请求，并保留完整的工作记录。",
+          "items": {
+            "create-session": "打开并新建一个 AI 会话",
+            "session-lifecycle": "重命名、归档、恢复、删除、复制、分叉与导出会话",
+            "model-mode-permissions": "为会话选择模型、工作模式、记忆模式与权限模式",
+            "creative-frontend-authoring": "让创造模式扩展客户端界面与运行时能力",
+            "turn-control": "开始、引导、打断、取消或恢复一次智能体运行",
+            "permission-mailbox": "查看并逐个或批量回答等待中的权限请求",
+            "history-search": "分页加载、搜索和回填历史消息与会话内容",
+            "session-storage-directory": "从工作区或会话菜单打开会话存储目录，用于备份与手动排障",
+            "agent-session-coordination": "让智能体创建、列出、取消、删除会话或向另一会话发送消息",
+            "mcp-mentions": "在对话中通过 @ 选择当前模式可用的 MCP 服务",
+            "tool-activity": "查看工具调用与后台命令，读取输出并继续输入或停止",
+            "goals": "查看、创建并完成或阻塞当前会话目标",
+            "goal-maintenance": "编辑目标说明或清除当前会话目标",
+            "working-plan": "让智能体维护任务清单、生成实施计划并按需向用户提问",
+            "usage": "查看单个会话的请求、Token 与成本用量报告",
+            "context-memory": "重新加载会话上下文、运行 AGENTS.md 初始化并管理长期记忆",
+            "btw-editor-ai": "使用 BTW 轻量问答与编辑器内联 AI，并可随时取消"
+          }
+        },
+        "agents": {
+          "title": "智能体管理",
+          "summary": "管理内置、自定义和子智能体，让不同角色分工处理研究、编码、评审等任务。",
+          "items": {
+            "browse-agents": "查看内置、用户、项目与当前环境可见的智能体",
+            "custom-agent-create": "创建自定义智能体并设置名称、说明和角色",
+            "custom-agent-manage": "读取、编辑、重新加载或删除自定义智能体",
+            "subagent-manage": "创建、配置、查看和删除可委派的子智能体",
+            "capability-summary": "查看每个智能体的工具、Skills、只读状态和能力摘要",
+            "tools-skills": "按智能体选择工具组、单个工具、Skill 组与 Skills",
+            "delegation": "让主智能体委派并行研究、编码和评审任务并协调生命周期"
+          }
+        },
+        "personal-assistants": {
+          "title": "个人助理",
+          "summary": "在助理空间中创建和管理自己的长期 AI 助理，定义身份与人设，并从同一处开始会话或安排定时任务。",
+          "items": {
+            "assistant-gallery": "浏览已有助理、创建新助理并查看每个助理的身份与能力概览",
+            "assistant-open-close": "关闭侧栏中的助理并取消正在运行的会话，保留配置和历史，之后从助理空间重新打开",
+            "primary-delete-reset": "设为主助理、删除非主助理，或将助理工作区重置为默认状态",
+            "identity-avatar": "编辑助理名称、角色类型和气质，并选择官方头像、Emoji 或自定义头像字符",
+            "persona-documents": "读取和编辑 IDENTITY.md、SOUL.md 与 USER.md，并自动保存 Markdown 正文和 Frontmatter",
+            "assistant-sessions": "在助理详情中选择模型、输入消息并查看该助理的历史会话",
+            "assistant-schedules": "查看和管理仅属于当前助理工作区的定时会话与自动任务"
+          }
+        },
+        "projects": {
+          "title": "项目与工作区",
+          "summary": "打开本地目录或创建项目，让文件、会话、终端和智能体围绕同一工作区协作。",
+          "items": {
+            "open-create": "打开现有项目或进入新建项目流程",
+            "close-switch-reorder": "关闭、切换并重新排序多个已打开工作区",
+            "recent-workspaces": "查看、清理和重新打开最近使用的项目",
+            "workspace-metadata": "扫描并维护工作区名称、信息、关联目录和 Persona 文件",
+            "file-watch": "监听项目文件变化、检查监听状态并在失败后恢复",
+            "workspace-search": "按文件名、路径或文件内容搜索本地工作区",
+            "remote-open": "从项目流程打开 SSH 或其他远程工作区",
+            "project-health": "查看当前工作区、应用状态、健康状态与统计信息"
+          }
+        },
+        "files-editor": {
+          "title": "文件与代码编辑",
+          "summary": "浏览、搜索和编辑项目文件，查看差异、按语言可用的编辑操作与智能体产生的改动。",
+          "items": {
+            "file-tree": "浏览、创建、读取、编辑、重命名和删除文件与目录",
+            "reveal-in-system": "在系统文件管理器中显示文件或目录",
+            "indexed-search": "按文件名模式和全文内容搜索当前工作区",
+            "search-index-management": "建立或重建界面搜索索引",
+            "edit-save": "读取、编辑、保存文件并同步编辑器状态",
+            "diffs": "查看修改文件、会话、轮次和单次操作的差异与统计",
+            "accept-reject": "按文件、操作或整个会话接受或拒绝智能体改动",
+            "snapshots-rollback": "查看文件变更历史和快照，并回滚整个会话或指定轮次",
+            "language-actions": "仅在当前语言提供器实际支持时显示格式化、定义与类型跳转、引用、重命名、快速修复和符号导航",
+            "attachments": "在 Desktop 本地会话中粘贴或拖入本机文件、文件夹与图片",
+            "image-analysis": "查看并分析工作区或会话中的图片"
+          }
+        },
+        "terminal": {
+          "title": "终端",
+          "summary": "在当前项目中运行 Shell、查看输出、保留命令历史，并让智能体与同一终端环境协作。",
+          "items": {
+            "create-terminal": "打开终端面板并新建一个终端会话",
+            "terminal-session-management": "列出、切换和关闭多个终端会话",
+            "shells": "检测可用 Shell，并为终端选择默认或指定 Shell",
+            "working-directory": "在当前项目目录或指定起始目录创建终端",
+            "command-control": "执行命令、写入输入并发送中断或其他信号",
+            "resize": "随终端面板大小变化同步行列尺寸",
+            "history-integration": "查看命令历史并检测 Shell Integration 支持",
+            "shutdown": "确认输出接收并安全关闭单个或全部终端"
+          }
+        },
+        "git": {
+          "title": "Git 版本控制",
+          "summary": "查看改动、分支和提交，完成暂存、提交、合并、Cherry-pick 与 Worktree 工作流。",
+          "items": {
+            "status-diff": "查看仓库状态、修改文件和逐文件 Diff",
+            "stage-reset": "暂存文件、取消暂存并重置到指定提交",
+            "commit": "预览或生成提交信息并创建提交",
+            "sync": "从远端 Pull 并向远端 Push",
+            "branches": "查看、创建、切换和删除本地分支",
+            "graph-history": "浏览提交图谱与仓库历史并保存最近访问记录",
+            "revision-content": "解析 Revision 并查看任意提交中的文件内容",
+            "cherry-pick": "执行、继续或中止 Cherry-pick",
+            "trust-worktrees": "管理仓库信任与 Worktree 的创建、绑定、提升、重建和删除"
+          }
+        },
+        "code-review": {
+          "title": "代码评审与 Pull Request",
+          "summary": "阅读改动与 PR 上下文，查看 CI 日志，生成提交信息，并组织深度代码评审。",
+          "items": {
+            "workspace-context": "读取仓库、分支、工作区快照和评审目标",
+            "pull-request": "查看 Pull Request 详情、分页内容与关联改动",
+            "ci-logs": "读取 Pull Request 的 CI 运行日志",
+            "issues": "读取关联 Issue 的标题、描述与上下文",
+            "authentication": "保存或清除评审平台访问令牌",
+            "commit-message": "预览、生成或快速采用提交信息",
+            "deep-review": "针对工作区、提交或 PR 发起 Deep Review 并汇总结构化评审"
+          }
+        },
+        "browser": {
+          "title": "内置浏览器",
+          "summary": "在 OpenBitFun 内打开网页和本地服务；智能体可直接读取页面、选择元素并点击、填写、滚动或截图。",
+          "items": {
+            "open-urls": "输入完整网址、本地域名或开发服务端口并在 OpenBitFun 内打开",
+            "agent-web-research": "让智能体搜索网页并按需读取指定页面正文",
+            "history-navigation": "使用后退、前进和地址栏浏览页面历史",
+            "reload-status": "刷新页面，并同步当前 URL、加载状态与错误提示",
+            "scene-and-panel": "既可作为独立浏览器场景，也可在会话旁的辅助面板中打开",
+            "element-picker": "启动元素选择器，悬停时高亮页面元素并显示标签、ID 和 Class",
+            "element-context": "点击元素后捕获 CSS 路径、属性、文本和 HTML，并加入当前会话上下文",
+            "element-picker-cancel": "再次点击选择按钮或按 Esc 取消元素选择并清理高亮",
+            "agent-page-automation": "让智能体对内置网页执行快照、读取、点击、悬停、填写、按键、滚动、等待、脚本求值和截图",
+            "shared-browser-action-contract": "内置 WebView 与外部 CDP 浏览器共用同一套 BrowserActions 参数、元素引用、结果与错误契约",
+            "browser-target-selection": "通过 target 选择内置或外部浏览器，并用 session_id、URL 或标题精确定位页面",
+            "embedded-webview": "桌面端使用原生 WebView，Web 端回退到受限 iframe，并在当前页打开新窗口链接"
+          }
+        },
+        "computer-use": {
+          "title": "浏览器与桌面控制",
+          "summary": "授权智能体操作浏览器或本机界面，并明确管理辅助功能、屏幕录制与浏览器连接。",
+          "items": {
+            "status": "检查 Computer Use 可用性、辅助功能和屏幕录制授权状态",
+            "request-permissions": "请求桌面控制所需的系统权限",
+            "system-settings": "直接打开对应的系统隐私与安全设置",
+            "browser-discovery": "发现受支持的浏览器并查看当前 CDP 连接状态",
+            "launch-connect": "启动浏览器控制，以及连接或断开已经配置 CDP 的浏览器",
+            "default-cdp": "启用默认 CDP 配置并按需要重启浏览器",
+            "agent-actions": "授权后让智能体截图、点击、输入、滚动并读取可见界面",
+            "control-session-preview": "在控制状态卡片查看当前目标、模式与授权画面预览",
+            "stop-control-session": "停止当前桌面控制会话并释放捕获与输入资源",
+            "app-sharing": "选择 App 窗口并单独授权或撤销控制",
+            "preview-input": "在共享预览中点击、拖动、滚动及输入",
+            "remembered-control": "按应用执行文件和控制模式记住或忘记授权"
+          }
+        },
+        "skills": {
+          "title": "Skills 技能",
+          "summary": "为智能体安装和管理可复用的专业工作流，并控制哪些模式可以使用它们。",
+          "items": {
+            "installed-catalog": "统一查看用户级、项目级、本地和远程来源的已安装 Skills",
+            "market": "浏览、搜索和刷新 Skill 市场",
+            "market-install": "把市场 Skill 下载到用户级或当前项目",
+            "local-add": "校验本地 Skill 路径并添加到用户级或项目级",
+            "remove": "删除已安装的用户级或项目级 Skill",
+            "global-enable": "在全局范围启用或停用单个 Skill",
+            "mode-selection": "按智能体模式选择 Skill 与 Skill 组，并可恢复默认选择",
+            "shadowing": "识别同名 Skill 的用户级与项目级遮蔽优先级",
+            "invoke": "按需加载并执行当前智能体可见的 Skill"
+          }
+        },
+        "miniapps": {
+          "title": "Mini Apps 小应用",
+          "summary": "在 OpenBitFun 内安装、创建和运行轻量应用，让界面、数据与智能体工作流组合在一起。",
+          "items": {
+            "gallery-lifecycle": "查看、创建、编辑和删除已安装 Mini App",
+            "market": "浏览市场、查看详情并安装或更新发布版本",
+            "market-account": "登录市场账户并收藏、评分和查看已安装来源",
+            "permissions": "按路径或工作区授予权限，并在定制前审查权限差异",
+            "runtime": "运行 Mini App Host 与 Worker，查看状态并停止后台 Worker",
+            "storage": "为正式应用和定制草稿分别读取与保存持久状态",
+            "agent-ai": "在 Mini App 中调用模型补全、聊天和专属智能体会话",
+            "customization": "创建定制草稿、实时预览，并应用、同步或丢弃修改",
+            "versions": "查看版本历史并回滚到旧版本",
+            "agent-authoring": "让智能体初始化、编写并校验一个 Mini App",
+            "agent-market-submit": "在用户明确要求时由智能体提交已完成的 Mini App 到市场审核",
+            "publishing": "撤回和审查市场发布，并可渲染幻灯片页面"
+          }
+        },
+        "canvas": {
+          "title": "Canvas 与交互产物",
+          "summary": "在会话旁展示和保存智能体生成的可视化、交互页面与结构化产物。",
+          "items": {
+            "artifact-open": "从会话工具结果加载并打开持久化 Canvas 产物",
+            "html-react": "渲染并持续编辑 HTML 或 React 交互界面、图表和可视化",
+            "inline-generative-ui": "在会话中生成紧凑的 HTML/SVG 图表、说明器或交互组件",
+            "state": "在重新打开或刷新 Canvas 时加载和保存交互状态",
+            "source-inspection": "查看 Canvas 源码、编译版本和最后可用版本",
+            "element-context": "选择 Canvas 内的元素并把元素引用加入会话上下文",
+            "runtime-errors": "捕获运行错误、上报诊断并请求智能体自动修复",
+            "export-html": "把当前 Canvas 导出为可独立打开的 HTML 文件"
+          }
+        },
+        "tasks-automation": {
+          "title": "任务板与定时任务",
+          "summary": "集中查看待办事项，并让任务在指定时间或目标主机上持续运行。",
+          "items": {
+            "board-views": "按待处理、日历和已停用视图浏览任务",
+            "create-edit": "创建、编辑、启用、停用和删除定时任务",
+            "schedule-types": "设置一次性、每日、每周或自定义 Cron 时间表",
+            "calendar-occurrences": "在日历中预览任务的下一次与后续运行时间",
+            "agent-workspace": "为任务选择智能体、模型、工作模式和工作区",
+            "local-remote-target": "把任务安排在当前主机或已连接的远程目标上运行",
+            "host-readiness": "查看任务列表并等待桌面 Host 就绪后可靠执行"
+          }
+        },
+        "insights": {
+          "title": "Insights 工作洞察",
+          "summary": "把会话和项目活动汇总成可读的洞察，帮助回顾工作方式、用量和进展。",
+          "items": {
+            "availability": "检查当前账户与会话是否已有可分析的洞察数据",
+            "generate": "按所选日期范围和模型生成工作洞察报告",
+            "cancel": "取消正在运行的洞察生成任务",
+            "latest-report": "查看最新报告或加载指定的历史报告",
+            "usage-statistics": "把工作活动与模型、Token 和缓存用量统计关联起来",
+            "patterns": "回顾项目分布、工作时段、任务类型和协作习惯"
+          }
+        },
+        "ecosystem-compatibility": {
+          "title": "外部导入",
+          "summary": "查看外部 AI 生态的内容与状态，导入受支持的 Skill、MCP、Hook，以及 Codex、Zcode 会话，并在 OpenBitFun 中继续对话。",
+          "items": {
+            "source-discovery": "发现 OpenCode、Claude Code、Codex 等外部 AI 来源与可用内容",
+            "source-policy": "按来源启用或停用集成，并选择管理、预览或只读策略",
+            "codex-session-import": "发现、移除和重新添加 Codex 来源会话，并在 OpenBitFun 分支中续聊",
+            "zcode-session-import": "发现、移除和重新添加 Zcode 来源会话，并在 OpenBitFun 分支中续聊",
+            "prompts-commands": "展开外部 Prompt/Command 内容并处理与原生命令的冲突",
+            "subagents": "启用外部智能体，处理同名冲突并绑定模型",
+            "mcp-import": "预览 MCP 导入计划，逐个处理服务器冲突并应用",
+            "tool-targets": "选择外部工具目标、解决冲突并控制是否启用",
+            "hooks": "查看外部 Hooks 目录、规划导入、修改选择并应用",
+            "security-review": "在迁移前查看冲突、安全影响和来源控制快照",
+            "reveal-source": "在文件管理器或远程环境中定位外部配置来源"
+          }
+        },
+        "remote-workspaces": {
+          "title": "远程工作区",
+          "summary": "通过 SSH 或容器在远程主机上打开项目，让文件、搜索、终端和智能体都在目标环境执行。",
+          "items": {
+            "ssh-profiles": "保存、列出、测试和删除 SSH 连接配置",
+            "ssh-auth": "使用密码、私钥、证书、SSH Config Host 与跳板机连接",
+            "docker": "发现远程 Docker 容器并把容器作为工作环境",
+            "wsl": "选择 Windows 主机上的 WSL 发行版作为工作区",
+            "remote-open": "打开、关闭和移除远程工作区，并读取服务器信息",
+            "remote-files": "浏览、读取、写入、创建、重命名和删除远程文件与目录",
+            "transfer": "上传本地文件、下载远程文件并取消进行中的传输",
+            "remote-execution": "在目标主机执行命令，让终端、搜索和智能体使用远程数据面",
+            "port-forwarding": "发现远程监听端口并启动、查看或停止端口转发",
+            "connection-lifecycle": "查看连接状态并断开单个或全部 SSH 会话"
+          }
+        },
+        "remote-connect": {
+          "title": "Remote Connect 与多设备",
+          "summary": "从手机、Bot 或另一台 OpenBitFun 设备连接当前主机，远程查看会话、回答权限并继续工作。",
+          "items": {
+            "connection-methods": "选择局域网或官方 Relay",
+            "start-stop-status": "启动、停止 Remote Connect 并查看实时连接状态和设备信息",
+            "network": "查看局域网 IP、网络信息与可分享的连接配置",
+            "bots": "配置飞书、Telegram、微信等 Bot 并单独停止 Bot",
+            "account": "使用 GitHub 登录、退出并查看身份状态",
+            "devices": "列出、连接、查看设备型号与系统、设置别名和删除同账户设备",
+            "peer-device": "进入 Peer Device Mode，把另一台 OpenBitFun 设备作为命令与事件数据面"
+          }
+        },
+        "detached-dispatch": {
+          "title": "Detached Dispatch 远程派发",
+          "summary": "把可持续运行的任务派发到另一台 OpenBitFun 主机；控制端可以断开，目标主机继续执行并保留记录。",
+          "items": {
+            "targets": "列出可派发目标并探测版本、连接和运行能力",
+            "provision": "为目标主机配置运行环境并安装或更新 OpenBitFun CLI",
+            "model-sync": "在提交任务前同步目标所需的模型配置",
+            "submit": "把包含工作区、会话、模型和权限策略的持久任务提交到目标",
+            "status-list": "列出派发任务并查询运行状态、结果和错误",
+            "transcript": "保存、追加和重新加载可断线恢复的执行记录",
+            "permission-continuation": "远程回答权限请求，并继续或取消目标端任务",
+            "result-sync": "将目标端结果同步回控制端，而不把控制端当作远程文件系统代理"
+          }
+        },
+        "pages": {
+          "title": "Pages 发布",
+          "summary": "保存页面版本并发布到公开或私有地址，管理标题、可见性、历史版本和分享链接。",
+          "items": {
+            "pages-list": "查看账户下的 Pages 与每个页面的当前发布状态",
+            "immutable-versions": "保存不可变页面版本并浏览版本历史",
+            "publish": "发布或重新部署选中的页面版本",
+            "visibility": "更新标题、公开/私有可见性和访问设置",
+            "share-open": "创建可打开和分享的页面链接",
+            "unpublish": "取消发布页面，同时保留可再次发布的版本",
+            "delete": "删除单个版本或整个 Page"
+          }
+        },
+        "voice-input": {
+          "title": "语音输入与实时通话",
+          "summary": "将录音转成文字，或在客户端持续进行实时语音通话，让助手进入项目执行任务并播报简要进展。",
+          "items": {
+            "composer-recording": "从聊天输入框开始、结束或取消一次录音",
+            "stream-audio": "录音过程中分块传输音频并显示识别进度",
+            "realtime-assistant-call": "在客户端启动或结束实时语音通话，听取回复，并让助手执行或停止项目任务",
+            "realtime-assistant-config": "读取或保存实时语音服务配置",
+            "local-models": "查看本地语音模型及安装、下载、验证、修复和删除状态",
+            "cancel-download": "取消正在进行的语音模型下载",
+            "language-microphone": "选择自动检测或指定识别语言，并选择系统麦克风",
+            "diagnostic-test": "在设置页进行麦克风与语音识别测试并查看耗时和错误",
+            "edit-transcript": "把转写结果放回输入框，在发送前继续编辑"
+          }
+        },
+        "desktop-pet": {
+          "title": "智能体桌面伙伴",
+          "summary": "在桌面上显示智能体伙伴，并选择、导入或管理 Petdex 角色包。",
+          "items": {
+            "enable": "整体启用或停用智能体桌面伙伴",
+            "presets": "查看并切换内置或已导入的 Petdex 角色",
+            "petdex-import": "从本地 Petdex 包导入并使用新的角色与动画",
+            "petdex-delete": "删除已导入的 Petdex 包并回退到可用角色",
+            "desktop-window": "显示、隐藏和调整独立桌面伙伴窗口大小，并可回到主窗口"
+          }
+        },
+        "desktop-cards": {
+          "title": "桌面小卡片",
+          "summary": "让智能体在主窗口之外放置可拖动的小卡片，显示倒计时、清单、PR 状态、天气、股价等需要偶尔看一眼的信息，并在重新打开应用后恢复。",
+          "items": {
+            "agent-cards": "按需求或在任务过程中创建倒计时、清单、便签、进度、指标、定时任务和自定义卡片，可定时从 HTTP 接口或本机命令刷新数据",
+            "home-management": "在首页“小卡片”区查看全部卡片，并显示、隐藏或删除单张卡片",
+            "card-actions": "在卡片上刷新数据、勾选清单项、切换置顶、打开链接或回到来源会话",
+            "drag-restore": "拖动卡片到桌面任意位置，拖动卡片边缘或四角调整大小；关闭 OpenBitFun 时卡片消失，重新打开后按原位置和大小恢复"
+          }
+        }
+      },
+      "setting": {
+        "application": {
+          "general": {
+            "title": "常规设置",
+            "summary": "管理启动、更新、关闭行为、通知与睡眠保持等应用级偏好。",
+            "items": {
+              "automatic-updates": "启用或停用自动检查更新",
+              "manual-update": "手动检查并后台下载更新，确认后安装并重启，或稍后从关于页面安装",
+              "launch-at-login": "控制 OpenBitFun 是否在登录系统后自动启动",
+              "prevent-sleep": "控制 OpenBitFun 运行期间是否阻止电脑自动睡眠",
+              "close-behavior": "选择关闭主窗口时退出、最小化到托盘或每次询问",
+              "notifications": "分别控制任务完成和权限请求通知"
+            }
+          },
+          "appearance": {
+            "title": "外观与语言",
+            "summary": "切换主题与语言，调整字体，并安装或导入外观包。",
+            "items": {
+              "built-in-appearance": "选择跟随系统、浅色、深色、单色、Midnight、中国风、Cyber、Slate 或 Tokyo Night 等内置外观",
+              "language": "切换简体中文、繁体中文、英文等受支持界面语言",
+              "ui-font-size": "调整全局界面字号，并支持自定义像素值",
+              "local-packages": "导入、预览、应用、导出和删除本地外观包",
+              "appearance-market": "浏览、搜索、筛选并安装或更新 Skin 市场外观",
+              "agent-market-submit": "在用户明确要求时由智能体提交本地外观包到 Skin 市场审核",
+              "market-submissions": "查看和撤回自己的外观市场投稿",
+              "market-review": "在具备权限时查看并批准或拒绝外观投稿"
+            }
+          },
+          "pet": {
+            "title": "桌面伙伴设置",
+            "summary": "启用桌面智能体伙伴并管理当前角色，以及开启或关闭桌面小卡片。",
+            "items": {
+              "enabled": "整体启用或停用智能体伙伴",
+              "desktop-cards-enabled": "开启或关闭桌面小卡片；关闭后隐藏所有卡片，智能体也不再看到小卡片工具",
+              "preset-selection": "从内置与已导入角色中选择当前伙伴",
+              "import": "导入本地 Petdex 角色包",
+              "delete-refresh": "刷新角色列表并删除不再需要的导入包"
+            }
+          },
+          "input": {
+            "title": "输入与交互",
+            "summary": "配置对话文本选择操作、语音输入、麦克风、识别语言与本地模型。",
+            "items": {
+              "auto-show-selection-toolbar": "开启或关闭选中对话文本后的自动操作栏",
+              "voice-enabled": "在聊天输入框启用或停用语音输入",
+              "language": "选择自动检测或中文、粤语、英文、日文等识别语言",
+              "microphone-test": "选择麦克风并执行语音识别测试",
+              "local-models": "下载、选择、验证、修复或删除本地语音模型",
+              "recording-limit": "设置单次语音输入的最长录音时间"
+            }
+          },
+          "shortcuts": {
+            "title": "快捷键",
+            "summary": "搜索、查看、自定义与重置应用、场景、编辑器和终端快捷键。",
+            "items": {
+              "shortcut-browser": "搜索和查看全部应用、场景、编辑器与终端快捷键",
+              "shortcut-remap": "录制新快捷键、检测冲突、恢复单项或重置全部自定义键位"
+            }
+          },
+          "development": {
+            "title": "编辑器",
+            "summary": "调整代码编辑器的字体、缩进、换行、格式化与 Minimap。",
+            "items": {
+              "editor-appearance": "设置编辑器字体、字重、字号、行高与光标样式",
+              "indent-wrap": "设置 Tab 宽度、空格缩进、自动换行、行号与平滑滚动",
+              "editor-display": "控制 Minimap、空白字符、当前行高亮和滚动边界",
+              "editor-advanced": "控制自动保存、语义高亮、括号配色、格式化和空白清理"
+            }
+          },
+          "terminal": {
+            "title": "终端",
+            "summary": "选择默认终端 Shell，并设置新终端面板在会话中的打开位置。",
+            "items": {
+              "default-shell": "自动检测或指定默认终端 Shell",
+              "terminal-position": "把终端面板放在右侧或底部"
+            }
+          }
+        },
+        "ai": {
+          "models": {
+            "title": "模型与供应商",
+            "summary": "添加 AI 供应商和模型，选择默认模型，配置网络代理、订阅与流式超时。",
+            "items": {
+              "providers": "添加、编辑和删除内置或自定义 AI 供应商",
+              "credentials-endpoint": "配置 API Key、Base URL、请求格式和模型列表",
+              "subscription-auth": "登录、刷新和退出 Codex、Antigravity、OpenCode Console（Zen）、Grok、Hermes 等账户",
+              "default-models": "选择主模型、快速模型以及图像理解、图像生成和语音识别模型",
+              "reasoning": "为模型选择推理预设或自定义推理强度",
+              "proxy": "配置 AI 请求使用的网络代理与绕过规则",
+              "stream-timeouts": "设置或取消首 Token 等待和流式空闲超时",
+              "available-models": "让智能体查看当前配置下可用的模型",
+              "model-catalog": "查看 models.dev 目录状态、手动刷新并定位本地缓存",
+              "advanced-request": "为供应商添加自定义 Header、请求体字段与 SSL 行为",
+              "connection-test": "保存前测试供应商或模型连接并刷新运行时客户端",
+              "model-pools": "管理模型池、路由策略与会话模型选择"
+            }
+          },
+          "memory": {
+            "title": "记忆设置",
+            "summary": "控制 OpenBitFun 是否从会话中提取和使用长期记忆，以及保留、整理和模型策略。",
+            "items": {
+              "generation-recall": "一键同时启用或停用长期记忆生成与会话召回",
+              "btw": "决定 BTW 轻量会话是否参与记忆生成",
+              "external-context": "存在外部工具上下文时选择清除工具结果、允许或跳过会话",
+              "rollout-policy": "设置空闲时长、最大年龄、启动处理上限和扫描上限",
+              "extraction": "设置记忆提取并发数和单次原始候选上限",
+              "extraction-model": "从当前可用模型中选择记忆提取模型或跟随主模型",
+              "retention": "设置未使用记忆的最长保留天数",
+              "consolidation": "选择记忆整理模型并让它跟随主模型或提取模型",
+              "maintenance": "打开记忆目录、恢复默认设置或显式清空全部记忆"
+            }
+          }
+        },
+        "workspace": {
+          "session": {
+            "title": "会话与工作区设置",
+            "summary": "控制默认智能体执行框架、会话标题生成、工作区加速搜索和与项目上下文相关的行为。",
+            "items": {
+              "default-agent-harness": "让普通新会话跟随 ChatInput 上次选择，或固定使用指定执行框架",
+              "automatic-titles": "启用或停用根据会话内容自动生成标题",
+              "title-model": "让标题模型继承主模型、快速模型或使用指定模型",
+              "next-input-suggestion": "启用或停用 Agent 答复后在输入框中显示的一句话候选输入",
+              "accelerated-search": "为本地工作区启用 Flashgrep 加速搜索",
+              "search-index": "查看索引状态并在需要时重建工作区索引",
+              "remote-behavior": "远程工作区明确降级搜索实现，不把远程路径回退到本机"
+            }
+          },
+          "worktrees": {
+            "title": "Worktree 设置",
+            "summary": "配置 Git Worktree 的根目录、分支前缀和自动清理规则，并查看现有隔离工作区。",
+            "items": {
+              "isolation": "了解隔离 Worktree，并配置其创建与清理默认值",
+              "root-path": "设置受管 Worktree 的统一根目录",
+              "branch-prefix": "设置自动创建分支使用的名称前缀",
+              "copy-changes": "创建隔离工作区时选择是否复制当前未提交改动",
+              "auto-cleanup": "启用自动清理并设置最多保留的受管 Worktree 数量",
+              "management": "查看 Worktree 生命周期、脏状态、未发布提交与关联会话",
+              "open-restore-delete": "打开或恢复关联会话，并在保护检查后删除或强制删除 Worktree"
+            }
+          }
+        },
+        "tools": {
+          "execution": {
+            "title": "执行与权限控制",
+            "summary": "管理智能体工具权限、并行度、超时、延迟加载、Computer Use 与浏览器控制。",
+            "items": {
+              "permission-mode": "选择询问、自动批准或完全访问权限模式，并确认高风险警告",
+              "permission-selector": "控制权限模式选择器是否显示在聊天输入框下方",
+              "global-project-rules": "创建、排序和保存全局或项目级 Allow、Ask、Deny 规则",
+              "remembered-grants": "查看、撤销或清空项目中记住的权限授权与审计记录",
+              "deferred-tools": "按需延迟加载工具定义以减少智能体初始上下文",
+              "parallelism": "设置子智能体与 Swarm 最大并发及安全、强制并行或串行策略",
+              "timeouts": "设置或取消单次工具调用超时",
+              "review-capacity": "设置 Deep Review 最大并行评审者和队列等待时间",
+              "computer-use": "启用或停用已获系统授权的 Computer Use",
+              "computer-use-permissions": "查看并请求辅助功能与屏幕录制权限",
+              "browser-auto-connect": "控制 OpenBitFun 启动时是否自动连接浏览器",
+              "browser-setup": "发现并选择浏览器、配置默认 CDP 或按需重启",
+              "json-repair": "控制是否在安全边界内修复模型生成的非法工具参数 JSON"
+            }
+          },
+          "desktop-control": {
+            "title": "桌面控制",
+            "summary": "管理 Computer Use 开关，并检查辅助功能与屏幕录制授权。",
+            "items": {
+              "permissions": "查看 Computer Use、辅助功能与屏幕录制状态并完成系统授权"
+            }
+          },
+          "browser-control": {
+            "title": "浏览器控制",
+            "summary": "选择浏览器，检查连接状态，并配置 CDP 与启动连接行为。",
+            "items": {
+              "connection": "选择浏览器并查看、建立或断开 CDP 连接"
+            }
+          },
+          "automation": {
+            "title": "快捷操作与 Hooks",
+            "summary": "自定义编码后的快捷操作，并配置在智能体生命周期事件上运行的 Hooks。",
+            "items": {
+              "built-in-actions": "启用和调整内置的提交与创建 Pull Request 快捷操作",
+              "custom-actions": "添加、编辑和删除自定义编码后快捷操作及 Prompt",
+              "hooks-enabled": "整体启用或停用智能体生命周期 Hooks",
+              "project-hooks": "对可信仓库单独启用项目级 .openbitfun/config/hooks.json",
+              "hook-files": "定位用户级和项目级 Hooks 配置文件并在修改后即时生效",
+              "hook-events": "在会话、智能体、工具、权限和用户输入等 Codex Hook 事件上运行处理器",
+              "external-hooks": "查看外部 AI 应用的只读 Hook 目录并选择导入项",
+              "hook-import": "预览、修改和应用 Hook 导入计划，并保留冲突诊断"
+            }
+          },
+          "web-search": {
+            "title": "网页搜索",
+            "summary": "选择 WebSearch 工具运行时使用的搜索服务，并配置自建 HTTP 端点与当前执行主机的设备凭据。",
+            "items": {
+              "provider": "在免费 Exa MCP、Exa Search API、Tavily、DeepSeek 与 OpenBitFun Search HTTP Protocol 之间选择运行时服务",
+              "http-endpoint": "为 OpenBitFun Search HTTP Protocol 配置端点、认证方式和受限凭据 Header",
+              "device-credential": "查看当前执行主机的凭据状态，并保存、替换或清除 API Key/Secret",
+              "http-protocol": "查看并复制 OpenBitFun Search HTTP Protocol v1 的请求、响应和传输限制"
+            }
+          },
+          "mcp": {
+            "title": "MCP 服务器",
+            "summary": "添加和管理 Model Context Protocol 服务器，查看工具、资源、提示词与远程授权状态。",
+            "items": {
+              "json-config": "用表单或 JSON 查看和保存全部 MCP 服务器配置",
+              "server-types": "添加本地进程、远程 HTTP/SSE 或容器 MCP 服务器",
+              "lifecycle": "启动、停止、重启和删除单个 MCP 服务器",
+              "status": "查看初始化、连接、健康、重连、鉴权和失败状态",
+              "remote-auth": "配置远程 Header/环境变量认证或清除已有凭据",
+              "oauth": "发起、轮询、取消或重新连接远程 MCP OAuth",
+              "tools-prompts": "列出 MCP Prompt 并读取带参数的指定 Prompt",
+              "mcp-tool-ui": "查看 MCP 工具清单并打开工具提供的 App/UI",
+              "resources": "列出并读取 MCP Resources",
+              "mcp-apps": "打开 MCP App/UI、双向发送消息并回答交互请求"
+            }
+          },
+          "acp": {
+            "title": "ACP 外部智能体",
+            "summary": "配置通过 Agent Client Protocol 接入的外部智能体，并检查适配器、命令与会话选项。",
+            "items": {
+              "presets": "使用 OpenCode、dsh、OMP、Claude Code 和 Codex 等预设",
+              "json-config": "通过 JSON 查看、添加和保存 ACP 智能体配置",
+              "probe": "探测 CLI、适配器、路径、版本、连接与权限要求",
+              "install": "安装外部智能体 CLI 并预下载 ACP 客户端适配器",
+              "remote-detection": "在 SSH 远程工作区探测可用外部智能体并显示不支持原因",
+              "session-model-options": "为 ACP 会话选择模型并修改客户端声明的配置选项",
+              "session-commands": "查看并执行外部智能体暴露的会话命令",
+              "dialog-permissions": "开始或取消 ACP 对话，并远程回答外部智能体权限请求"
+            }
+          }
+        },
+        "data": {
+          "usage": {
+            "title": "Token 用量",
+            "summary": "查看请求、输入输出 Token、缓存命中和估算成本等使用统计。",
+            "items": {
+              "time-range": "按最近 24 小时、今天、本周、本月或全部时间查看用量",
+              "granularity": "按小时或天切换趋势粒度",
+              "filter": "按供应商、模型或搜索关键词筛选用量",
+              "summary": "查看请求数、总 Token、缓存 Token 与缓存命中率",
+              "distribution": "按模型、供应商组和请求端点比较分布",
+              "trend": "分别查看输入、输出、缓存创建、缓存读取和命中率趋势"
+            }
+          },
+          "archived": {
+            "title": "已归档会话",
+            "summary": "查找、恢复或永久删除已归档的会话，管理长期会话历史。",
+            "items": {
+              "browse": "按工作区浏览分页归档会话及其元数据",
+              "search": "按标题、内容和工作区搜索已归档会话",
+              "restore": "恢复会话、轮次和原工作区视图并取消归档",
+              "delete-selected": "明确确认后永久删除选中的归档会话",
+              "delete-all": "明确确认后永久删除全部归档会话"
+            }
+          },
+          "diagnostics": {
+            "title": "日志与诊断",
+            "summary": "调整日志级别，查看运行日志路径，并导出用于排查问题的诊断包。",
+            "items": {
+              "log-level": "设置 Trace、Debug、Info、Warn、Error 或关闭后端日志",
+              "sensitive-diagnostics": "选择诊断中是否允许包含敏感上下文，并在导出前明确提示",
+              "log-path": "查看日志路径并打开日志文件夹",
+              "export-bundle": "导出包含系统、配置健康和日志信息的诊断包",
+              "crash-recovery": "查看上次崩溃、非正常退出、启动恢复和配置恢复信息",
+              "devtools": "在开发构建中检查 DevTools 是否可用并打开或关闭",
+              "element-inspector": "在开发构建中启用主窗口元素检查并回传选中的元素"
+            }
+          }
+        }
+      }
+    }
+  }
 }
diff --git a/src/web-ui/src/locales/zh-CN/scenes/skills.json b/src/web-ui/src/locales/zh-CN/scenes/skills.json
index ac8e0d11fd..4bc2e44c32 100644
--- a/src/web-ui/src/locales/zh-CN/scenes/skills.json
+++ b/src/web-ui/src/locales/zh-CN/scenes/skills.json
@@ -231,7 +231,11 @@
     "scanIncomplete": "部分技能扫描失败，已成功读取的技能仍可使用。",
     "unsupportedSkills": "部分技能依赖暂不支持的能力，未加载。",
     "unsupportedField": "当前主机暂不支持技能内的 {{field}} 声明，该技能未加载。",
-    "diagnosticsUnavailable": "当前主机不提供技能扫描诊断。"
+    "diagnosticsUnavailable": "当前主机不提供技能扫描诊断。",
+    "diagnostics": {
+      "title": "扫描详情（{{count}} 项）",
+      "description": "已成功加载的技能可以继续使用。修复以下文件后，重新扫描即可更新结果。"
+    }
   },
   "deleteModal": {
     "title": "确认删除",
diff --git a/src/web-ui/src/locales/zh-CN/settings.json b/src/web-ui/src/locales/zh-CN/settings.json
index 9b78253a13..86d14dc3e5 100644
--- a/src/web-ui/src/locales/zh-CN/settings.json
+++ b/src/web-ui/src/locales/zh-CN/settings.json
@@ -281,7 +281,7 @@
         "toggleBoth": "折叠所有面板"
       },
       "nav": {
-        "toggleSearch": "打开导航搜索"
+        "toggleSearch": "打开全局搜索"
       },
       "scene": {
         "focusMerged": "切换场景",
@@ -292,7 +292,7 @@
         "openTerminal": "打开终端"
       },
       "canvas": {
-        "missionControl": "Mission Control",
+        "missionControl": "全景模式",
         "splitHorizontal": "水平分屏",
         "splitVertical": "垂直分屏",
         "anchorZone": "切换锚点区",
@@ -312,7 +312,8 @@
         "stopGeneration": "停止生成",
         "activateInput": "激活输入框",
         "newSession": "新建会话",
-        "insertNewline": "在输入框中插入换行"
+        "insertNewline": "在输入框中插入换行",
+        "search": "搜索当前会话"
       },
       "filetree": {
         "rename": "重命名",
@@ -340,6 +341,12 @@
       "canvas": "编辑器画布及其中的代码编辑器获得焦点时生效",
       "filetree": "文件树获得焦点时生效",
       "git": "Git 面板获得焦点时生效"
+    },
+    "reserved": {
+      "appSwitch": "此组合键用于系统应用切换，请选择其他键位。",
+      "systemSearch": "此组合键用于系统搜索，请选择其他键位。",
+      "secureAttention": "此组合键用于 Windows 安全界面，请选择其他键位。",
+      "systemKey": "此组合键使用 Windows 系统键，请选择其他键位。"
     }
   },
   "advanced": {
diff --git a/src/web-ui/src/locales/zh-CN/settings/appearance.json b/src/web-ui/src/locales/zh-CN/settings/appearance.json
index 0307053ee3..c290a8f8f1 100644
--- a/src/web-ui/src/locales/zh-CN/settings/appearance.json
+++ b/src/web-ui/src/locales/zh-CN/settings/appearance.json
@@ -1,6 +1,6 @@
 {
   "title": "外观",
-  "subtitle": "调整界面语言、主题与字体大小",
+  "subtitle": "调整主题与字体大小",
   "sessionPanel": {
     "title": "会话侧边面板",
     "displayMode": "面板布局",
diff --git a/src/web-ui/src/locales/zh-TW/common.json b/src/web-ui/src/locales/zh-TW/common.json
index 8faa1df36c..4ccf6e773b 100644
--- a/src/web-ui/src/locales/zh-TW/common.json
+++ b/src/web-ui/src/locales/zh-TW/common.json
@@ -192,7 +192,9 @@
         "activationFailed": "無法開啟該結果",
         "remoteFileSearchUnavailable": "遠端項目 {{workspace}} 暫不支援檔案搜尋",
         "sessionUnavailable": "該會話已不可用"
-      }
+      },
+      "diagnosticTarget": "搜尋裝置：{{host}}",
+      "retrySource": "重試此來源"
     },
     "displayModes": {
       "pro": "專業模式",
@@ -523,7 +525,7 @@
         "workspacePath": "請輸入工作區路徑",
         "session": "請選擇或輸入會話 ID",
         "optionalSession": "留空則建立新會話後執行",
-        "agentType": "例如：Standard、Cowork 或 Claw",
+        "agentType": "例如：$t(shared:agents.Standard)、$t(shared:agents.Cowork) 或 $t(shared:agents.Claw)",
         "name": "例如：每日全球新聞簡報",
         "anchorMs": "留空則使用建立時刻",
         "timezone": "例如：Asia/Shanghai",
@@ -798,7 +800,8 @@
     "hostDiscoveryFailed": "無法載入主機，請重試。",
     "existingHostRequired": "請選擇現有的 SSH 主機。",
     "sshHost": "SSH 主機",
-    "sourceUnsupported": "目前主機不支援此環境。"
+    "sourceUnsupported": "目前主機不支援此環境。",
+    "checkingWsl": "正在檢查目前主機的 WSL 支援…"
   },
   "newProject": {
     "title": "建立專案",
diff --git a/src/web-ui/src/locales/zh-TW/components.json b/src/web-ui/src/locales/zh-TW/components.json
index 847252a72e..c7b462cf0c 100644
--- a/src/web-ui/src/locales/zh-TW/components.json
+++ b/src/web-ui/src/locales/zh-TW/components.json
@@ -584,7 +584,17 @@
     "dropRight": "右",
     "dropTop": "上",
     "dropBottom": "下",
-    "dropCenter": "放置"
+    "dropCenter": "放置",
+    "empty": {
+      "title": "在工作階段旁開啟工作內容",
+      "description": "檔案、終端機和預覽都會顯示在這裡。",
+      "currentHost": "目前主機",
+      "workspaceUnavailable": "此工作區已中斷連線。重新連線後可瀏覽檔案或新增終端機。",
+      "selectWorkspace": "選擇工作區後可瀏覽檔案或新增終端機。",
+      "browseFiles": "瀏覽檔案",
+      "newTerminal": "新增終端機",
+      "reopen": "重新開啟 {{title}}"
+    }
   },
   "flexiblePanel": {
     "empty": {
diff --git a/src/web-ui/src/locales/zh-TW/flow-chat.json b/src/web-ui/src/locales/zh-TW/flow-chat.json
index aa086bccb5..2c6a51c499 100644
--- a/src/web-ui/src/locales/zh-TW/flow-chat.json
+++ b/src/web-ui/src/locales/zh-TW/flow-chat.json
@@ -314,7 +314,9 @@
       "filesDescription": "目前工作階段沒有找到檔案編輯記錄。",
       "errorsDescription": "本次報告沒有記錄到可顯示的工具或模型錯誤範例。",
       "slowest": "無慢耗時記錄",
-      "slowestDescription": "沒有記錄到帶耗時的回合、模型呼叫或工具片段。"
+      "slowestDescription": "沒有記錄到帶耗時的回合、模型呼叫或工具片段。",
+      "session": "還沒有工作階段活動",
+      "sessionDescription": "在此工作階段中傳送一則訊息即可開始。執行後，這裡會顯示模型用量、工具呼叫和耗時。"
     },
     "runtime": {
       "open": "產生工作階段用量",
@@ -435,18 +437,18 @@
     }
   },
   "threadGoal": {
-    "replaceConfirmTitle": "替換執行緒目標？",
+    "replaceConfirmTitle": "替換工作階段目標？",
     "replaceConfirmMessage": "是否替換當前目標？\n\n當前：{{existing}}\n\n新目標：{{next}}",
-    "clearConfirmTitle": "清除執行緒目標？",
+    "clearConfirmTitle": "清除工作階段目標？",
     "clearConfirmMessage": "是否清除當前目標？\n\n目標：{{objective}}",
-    "menuTitle": "執行緒目標",
+    "menuTitle": "工作階段目標",
     "objectiveLabel": "目標描述",
-    "updatedUserMessage": "執行緒目標已更新：{{objective}}",
-    "kickoffUserMessage": "繼續推進執行緒目標：{{objective}}",
+    "updatedUserMessage": "工作階段目標已更新：{{objective}}",
+    "kickoffUserMessage": "繼續推進工作階段目標：{{objective}}",
     "continuationCheckHeader": "目標完成檢查",
     "continuationCheckHeaderWithAttempt": "目標完成檢查（自動續跑 {{attempt}}/{{max}}）",
     "continuationCheckUserMessage": "目標完成檢查：{{objective}}",
-    "menuEmpty": "尚未設定執行緒目標。填寫目標描述後，代理會在閒置時持續朝該方向推進。",
+    "menuEmpty": "尚未設定工作階段目標。填寫目標描述後，代理會在閒置時持續朝該方向推進。",
     "workflow": {
       "title": "完成檢查",
       "steps": {
@@ -463,8 +465,8 @@
         "budgetLimited": "已達 token 預算上限，可編輯目標或清除後重新設定。"
       }
     },
-    "editTitleCreate": "設定執行緒目標",
-    "editTitleUpdate": "編輯執行緒目標",
+    "editTitleCreate": "設定工作階段目標",
+    "editTitleUpdate": "編輯工作階段目標",
     "editHint": "輸入目標描述並儲存；工作階段閒置時會繼續朝該目標推進。",
     "editPlaceholder": "目標描述…",
     "editCancel": "返回",
@@ -474,10 +476,10 @@
     "resumeHint": "標記為進行中後，工作階段閒置時會繼續執行。也可保持暫停，稍後用 /goal resume。",
     "resumeConfirm": "恢復目標",
     "resumeLeavePaused": "保持暫停",
-    "stripTooltipEmpty": "設定或檢視執行緒目標",
+    "stripTooltipEmpty": "設定或檢視工作階段目標",
     "stripTooltipWithGoal": "{{status}}：{{objective}}",
-    "stripOpenEmpty": "開啟執行緒目標",
-    "stripOpenWithGoal": "開啟執行緒目標選單",
+    "stripOpenEmpty": "開啟工作階段目標",
+    "stripOpenWithGoal": "開啟工作階段目標選單",
     "stripPauseGoal": "暫停目標",
     "stripResumeGoal": "恢復目標",
     "stripClearGoal": "清除目標",
@@ -972,7 +974,7 @@
       "openDefaultSettings": "開啟權限設定"
     },
     "boostSectionContext": "上下文",
-    "boostThreadGoal": "設定執行緒目標",
+    "boostThreadGoal": "設定工作階段目標",
     "boostStartBtw": "發起側問",
     "boostNewSession": "新建會話",
     "boostAddContext": "引用檔案或資料夾",
@@ -1008,12 +1010,12 @@
     "goalVerifyFailed": "目標驗證失敗，請檢查模型設定後重試。",
     "goalNoSession": "目前沒有可用於 /goal 的會話",
     "goalUsage": "使用 /goal 並可選擇附加目標描述，例如 /goal 修復登入問題。",
-    "goalFailed": "執行緒目標操作失敗",
-    "goalActivated": "執行緒目標已設定",
-    "goalCleared": "執行緒目標已清除",
-    "goalPaused": "執行緒目標已暫停",
-    "goalResumed": "執行緒目標已恢復",
-    "goalEdited": "執行緒目標已更新",
+    "goalFailed": "工作階段目標操作失敗",
+    "goalActivated": "工作階段目標已設定",
+    "goalCleared": "工作階段目標已清除",
+    "goalPaused": "工作階段目標已暫停",
+    "goalResumed": "工作階段目標已恢復",
+    "goalEdited": "工作階段目標已更新",
     "goalNestedDisabled": "目標模式只能從主會話啟動。",
     "initAction": "生成 AGENTS.md",
     "initNoSession": "目前沒有可用於 /init 的會話",
@@ -1120,7 +1122,7 @@
       "label": "MCP",
       "server": "MCP 服務",
       "empty": "目前模式沒有可用的已連線 MCP 工具。請在 MCP 設定中啟用並啟動服務。",
-      "modeRestricted": "目前模式不提供已連線的 MCP 工具。請切換至 Standard、Ultimate 或 Creative 使用。",
+      "modeRestricted": "目前模式不提供已連線的 MCP 工具。請切換至 $t(shared:agents.Standard)、$t(shared:agents.Ultimate) 或 $t(shared:agents.Creative) 使用。",
       "loadFailed": "MCP 工具載入失敗，請重新整理後重試。",
       "refresh": "重新整理 MCP 工具",
       "remoteWorkspace": "遠端工作區暫不支援選擇 MCP。",
diff --git a/src/web-ui/src/locales/zh-TW/panels/git.json b/src/web-ui/src/locales/zh-TW/panels/git.json
index abf6956862..6ff71bfe7e 100644
--- a/src/web-ui/src/locales/zh-TW/panels/git.json
+++ b/src/web-ui/src/locales/zh-TW/panels/git.json
@@ -454,5 +454,17 @@
     "unavailable": "無法在此處為 \"{{path}}\" 授予 Git 所有權信任，請在持有該儲存庫的機器上授予。",
     "unavailableWithCommand": "無法在此處為 \"{{path}}\" 授予 Git 所有權信任。請在持有該儲存庫的機器上執行：\n\n{{command}}",
     "required": "在你信任其所有權之前，Git 不會讀取 \"{{path}}\"。"
+  },
+  "workingCopy": {
+    "openWorkspace": "開啟工作區後即可查看變更。",
+    "currentHost": "目前主機",
+    "clean": "工作區乾淨",
+    "cleanDescription": "此儲存庫沒有尚未提交的變更。",
+    "upstreamComparison": "相對上游：領先 {{ahead}} 個提交 · 落後 {{behind}} 個提交",
+    "unpushed": "本機仍有尚未推送的提交。準備好後，可使用上方的推送按鈕。",
+    "remoteSnapshot": "可在分支頁面查看追蹤關係與遠端同步狀態。",
+    "statusUnavailable": "無法取得 Git 狀態",
+    "selectFile": "選擇檔案以查看變更",
+    "conflicts": "{{count}} 個檔案存在未解決的衝突。"
   }
 }
diff --git a/src/web-ui/src/locales/zh-TW/scenes/agents.json b/src/web-ui/src/locales/zh-TW/scenes/agents.json
index 79ec9b07f0..9607b5bed0 100644
--- a/src/web-ui/src/locales/zh-TW/scenes/agents.json
+++ b/src/web-ui/src/locales/zh-TW/scenes/agents.json
@@ -317,11 +317,11 @@
       "idPlaceholder": "用於模型識別、設定和路由，建立後不可修改",
       "idRequired": "ID 不能為空",
       "idFormat": "只能以字母開頭，包含字母/數字/下劃線/連字符",
-      "name": "名稱（選填）",
+      "name": "名稱",
       "namePlaceholder": "僅用於顯示，留空時使用智能體 ID",
       "level": "級別",
       "modeUserOnly": "目前版本中，直接承接任務的自訂智能體僅支援使用者層級。",
-      "description": "描述",
+      "description": "任務目標",
       "descPlaceholder": "簡要描述該智能體的用途",
       "descRequired": "描述不能為空",
       "prompt": "系統提示詞",
@@ -350,7 +350,17 @@
       "createSuccess": "已建立智能體「{{name}}」",
       "createFailed": "建立失敗：",
       "review": "審查",
-      "reviewToolsHint": "補充檢查僅使用唯讀工具。"
+      "reviewToolsHint": "補充檢查僅使用唯讀工具。",
+      "nameRequired": "請給智慧體取個名字。",
+      "identityDetails": "識別碼（已自動產生）",
+      "idHelp": "用於檔案和引用。建立前可以修改，既有智慧體的識別碼保持固定。",
+      "promptGuide": "寫清楚工作方法、限制和交付要求。也可以先按任務目標產生一份提示詞架構，再補充細節。",
+      "usePromptTemplate": "按任務目標產生架構",
+      "promptTemplate": "## 目標\n{{goal}}\n\n## 工作方法\n先閱讀已有上下文，識別缺少的資訊，再逐步完成任務。缺少會影響結果的關鍵決策時，先詢問。\n\n## 限制\n遵守專案說明和已授予的權限。明確區分證據與假設。\n\n## 交付要求\n給出結果、支持結論的證據，以及尚未解決的問題。",
+      "permissionsReadonly": "唯讀存取 · 調整權限",
+      "permissionsStandard": "標準權限 · 調整存取範圍",
+      "customizeTools": "調整已選工具",
+      "createNamePlaceholder": "例如：資料研究助手"
     }
   },
   "reviewTeams": {
diff --git a/src/web-ui/src/locales/zh-TW/scenes/capabilities.json b/src/web-ui/src/locales/zh-TW/scenes/capabilities.json
index a1e7b015ee..45e6ac554f 100644
--- a/src/web-ui/src/locales/zh-TW/scenes/capabilities.json
+++ b/src/web-ui/src/locales/zh-TW/scenes/capabilities.json
@@ -18,5 +18,631 @@
   "serverType": "類型",
   "clickToCopy": "點擊複製路徑",
   "pathCopied": "路徑已複製",
-  "pathCopyFailed": "複製路徑失敗"
+  "pathCopyFailed": "複製路徑失敗",
+  "search": {
+    "categories": {
+      "assistant": "AI 與協作",
+      "workspace": "項目與開發",
+      "automation": "擴展與自動化",
+      "connect": "連接與發佈",
+      "application": "應用設定",
+      "data": "數據與診斷"
+    },
+    "kinds": {
+      "feature": "功能",
+      "setting": "$t(shared:features.settings)"
+    },
+    "capabilities": {
+      "feature": {
+        "ai-assistant": {
+          "title": "AI 助手與工作階段",
+          "summary": "在項目上下文中與 AI 協作，創建工作階段、繼續任務、處理權限請求，並保留完整的工作記錄。",
+          "items": {
+            "create-session": "打開並新建一個 AI 工作階段",
+            "session-lifecycle": "重命名、歸檔、恢復、刪除、複製、分叉與導出工作階段",
+            "model-mode-permissions": "為工作階段選擇模型、工作模式、記憶模式與權限模式",
+            "creative-frontend-authoring": "讓創造模式擴展客戶端界面與運行時能力",
+            "turn-control": "開始、引導、打斷、取消或恢復一次智能體運行",
+            "permission-mailbox": "查看並逐個或批量回答等待中的權限請求",
+            "history-search": "分頁加載、搜索和回填歷史消息與工作階段內容",
+            "session-storage-directory": "從工作區或工作階段菜單打開工作階段存儲目錄，用於備份與手動排障",
+            "agent-session-coordination": "讓智能體創建、列出、取消、刪除工作階段或向另一工作階段發送消息",
+            "mcp-mentions": "在對話中通過 @ 選擇當前模式可用的 MCP 服務",
+            "tool-activity": "查看工具調用與後台命令，讀取輸出並繼續輸入或停止",
+            "goals": "查看、創建並完成或阻塞當前工作階段目標",
+            "goal-maintenance": "編輯目標說明或清除當前工作階段目標",
+            "working-plan": "讓智能體維護任務清單、生成實施計劃並按需向用戶提問",
+            "usage": "查看單個工作階段的請求、Token 與成本用量報告",
+            "context-memory": "重新加載工作階段上下文、運行 AGENTS.md 初始化並管理長期記憶",
+            "btw-editor-ai": "使用 BTW 輕量問答與編輯器內聯 AI，並可隨時取消"
+          }
+        },
+        "agents": {
+          "title": "智能體管理",
+          "summary": "管理內置、自定義和子智能體，讓不同角色分工處理研究、編碼、評審等任務。",
+          "items": {
+            "browse-agents": "查看內置、用戶、項目與當前環境可見的智能體",
+            "custom-agent-create": "創建自定義智能體並設定名稱、說明和角色",
+            "custom-agent-manage": "讀取、編輯、重新加載或刪除自定義智能體",
+            "subagent-manage": "創建、配置、查看和刪除可委派的子智能體",
+            "capability-summary": "查看每個智能體的工具、Skills、只讀狀態和能力摘要",
+            "tools-skills": "按智能體選擇工具組、單個工具、Skill 組與 Skills",
+            "delegation": "讓主智能體委派並行研究、編碼和評審任務並協調生命週期"
+          }
+        },
+        "personal-assistants": {
+          "title": "個人助理",
+          "summary": "在助理空間中創建和管理自己的長期 AI 助理，定義身份與人設，並從同一處開始工作階段或安排定時任務。",
+          "items": {
+            "assistant-gallery": "瀏覽已有助理、創建新助理並查看每個助理的身份與能力概覽",
+            "assistant-open-close": "關閉側欄中的助理並取消正在運行的工作階段，保留配置和歷史，之後從助理空間重新打開",
+            "primary-delete-reset": "設為主助理、刪除非主助理，或將助理工作區重置為預設狀態",
+            "identity-avatar": "編輯助理名稱、角色類型和氣質，並選擇官方頭像、Emoji 或自定義頭像字符",
+            "persona-documents": "讀取和編輯 IDENTITY.md、SOUL.md 與 USER.md，並自動保存 Markdown 正文和 Frontmatter",
+            "assistant-sessions": "在助理詳情中選擇模型、輸入消息並查看該助理的歷史工作階段",
+            "assistant-schedules": "查看和管理僅屬於當前助理工作區的定時工作階段與自動任務"
+          }
+        },
+        "projects": {
+          "title": "項目與工作區",
+          "summary": "打開本地目錄或創建項目，讓檔案、工作階段、終端和智能體圍繞同一工作區協作。",
+          "items": {
+            "open-create": "打開現有項目或進入新建項目流程",
+            "close-switch-reorder": "關閉、切換並重新排序多個已打開工作區",
+            "recent-workspaces": "查看、清理和重新打開最近使用的項目",
+            "workspace-metadata": "掃描並維護工作區名稱、資訊、關聯目錄和 Persona 檔案",
+            "file-watch": "監聽項目檔案變化、檢查監聽狀態並在失敗後恢復",
+            "workspace-search": "按檔案名、路徑或檔案內容搜索本地工作區",
+            "remote-open": "從項目流程打開 SSH 或其他遠程工作區",
+            "project-health": "查看當前工作區、應用狀態、健康狀態與統計資訊"
+          }
+        },
+        "files-editor": {
+          "title": "檔案與代碼編輯",
+          "summary": "瀏覽、搜索和編輯項目檔案，查看差異、按語言可用的編輯操作與智能體產生的改動。",
+          "items": {
+            "file-tree": "瀏覽、創建、讀取、編輯、重命名和刪除檔案與目錄",
+            "reveal-in-system": "在系統檔案管理器中顯示檔案或目錄",
+            "indexed-search": "按檔案名模式和全文內容搜索當前工作區",
+            "search-index-management": "建立或重建界面搜索索引",
+            "edit-save": "讀取、編輯、保存檔案並同步編輯器狀態",
+            "diffs": "查看修改檔案、工作階段、輪次和單次操作的差異與統計",
+            "accept-reject": "按檔案、操作或整個工作階段接受或拒絕智能體改動",
+            "snapshots-rollback": "查看檔案變更歷史和快照，並回滾整個工作階段或指定輪次",
+            "language-actions": "僅在當前語言提供器實際支持時顯示格式化、定義與類型跳轉、引用、重命名、快速修復和符號導航",
+            "attachments": "在 Desktop 本地工作階段中粘貼或拖入本機檔案、資料夾與圖片",
+            "image-analysis": "查看並分析工作區或工作階段中的圖片"
+          }
+        },
+        "terminal": {
+          "title": "終端",
+          "summary": "在當前項目中運行 Shell、查看輸出、保留命令歷史，並讓智能體與同一終端環境協作。",
+          "items": {
+            "create-terminal": "打開終端面板並新建一個終端工作階段",
+            "terminal-session-management": "列出、切換和關閉多個終端工作階段",
+            "shells": "檢測可用 Shell，並為終端選擇預設或指定 Shell",
+            "working-directory": "在當前項目目錄或指定起始目錄創建終端",
+            "command-control": "執行命令、寫入輸入並行送中斷或其他信號",
+            "resize": "隨終端面板大小變化同步行列尺寸",
+            "history-integration": "查看命令歷史並檢測 Shell Integration 支持",
+            "shutdown": "確認輸出接收並安全關閉單個或全部終端"
+          }
+        },
+        "git": {
+          "title": "Git 版本控制",
+          "summary": "查看改動、分支和提交，完成暫存、提交、合併、Cherry-pick 與 Worktree 工作流。",
+          "items": {
+            "status-diff": "查看倉庫狀態、修改檔案和逐檔案 Diff",
+            "stage-reset": "暫存檔案、取消暫存並重置到指定提交",
+            "commit": "預覽或生成提交資訊並創建提交",
+            "sync": "從遠端 Pull 並向遠端 Push",
+            "branches": "查看、創建、切換和刪除本地分支",
+            "graph-history": "瀏覽提交圖譜與倉庫歷史並保存最近訪問記錄",
+            "revision-content": "解析 Revision 並查看任意提交中的檔案內容",
+            "cherry-pick": "執行、繼續或中止 Cherry-pick",
+            "trust-worktrees": "管理倉庫信任與 Worktree 的創建、綁定、提升、重建和刪除"
+          }
+        },
+        "code-review": {
+          "title": "代碼評審與 Pull Request",
+          "summary": "閱讀改動與 PR 上下文，查看 CI 記錄，生成提交資訊，並組織深度代碼評審。",
+          "items": {
+            "workspace-context": "讀取倉庫、分支、工作區快照和評審目標",
+            "pull-request": "查看 Pull Request 詳情、分頁內容與關聯改動",
+            "ci-logs": "讀取 Pull Request 的 CI 運行記錄",
+            "issues": "讀取關聯 Issue 的標題、描述與上下文",
+            "authentication": "保存或清除評審平台訪問令牌",
+            "commit-message": "預覽、生成或快速採用提交資訊",
+            "deep-review": "針對工作區、提交或 PR 發起 Deep Review 並匯總結構化評審"
+          }
+        },
+        "browser": {
+          "title": "內置瀏覽器",
+          "summary": "在 OpenBitFun 內打開網頁和本地服務；智能體可直接讀取頁面、選擇元素並點擊、填寫、滾動或截圖。",
+          "items": {
+            "open-urls": "輸入完整網址、本地域名或開發服務端口並在 OpenBitFun 內打開",
+            "agent-web-research": "讓智能體搜索網頁並按需讀取指定頁面正文",
+            "history-navigation": "使用後退、前進和地址欄瀏覽頁面歷史",
+            "reload-status": "重新整理頁面，並同步當前 URL、加載狀態與錯誤提示",
+            "scene-and-panel": "既可作為獨立瀏覽器場景，也可在工作階段旁的輔助面板中打開",
+            "element-picker": "啓動元素選擇器，懸停時高亮頁面元素並顯示標籤、ID 和 Class",
+            "element-context": "點擊元素後捕獲 CSS 路徑、屬性、文本和 HTML，並加入當前工作階段上下文",
+            "element-picker-cancel": "再次點擊選擇按鈕或按 Esc 取消元素選擇並清理高亮",
+            "agent-page-automation": "讓智能體對內置網頁執行快照、讀取、點擊、懸停、填寫、按鍵、滾動、等待、腳本求值和截圖",
+            "shared-browser-action-contract": "內置 WebView 與外部 CDP 瀏覽器共用同一套 BrowserActions 參數、元素引用、結果與錯誤契約",
+            "browser-target-selection": "通過 target 選擇內置或外部瀏覽器，並用 session_id、URL 或標題精確定位頁面",
+            "embedded-webview": "桌面端使用原生 WebView，Web 端回退到受限 iframe，並在當前頁打開新窗口鏈接"
+          }
+        },
+        "computer-use": {
+          "title": "瀏覽器與桌面控制",
+          "summary": "授權智能體操作瀏覽器或本機界面，並明確管理輔助功能、屏幕錄制與瀏覽器連接。",
+          "items": {
+            "status": "檢查 Computer Use 可用性、輔助功能和屏幕錄制授權狀態",
+            "request-permissions": "請求桌面控制所需的系統權限",
+            "system-settings": "直接打開對應的系統隱私與安全設定",
+            "browser-discovery": "發現受支持的瀏覽器並查看當前 CDP 連接狀態",
+            "launch-connect": "啓動瀏覽器控制，以及連接或斷開已經配置 CDP 的瀏覽器",
+            "default-cdp": "啓用預設 CDP 配置並按需要重啓瀏覽器",
+            "agent-actions": "授權後讓智能體截圖、點擊、輸入、滾動並讀取可見界面",
+            "control-session-preview": "在控制狀態卡片查看當前目標、模式與授權畫面預覽",
+            "stop-control-session": "停止當前桌面控制工作階段並釋放捕獲與輸入資源",
+            "app-sharing": "選擇 App 窗口並單獨授權或撤銷控制",
+            "preview-input": "在共享預覽中點擊、拖動、滾動及輸入",
+            "remembered-control": "按應用執行檔案和控制模式記住或忘記授權"
+          }
+        },
+        "skills": {
+          "title": "Skills 技能",
+          "summary": "為智能體安裝和管理可復用的專業工作流，並控制哪些模式可以使用它們。",
+          "items": {
+            "installed-catalog": "統一查看用戶級、項目級、本地和遠程來源的已安裝 Skills",
+            "market": "瀏覽、搜索和重新整理 Skill 市場",
+            "market-install": "把市場 Skill 下載到用戶級或當前項目",
+            "local-add": "校驗本地 Skill 路徑並添加到用戶級或項目級",
+            "remove": "刪除已安裝的用戶級或項目級 Skill",
+            "global-enable": "在全局範圍啓用或停用單個 Skill",
+            "mode-selection": "按智能體模式選擇 Skill 與 Skill 組，並可恢復預設選擇",
+            "shadowing": "識別同名 Skill 的用戶級與項目級遮蔽優先級",
+            "invoke": "按需加載並執行當前智能體可見的 Skill"
+          }
+        },
+        "miniapps": {
+          "title": "Mini Apps 小應用",
+          "summary": "在 OpenBitFun 內安裝、創建和運行輕量應用，讓界面、數據與智能體工作流組合在一起。",
+          "items": {
+            "gallery-lifecycle": "查看、創建、編輯和刪除已安裝 Mini App",
+            "market": "瀏覽市場、查看詳情並安裝或更新發佈版本",
+            "market-account": "登錄市場賬戶並收藏、評分和查看已安裝來源",
+            "permissions": "按路徑或工作區授予權限，並在定制前審查權限差異",
+            "runtime": "運行 Mini App Host 與 Worker，查看狀態並停止後台 Worker",
+            "storage": "為正式應用和定制草稿分別讀取與保存持久狀態",
+            "agent-ai": "在 Mini App 中調用模型補全、聊天和專屬智能體工作階段",
+            "customization": "創建定制草稿、實時預覽，並應用、同步或丟棄修改",
+            "versions": "查看版本歷史並回滾到舊版本",
+            "agent-authoring": "讓智能體初始化、編寫並校驗一個 Mini App",
+            "agent-market-submit": "在用戶明確要求時由智能體提交已完成的 Mini App 到市場審核",
+            "publishing": "撤回和審查市場發佈，並可渲染幻燈片頁面"
+          }
+        },
+        "canvas": {
+          "title": "Canvas 與交互產物",
+          "summary": "在工作階段旁展示和保存智能體生成的可視化、交互頁面與結構化產物。",
+          "items": {
+            "artifact-open": "從工作階段工具結果加載並打開持久化 Canvas 產物",
+            "html-react": "渲染並持續編輯 HTML 或 React 交互界面、圖表和可視化",
+            "inline-generative-ui": "在工作階段中生成緊湊的 HTML/SVG 圖表、說明器或交互組件",
+            "state": "在重新打開或重新整理 Canvas 時加載和保存交互狀態",
+            "source-inspection": "查看 Canvas 源碼、編譯版本和最後可用版本",
+            "element-context": "選擇 Canvas 內的元素並把元素引用加入工作階段上下文",
+            "runtime-errors": "捕獲運行錯誤、上報診斷並請求智能體自動修復",
+            "export-html": "把當前 Canvas 導出為可獨立打開的 HTML 檔案"
+          }
+        },
+        "tasks-automation": {
+          "title": "任務板與定時任務",
+          "summary": "集中查看待辦事項，並讓任務在指定時間或目標主機上持續運行。",
+          "items": {
+            "board-views": "按待處理、日曆和已停用視圖瀏覽任務",
+            "create-edit": "創建、編輯、啓用、停用和刪除定時任務",
+            "schedule-types": "設定一次性、每日、每周或自定義 Cron 時間表",
+            "calendar-occurrences": "在日曆中預覽任務的下一次與後續運行時間",
+            "agent-workspace": "為任務選擇智能體、模型、工作模式和工作區",
+            "local-remote-target": "把任務安排在當前主機或已連接的遠程目標上運行",
+            "host-readiness": "查看任務列表並等待桌面 Host 就緒後可靠執行"
+          }
+        },
+        "insights": {
+          "title": "Insights 工作洞察",
+          "summary": "把工作階段和項目活動匯總成可讀的洞察，幫助回顧工作方式、用量和進展。",
+          "items": {
+            "availability": "檢查當前賬戶與工作階段是否已有可分析的洞察數據",
+            "generate": "按所選日期範圍和模型生成工作洞察報告",
+            "cancel": "取消正在運行的洞察生成任務",
+            "latest-report": "查看最新報告或加載指定的歷史報告",
+            "usage-statistics": "把工作活動與模型、Token 和緩存用量統計關聯起來",
+            "patterns": "回顧項目分布、工作時段、任務類型和協作習慣"
+          }
+        },
+        "ecosystem-compatibility": {
+          "title": "外部導入",
+          "summary": "查看外部 AI 生態的內容與狀態，導入受支持的 Skill、MCP、Hook，以及 Codex、Zcode 工作階段，並在 OpenBitFun 中繼續對話。",
+          "items": {
+            "source-discovery": "發現 OpenCode、Claude Code、Codex 等外部 AI 來源與可用內容",
+            "source-policy": "按來源啓用或停用集成，並選擇管理、預覽或只讀策略",
+            "codex-session-import": "發現、移除和重新添加 Codex 來源工作階段，並在 OpenBitFun 分支中續聊",
+            "zcode-session-import": "發現、移除和重新添加 Zcode 來源工作階段，並在 OpenBitFun 分支中續聊",
+            "prompts-commands": "展開外部 Prompt/Command 內容並處理與原生命令的衝突",
+            "subagents": "啓用外部智能體，處理同名衝突並綁定模型",
+            "mcp-import": "預覽 MCP 導入計劃，逐個處理伺服器衝突並應用",
+            "tool-targets": "選擇外部工具目標、解決衝突並控制是否啓用",
+            "hooks": "查看外部 Hooks 目錄、規劃導入、修改選擇並應用",
+            "security-review": "在遷移前查看衝突、安全影響和來源控制快照",
+            "reveal-source": "在檔案管理器或遠程環境中定位外部配置來源"
+          }
+        },
+        "remote-workspaces": {
+          "title": "遠程工作區",
+          "summary": "通過 SSH 或容器在遠程主機上打開項目，讓檔案、搜索、終端和智能體都在目標環境執行。",
+          "items": {
+            "ssh-profiles": "保存、列出、測試和刪除 SSH 連接配置",
+            "ssh-auth": "使用密碼、私鑰、證書、SSH Config Host 與跳板機連接",
+            "docker": "發現遠程 Docker 容器並把容器作為工作環境",
+            "wsl": "選擇 Windows 主機上的 WSL 發行版作為工作區",
+            "remote-open": "打開、關閉和移除遠程工作區，並讀取伺服器資訊",
+            "remote-files": "瀏覽、讀取、寫入、創建、重命名和刪除遠程檔案與目錄",
+            "transfer": "上傳本地檔案、下載遠程檔案並取消進行中的傳輸",
+            "remote-execution": "在目標主機執行命令，讓終端、搜索和智能體使用遠程數據面",
+            "port-forwarding": "發現遠程監聽端口並啓動、查看或停止端口轉發",
+            "connection-lifecycle": "查看連接狀態並斷開單個或全部 SSH 工作階段"
+          }
+        },
+        "remote-connect": {
+          "title": "Remote Connect 與多設備",
+          "summary": "從手機、Bot 或另一台 OpenBitFun 設備連接當前主機，遠程查看工作階段、回答權限並繼續工作。",
+          "items": {
+            "connection-methods": "選擇局域網或官方 Relay",
+            "start-stop-status": "啓動、停止 Remote Connect 並查看實時連接狀態和設備資訊",
+            "network": "查看局域網 IP、網路資訊與可分享的連接配置",
+            "bots": "配置飛書、Telegram、微信等 Bot 並單獨停止 Bot",
+            "account": "使用 GitHub 登錄、退出並查看身份狀態",
+            "devices": "列出、連接、查看設備型號與系統、設定別名和刪除同賬戶設備",
+            "peer-device": "進入 Peer Device Mode，把另一台 OpenBitFun 設備作為命令與事件數據面"
+          }
+        },
+        "detached-dispatch": {
+          "title": "Detached Dispatch 遠程派發",
+          "summary": "把可持續運行的任務派發到另一台 OpenBitFun 主機；控制端可以斷開，目標主機繼續執行並保留記錄。",
+          "items": {
+            "targets": "列出可派發目標並探測版本、連接和運行能力",
+            "provision": "為目標主機配置運行環境並安裝或更新 OpenBitFun CLI",
+            "model-sync": "在提交任務前同步目標所需的模型配置",
+            "submit": "把包含工作區、工作階段、模型和權限策略的持久任務提交到目標",
+            "status-list": "列出派發任務並查詢運行狀態、結果和錯誤",
+            "transcript": "保存、追加和重新加載可斷線恢復的執行記錄",
+            "permission-continuation": "遠程回答權限請求，並繼續或取消目標端任務",
+            "result-sync": "將目標端結果同步回控制端，而不把控制端當作遠程檔案系統代理"
+          }
+        },
+        "pages": {
+          "title": "Pages 發佈",
+          "summary": "保存頁面版本並行布到公開或私有地址，管理標題、可見性、歷史版本和分享鏈接。",
+          "items": {
+            "pages-list": "查看賬戶下的 Pages 與每個頁面的當前發佈狀態",
+            "immutable-versions": "保存不可變頁面版本並瀏覽版本歷史",
+            "publish": "發佈或重新部署選中的頁面版本",
+            "visibility": "更新標題、公開/私有可見性和訪問設定",
+            "share-open": "創建可打開和分享的頁面鏈接",
+            "unpublish": "取消發佈頁面，同時保留可再次發佈的版本",
+            "delete": "刪除單個版本或整個 Page"
+          }
+        },
+        "voice-input": {
+          "title": "語音輸入與實時通話",
+          "summary": "將錄音轉成文字，或在客戶端持續進行實時語音通話，讓助手進入項目執行任務並播報簡要進展。",
+          "items": {
+            "composer-recording": "從聊天輸入框開始、結束或取消一次錄音",
+            "stream-audio": "錄音過程中分塊傳輸音頻並顯示識別進度",
+            "realtime-assistant-call": "在客戶端啓動或結束實時語音通話，聽取回復，並讓助手執行或停止項目任務",
+            "realtime-assistant-config": "讀取或保存實時語音服務配置",
+            "local-models": "查看本地語音模型及安裝、下載、驗證、修復和刪除狀態",
+            "cancel-download": "取消正在進行的語音模型下載",
+            "language-microphone": "選擇自動檢測或指定識別語言，並選擇系統麥克風",
+            "diagnostic-test": "在設定頁進行麥克風與語音識別測試並查看耗時和錯誤",
+            "edit-transcript": "把轉寫結果放回輸入框，在發送前繼續編輯"
+          }
+        },
+        "desktop-pet": {
+          "title": "智能體桌面夥伴",
+          "summary": "在桌面上顯示智能體夥伴，並選擇、導入或管理 Petdex 角色包。",
+          "items": {
+            "enable": "整體啓用或停用智能體桌面夥伴",
+            "presets": "查看並切換內置或已導入的 Petdex 角色",
+            "petdex-import": "從本地 Petdex 包導入並使用新的角色與動畫",
+            "petdex-delete": "刪除已導入的 Petdex 包並回退到可用角色",
+            "desktop-window": "顯示、隱藏和調整獨立桌面夥伴窗口大小，並可回到主窗口"
+          }
+        },
+        "desktop-cards": {
+          "title": "桌面小卡片",
+          "summary": "讓智能體在主窗口之外放置可拖動的小卡片，顯示倒計時、清單、PR 狀態、天氣、股價等需要偶爾看一眼的資訊，並在重新打開應用後恢復。",
+          "items": {
+            "agent-cards": "按需求或在任務過程中創建倒計時、清單、便簽、進度、指標、定時任務和自定義卡片，可定時從 HTTP 接口或本機命令重新整理數據",
+            "home-management": "在首頁“小卡片”區查看全部卡片，並顯示、隱藏或刪除單張卡片",
+            "card-actions": "在卡片上重新整理數據、勾選清單項、切換置頂、打開鏈接或回到來源工作階段",
+            "drag-restore": "拖動卡片到桌面任意位置，拖動卡片邊緣或四角調整大小；關閉 OpenBitFun 時卡片消失，重新打開後按原位置和大小恢復"
+          }
+        }
+      },
+      "setting": {
+        "application": {
+          "general": {
+            "title": "常規設定",
+            "summary": "管理啓動、更新、關閉行為、通知與睡眠保持等應用級偏好。",
+            "items": {
+              "automatic-updates": "啓用或停用自動檢查更新",
+              "manual-update": "手動檢查並後台下載更新，確認後安裝並重啓，或稍後從關於頁面安裝",
+              "launch-at-login": "控制 OpenBitFun 是否在登錄系統後自動啓動",
+              "prevent-sleep": "控制 OpenBitFun 運行期間是否阻止電腦自動睡眠",
+              "close-behavior": "選擇關閉主窗口時退出、最小化到托盤或每次詢問",
+              "notifications": "分別控制任務完成和權限請求通知"
+            }
+          },
+          "appearance": {
+            "title": "外觀與語言",
+            "summary": "切換主題與語言，調整字體，並安裝或導入外觀包。",
+            "items": {
+              "built-in-appearance": "選擇跟隨系統、淺色、深色、單色、Midnight、中國風、Cyber、Slate 或 Tokyo Night 等內置外觀",
+              "language": "切換簡體中文、繁體中文、英文等受支持界面語言",
+              "ui-font-size": "調整全局界面字號，並支持自定義像素值",
+              "local-packages": "導入、預覽、應用、導出和刪除本地外觀包",
+              "appearance-market": "瀏覽、搜索、篩選並安裝或更新 Skin 市場外觀",
+              "agent-market-submit": "在用戶明確要求時由智能體提交本地外觀包到 Skin 市場審核",
+              "market-submissions": "查看和撤回自己的外觀市場投稿",
+              "market-review": "在具備權限時查看並批准或拒絕外觀投稿"
+            }
+          },
+          "pet": {
+            "title": "桌面夥伴設定",
+            "summary": "啓用桌面智能體夥伴並管理當前角色，以及開啓或關閉桌面小卡片。",
+            "items": {
+              "enabled": "整體啓用或停用智能體夥伴",
+              "desktop-cards-enabled": "開啓或關閉桌面小卡片；關閉後隱藏所有卡片，智能體也不再看到小卡片工具",
+              "preset-selection": "從內置與已導入角色中選擇當前夥伴",
+              "import": "導入本地 Petdex 角色包",
+              "delete-refresh": "重新整理角色列表並刪除不再需要的導入包"
+            }
+          },
+          "input": {
+            "title": "輸入與交互",
+            "summary": "配置對話文本選擇操作、語音輸入、麥克風、識別語言與本地模型。",
+            "items": {
+              "auto-show-selection-toolbar": "開啓或關閉選中對話文本後的自動操作欄",
+              "voice-enabled": "在聊天輸入框啓用或停用語音輸入",
+              "language": "選擇自動檢測或中文、粵語、英文、日文等識別語言",
+              "microphone-test": "選擇麥克風並執行語音識別測試",
+              "local-models": "下載、選擇、驗證、修復或刪除本地語音模型",
+              "recording-limit": "設定單次語音輸入的最長錄音時間"
+            }
+          },
+          "shortcuts": {
+            "title": "快捷鍵",
+            "summary": "搜索、查看、自定義與重置應用、場景、編輯器和終端快捷鍵。",
+            "items": {
+              "shortcut-browser": "搜索和查看全部應用、場景、編輯器與終端快捷鍵",
+              "shortcut-remap": "錄制新快捷鍵、檢測衝突、恢復單項或重置全部自定義鍵位"
+            }
+          },
+          "development": {
+            "title": "編輯器",
+            "summary": "調整代碼編輯器的字體、縮進、換行、格式化與 Minimap。",
+            "items": {
+              "editor-appearance": "設定編輯器字體、字重、字號、行高與光標樣式",
+              "indent-wrap": "設定 Tab 寬度、空格縮進、自動換行、行號與平滑滾動",
+              "editor-display": "控制 Minimap、空白字符、當前行高亮和滾動邊界",
+              "editor-advanced": "控制自動保存、語義高亮、括號配色、格式化和空白清理"
+            }
+          },
+          "terminal": {
+            "title": "終端",
+            "summary": "選擇預設終端 Shell，並設定新終端面板在工作階段中的打開位置。",
+            "items": {
+              "default-shell": "自動檢測或指定預設終端 Shell",
+              "terminal-position": "把終端面板放在右側或底部"
+            }
+          }
+        },
+        "ai": {
+          "models": {
+            "title": "模型與供應商",
+            "summary": "添加 AI 供應商和模型，選擇預設模型，配置網路代理、訂閱與流式超時。",
+            "items": {
+              "providers": "添加、編輯和刪除內置或自定義 AI 供應商",
+              "credentials-endpoint": "配置 API Key、Base URL、請求格式和模型列表",
+              "subscription-auth": "登錄、重新整理和退出 Codex、Antigravity、OpenCode Console（Zen）、Grok、Hermes 等賬戶",
+              "default-models": "選擇主模型、快速模型以及圖像理解、圖像生成和語音識別模型",
+              "reasoning": "為模型選擇推理預設或自定義推理強度",
+              "proxy": "配置 AI 請求使用的網路代理與繞過規則",
+              "stream-timeouts": "設定或取消首 Token 等待和流式空閒超時",
+              "available-models": "讓智能體查看當前配置下可用的模型",
+              "model-catalog": "查看 models.dev 目錄狀態、手動重新整理並定位本地緩存",
+              "advanced-request": "為供應商添加自定義 Header、請求體字段與 SSL 行為",
+              "connection-test": "保存前測試供應商或模型連接並重新整理運行時客戶端",
+              "model-pools": "管理模型池、路由策略與工作階段模型選擇"
+            }
+          },
+          "memory": {
+            "title": "記憶設定",
+            "summary": "控制 OpenBitFun 是否從工作階段中提取和使用長期記憶，以及保留、整理和模型策略。",
+            "items": {
+              "generation-recall": "一鍵同時啓用或停用長期記憶生成與工作階段召回",
+              "btw": "決定 BTW 輕量工作階段是否參與記憶生成",
+              "external-context": "存在外部工具上下文時選擇清除工具結果、允許或跳過工作階段",
+              "rollout-policy": "設定空閒時長、最大年齡、啓動處理上限和掃描上限",
+              "extraction": "設定記憶提取並行數和單次原始候選上限",
+              "extraction-model": "從當前可用模型中選擇記憶提取模型或跟隨主模型",
+              "retention": "設定未使用記憶的最長保留天數",
+              "consolidation": "選擇記憶整理模型並讓它跟隨主模型或提取模型",
+              "maintenance": "打開記憶目錄、恢復預設設定或顯式清空全部記憶"
+            }
+          }
+        },
+        "workspace": {
+          "session": {
+            "title": "工作階段與工作區設定",
+            "summary": "控制預設智能體執行框架、工作階段標題生成、工作區加速搜索和與項目上下文相關的行為。",
+            "items": {
+              "default-agent-harness": "讓普通新工作階段跟隨 ChatInput 上次選擇，或固定使用指定執行框架",
+              "automatic-titles": "啓用或停用根據工作階段內容自動生成標題",
+              "title-model": "讓標題模型繼承主模型、快速模型或使用指定模型",
+              "next-input-suggestion": "啓用或停用 Agent 答復後在輸入框中顯示的一句話候選輸入",
+              "accelerated-search": "為本地工作區啓用 Flashgrep 加速搜索",
+              "search-index": "查看索引狀態並在需要時重建工作區索引",
+              "remote-behavior": "遠程工作區明確降級搜索實現，不把遠程路徑回退到本機"
+            }
+          },
+          "worktrees": {
+            "title": "Worktree 設定",
+            "summary": "配置 Git Worktree 的根目錄、分支前綴和自動清理規則，並查看現有隔離工作區。",
+            "items": {
+              "isolation": "瞭解隔離 Worktree，並配置其創建與清理預設值",
+              "root-path": "設定受管 Worktree 的統一根目錄",
+              "branch-prefix": "設定自動創建分支使用的名稱前綴",
+              "copy-changes": "創建隔離工作區時選擇是否複製當前未提交改動",
+              "auto-cleanup": "啓用自動清理並設定最多保留的受管 Worktree 數量",
+              "management": "查看 Worktree 生命週期、髒狀態、未發佈提交與關聯工作階段",
+              "open-restore-delete": "打開或恢復關聯工作階段，並在保護檢查後刪除或強制刪除 Worktree"
+            }
+          }
+        },
+        "tools": {
+          "execution": {
+            "title": "執行與權限控制",
+            "summary": "管理智能體工具權限、並行度、超時、延遲加載、Computer Use 與瀏覽器控制。",
+            "items": {
+              "permission-mode": "選擇詢問、自動批准或完全訪問權限模式，並確認高風險警告",
+              "permission-selector": "控制權限模式選擇器是否顯示在聊天輸入框下方",
+              "global-project-rules": "創建、排序和保存全局或項目級 Allow、Ask、Deny 規則",
+              "remembered-grants": "查看、撤銷或清空項目中記住的權限授權與審計記錄",
+              "deferred-tools": "按需延遲加載工具定義以減少智能體初始上下文",
+              "parallelism": "設定子智能體與 Swarm 最大並行及安全、強制並行或串行策略",
+              "timeouts": "設定或取消單次工具調用超時",
+              "review-capacity": "設定 Deep Review 最大並行評審者和隊列等待時間",
+              "computer-use": "啓用或停用已獲系統授權的 Computer Use",
+              "computer-use-permissions": "查看並請求輔助功能與屏幕錄制權限",
+              "browser-auto-connect": "控制 OpenBitFun 啓動時是否自動連接瀏覽器",
+              "browser-setup": "發現並選擇瀏覽器、配置預設 CDP 或按需重啓",
+              "json-repair": "控制是否在安全邊界內修復模型生成的非法工具參數 JSON"
+            }
+          },
+          "desktop-control": {
+            "title": "桌面控制",
+            "summary": "管理 Computer Use 開關，並檢查輔助功能與屏幕錄制授權。",
+            "items": {
+              "permissions": "查看 Computer Use、輔助功能與屏幕錄制狀態並完成系統授權"
+            }
+          },
+          "browser-control": {
+            "title": "瀏覽器控制",
+            "summary": "選擇瀏覽器，檢查連接狀態，並配置 CDP 與啓動連接行為。",
+            "items": {
+              "connection": "選擇瀏覽器並查看、建立或斷開 CDP 連接"
+            }
+          },
+          "automation": {
+            "title": "快捷操作與 Hooks",
+            "summary": "自定義編碼後的快捷操作，並配置在智能體生命週期事件上運行的 Hooks。",
+            "items": {
+              "built-in-actions": "啓用和調整內置的提交與創建 Pull Request 快捷操作",
+              "custom-actions": "添加、編輯和刪除自定義編碼後快捷操作及 Prompt",
+              "hooks-enabled": "整體啓用或停用智能體生命週期 Hooks",
+              "project-hooks": "對可信倉庫單獨啓用項目級 .openbitfun/config/hooks.json",
+              "hook-files": "定位用戶級和項目級 Hooks 配置檔案並在修改後即時生效",
+              "hook-events": "在工作階段、智能體、工具、權限和用戶輸入等 Codex Hook 事件上運行處理器",
+              "external-hooks": "查看外部 AI 應用的只讀 Hook 目錄並選擇導入項",
+              "hook-import": "預覽、修改和應用 Hook 導入計劃，並保留衝突診斷"
+            }
+          },
+          "web-search": {
+            "title": "網頁搜索",
+            "summary": "選擇 WebSearch 工具運行時使用的搜索服務，並配置自建 HTTP 端點與當前執行主機的設備憑據。",
+            "items": {
+              "provider": "在免費 Exa MCP、Exa Search API、Tavily、DeepSeek 與 OpenBitFun Search HTTP Protocol 之間選擇運行時服務",
+              "http-endpoint": "為 OpenBitFun Search HTTP Protocol 配置端點、認證方式和受限憑據 Header",
+              "device-credential": "查看當前執行主機的憑據狀態，並保存、替換或清除 API Key/Secret",
+              "http-protocol": "查看並複製 OpenBitFun Search HTTP Protocol v1 的請求、響應和傳輸限制"
+            }
+          },
+          "mcp": {
+            "title": "MCP 伺服器",
+            "summary": "添加和管理 Model Context Protocol 伺服器，查看工具、資源、提示詞與遠程授權狀態。",
+            "items": {
+              "json-config": "用表單或 JSON 查看和保存全部 MCP 伺服器配置",
+              "server-types": "添加本地進程、遠程 HTTP/SSE 或容器 MCP 伺服器",
+              "lifecycle": "啓動、停止、重啓和刪除單個 MCP 伺服器",
+              "status": "查看初始化、連接、健康、重連、鑒權和失敗狀態",
+              "remote-auth": "配置遠程 Header/環境變量認證或清除已有憑據",
+              "oauth": "發起、輪詢、取消或重新連接遠程 MCP OAuth",
+              "tools-prompts": "列出 MCP Prompt 並讀取帶參數的指定 Prompt",
+              "mcp-tool-ui": "查看 MCP 工具清單並打開工具提供的 App/UI",
+              "resources": "列出並讀取 MCP Resources",
+              "mcp-apps": "打開 MCP App/UI、雙向發送消息並回答交互請求"
+            }
+          },
+          "acp": {
+            "title": "ACP 外部智能體",
+            "summary": "配置通過 Agent Client Protocol 接入的外部智能體，並檢查適配器、命令與工作階段選項。",
+            "items": {
+              "presets": "使用 OpenCode、dsh、OMP、Claude Code 和 Codex 等預設",
+              "json-config": "通過 JSON 查看、添加和保存 ACP 智能體配置",
+              "probe": "探測 CLI、適配器、路徑、版本、連接與權限要求",
+              "install": "安裝外部智能體 CLI 並預下載 ACP 客戶端適配器",
+              "remote-detection": "在 SSH 遠程工作區探測可用外部智能體並顯示不支持原因",
+              "session-model-options": "為 ACP 工作階段選擇模型並修改客戶端聲明的配置選項",
+              "session-commands": "查看並執行外部智能體暴露的工作階段命令",
+              "dialog-permissions": "開始或取消 ACP 對話，並遠程回答外部智能體權限請求"
+            }
+          }
+        },
+        "data": {
+          "usage": {
+            "title": "Token 用量",
+            "summary": "查看請求、輸入輸出 Token、緩存命中和估算成本等使用統計。",
+            "items": {
+              "time-range": "按最近 24 小時、今天、本週、本月或全部時間查看用量",
+              "granularity": "按小時或天切換趨勢粒度",
+              "filter": "按供應商、模型或搜索關鍵詞篩選用量",
+              "summary": "查看請求數、總 Token、緩存 Token 與緩存命中率",
+              "distribution": "按模型、供應商組和請求端點比較分布",
+              "trend": "分別查看輸入、輸出、緩存創建、緩存讀取和命中率趨勢"
+            }
+          },
+          "archived": {
+            "title": "已歸檔工作階段",
+            "summary": "查找、恢復或永久刪除已歸檔的工作階段，管理長期工作階段歷史。",
+            "items": {
+              "browse": "按工作區瀏覽分頁歸檔工作階段及其元數據",
+              "search": "按標題、內容和工作區搜索已歸檔工作階段",
+              "restore": "恢復工作階段、輪次和原工作區視圖並取消歸檔",
+              "delete-selected": "明確確認後永久刪除選中的歸檔工作階段",
+              "delete-all": "明確確認後永久刪除全部歸檔工作階段"
+            }
+          },
+          "diagnostics": {
+            "title": "記錄與診斷",
+            "summary": "調整記錄級別，查看運行記錄路徑，並導出用於排查問題的診斷包。",
+            "items": {
+              "log-level": "設定 Trace、Debug、Info、Warn、Error 或關閉後端記錄",
+              "sensitive-diagnostics": "選擇診斷中是否允許包含敏感上下文，並在導出前明確提示",
+              "log-path": "查看記錄路徑並打開記錄資料夾",
+              "export-bundle": "導出包含系統、配置健康和記錄資訊的診斷包",
+              "crash-recovery": "查看上次崩潰、非正常退出、啓動恢復和配置恢復資訊",
+              "devtools": "在開發構建中檢查 DevTools 是否可用並打開或關閉",
+              "element-inspector": "在開發構建中啓用主窗口元素檢查並回傳選中的元素"
+            }
+          }
+        }
+      }
+    }
+  }
 }
diff --git a/src/web-ui/src/locales/zh-TW/scenes/skills.json b/src/web-ui/src/locales/zh-TW/scenes/skills.json
index f4768b2dbc..816c68a179 100644
--- a/src/web-ui/src/locales/zh-TW/scenes/skills.json
+++ b/src/web-ui/src/locales/zh-TW/scenes/skills.json
@@ -231,7 +231,11 @@
     "scanIncomplete": "部分技能掃描失敗，已成功讀取的技能仍可使用。",
     "unsupportedSkills": "部分技能依賴暫不支援的能力，未載入。",
     "unsupportedField": "目前主機暫不支援技能內的 {{field}} 宣告，該技能未載入。",
-    "diagnosticsUnavailable": "目前主機不提供技能掃描診斷。"
+    "diagnosticsUnavailable": "目前主機不提供技能掃描診斷。",
+    "diagnostics": {
+      "title": "掃描詳情（{{count}} 項）",
+      "description": "已成功載入的技能可以繼續使用。修復以下檔案後，重新掃描即可更新結果。"
+    }
   },
   "deleteModal": {
     "title": "確認刪除",
diff --git a/src/web-ui/src/locales/zh-TW/settings.json b/src/web-ui/src/locales/zh-TW/settings.json
index f968420ac0..6d8d0a05d1 100644
--- a/src/web-ui/src/locales/zh-TW/settings.json
+++ b/src/web-ui/src/locales/zh-TW/settings.json
@@ -281,7 +281,7 @@
         "toggleBoth": "摺疊所有面板"
       },
       "nav": {
-        "toggleSearch": "開啟導航搜尋"
+        "toggleSearch": "開啟全域搜尋"
       },
       "scene": {
         "focusMerged": "切換場景",
@@ -292,7 +292,7 @@
         "openTerminal": "開啟終端"
       },
       "canvas": {
-        "missionControl": "Mission Control",
+        "missionControl": "全景模式",
         "splitHorizontal": "水平分屏",
         "splitVertical": "垂直分屏",
         "anchorZone": "切換錨點區",
@@ -312,7 +312,8 @@
         "stopGeneration": "停止生成",
         "activateInput": "激活輸入框",
         "newSession": "新增會話",
-        "insertNewline": "在輸入框中插入換行"
+        "insertNewline": "在輸入框中插入換行",
+        "search": "搜尋目前工作階段"
       },
       "filetree": {
         "rename": "重新命名",
@@ -340,6 +341,12 @@
       "canvas": "編輯器畫布及其中的程式碼編輯器取得焦點時生效",
       "filetree": "檔案樹取得焦點時生效",
       "git": "Git 面板取得焦點時生效"
+    },
+    "reserved": {
+      "appSwitch": "此組合鍵用於系統應用程式切換，請選擇其他鍵位。",
+      "systemSearch": "此組合鍵用於系統搜尋，請選擇其他鍵位。",
+      "secureAttention": "此組合鍵用於 Windows 安全畫面，請選擇其他鍵位。",
+      "systemKey": "此組合鍵使用 Windows 系統鍵，請選擇其他鍵位。"
     }
   },
   "advanced": {
diff --git a/src/web-ui/src/locales/zh-TW/settings/appearance.json b/src/web-ui/src/locales/zh-TW/settings/appearance.json
index ca9044bb6b..153ef2f92c 100644
--- a/src/web-ui/src/locales/zh-TW/settings/appearance.json
+++ b/src/web-ui/src/locales/zh-TW/settings/appearance.json
@@ -1,6 +1,6 @@
 {
   "title": "外觀",
-  "subtitle": "調整介面語言、主題與字體大小",
+  "subtitle": "調整主題與字體大小",
   "sessionPanel": {
     "title": "工作階段側邊面板",
     "displayMode": "面板佈局",
diff --git a/src/web-ui/src/shared/constants/shortcuts.ts b/src/web-ui/src/shared/constants/shortcuts.ts
index 6fae6462c0..1fb7daced6 100644
--- a/src/web-ui/src/shared/constants/shortcuts.ts
+++ b/src/web-ui/src/shared/constants/shortcuts.ts
@@ -83,11 +83,14 @@ export const SCENE_SHORTCUTS: ShortcutDef[] = [
 // (data-shortcut-scope="canvas"). Tab-switch shortcuts retain allowInInput
 // so they continue to work while a Monaco editor is focused.
 
+// Shared by registration and settings. Mod+Tab is intercepted by macOS.
+export const CANVAS_OVERVIEW_SHORTCUT = mod('E', { shift: true, scope: 'canvas', allowInInput: true });
+
 export const CANVAS_SHORTCUTS: ShortcutDef[] = [
   // View
   {
     id: 'canvas.missionControl',
-    config: mod('Tab', { scope: 'canvas', allowInInput: true }),
+    config: CANVAS_OVERVIEW_SHORTCUT,
     descriptionKey: 'keyboard.shortcuts.canvas.missionControl',
   },
   {
@@ -183,6 +186,11 @@ export const EDITOR_SHORTCUTS: ShortcutDef[] = [
 // ─── Chat shortcuts (scope: 'chat') ───────────────────────────────────────
 
 export const CHAT_SHORTCUTS: ShortcutDef[] = [
+  {
+    id: 'chat.search',
+    config: mod('F', { scope: 'chat', allowInInput: false }),
+    descriptionKey: 'keyboard.shortcuts.chat.search',
+  },
   {
     id: 'btw-fill',
     config: { key: 'B', ctrl: true, alt: true, scope: 'chat', allowInInput: true },
diff --git a/src/web-ui/src/shared/utils/format.test.ts b/src/web-ui/src/shared/utils/format.test.ts
new file mode 100644
index 0000000000..687b67a7a3
--- /dev/null
+++ b/src/web-ui/src/shared/utils/format.test.ts
@@ -0,0 +1,33 @@
+import { afterEach, describe, expect, it, vi } from 'vitest';
+import { formatDuration as formatSharedDuration } from '../../../../shared/i18n/formatDuration';
+import { formatDuration } from './format';
+import { formatElapsedDuration } from '@/flow_chat/utils/tokenUsageDisplay';
+import { formatUsageDuration } from '@/flow_chat/components/usage/usageReportUtils';
+import { i18nService } from '@/infrastructure/i18n';
+
+afterEach(() => vi.restoreAllMocks());
+
+describe('localized duration presentation', () => {
+  it.each([
+    ['en-US', '12.3 sec', '2 min', '86 ms'],
+    ['zh-CN', '12.3秒', '2分钟', '86毫秒'],
+    ['zh-TW', '12.3 秒', '2 分鐘', '86 毫秒'],
+  ])('uses the same units in tools, model rounds and usage for %s', (locale, seconds, minutes, milliseconds) => {
+    vi.spyOn(i18nService, 'formatNumber').mockImplementation((value, options) => new Intl.NumberFormat(locale, options).format(value));
+    for (const formatter of [formatDuration, formatElapsedDuration, (ms: number) => formatUsageDuration(ms, key => key)]) {
+      expect(formatter(12345)).toBe(seconds);
+      expect(formatter(119999)).toBe(minutes);
+      expect(formatter(86)).toBe(milliseconds);
+    }
+  });
+
+  it('carries rounded seconds and preserves elapsed precision without invalid values', () => {
+    const number = (value: number, options?: Intl.NumberFormatOptions) => new Intl.NumberFormat('en-US', options).format(value);
+    expect(formatSharedDuration(59999, number)).toBe('1 min');
+    expect(formatSharedDuration(59999, number, 'live')).toBe('59 sec');
+    expect(formatSharedDuration(3600000, number)).toBe('1 hr');
+    expect(formatSharedDuration(90000000, number)).toBe('1 day 1 hr');
+    expect(formatSharedDuration(-1, number)).toBe('0 ms');
+    expect(formatSharedDuration(NaN, number)).toBe('0 ms');
+  });
+});
diff --git a/src/web-ui/src/shared/utils/format.ts b/src/web-ui/src/shared/utils/format.ts
index c4c3c1e022..bf755422eb 100644
--- a/src/web-ui/src/shared/utils/format.ts
+++ b/src/web-ui/src/shared/utils/format.ts
@@ -2,20 +2,11 @@
  * Formatting utilities for tool display
  */
 
-export const formatDuration = (durationMs: number): string => {
-  if (durationMs < 1000) {
-    return `${Math.round(durationMs)}ms`;
-  }
-  
-  const seconds = durationMs / 1000;
-  if (seconds < 60) {
-    return `${seconds.toFixed(1)}s`;
-  }
-  
-  const minutes = Math.floor(seconds / 60);
-  const remainingSeconds = Math.round(seconds % 60);
-  return `${minutes}m ${remainingSeconds}s`;
-};
+import { formatDuration as formatLocalizedDuration, type DurationPrecision } from '../../../../shared/i18n/formatDuration';
+import { i18nService } from '@/infrastructure/i18n/core/I18nService';
+
+export const formatDuration = (durationMs: number, precision: DurationPrecision = 'precise'): string =>
+  formatLocalizedDuration(durationMs, (value, options) => i18nService.formatNumber(value, options), precision);
 
 export const formatCost = (costUSD: number): string => {
   if (costUSD < 0.001) {
diff --git a/src/web-ui/src/tools/mermaid-editor/services/MermaidService.test.ts b/src/web-ui/src/tools/mermaid-editor/services/MermaidService.test.ts
new file mode 100644
index 0000000000..b576563f47
--- /dev/null
+++ b/src/web-ui/src/tools/mermaid-editor/services/MermaidService.test.ts
@@ -0,0 +1,15 @@
+// @vitest-environment jsdom
+import { expect, it, vi } from 'vitest';
+import { MermaidService } from './MermaidService';
+vi.mock('../appearance/mermaidAppearance', () => ({ getMermaidConfig: () => ({}) }));
+it.each([
+  'block-beta\ncolumns 2\na["Start"] b["Finish"]',
+  'flowchart TD\nA[Start] --> B[Finish]',
+])('accepts supported syntax through the real Mermaid parser: %s', async code => {
+  expect(await MermaidService.getInstance().validateMermaidCode(code)).toEqual({ valid: true });
+});
+it('rejects malformed static source with a parser diagnostic', async () => {
+  const result = await MermaidService.getInstance().validateMermaidCode('block-be');
+  expect(result.valid).toBe(false);
+  expect(result.error).toBeTruthy();
+});