@workbench-kit/shell-react 0.0.2-prototype.0.2.13 → 0.0.2-prototype.0.2.15

package/src/shell/chrome-labels.ts

@@ -0,0 +1,98 @@
+/**
+ * Host-overridable chrome strings for WorkbenchShell surfaces
+ * (ActivityBar / StatusBar aria, secondary Profile/Settings, command palette,
+ * Quick Open).
+ *
+ * Resolution order per string: `labels[key]` → `t(capabilityId, default)` → English default.
+ * Kit does not ship locale packs — hosts inject `t` or partial `labels`.
+ */
+
+export type WorkbenchTranslate = (
+  key: string,
+  fallback: string,
+  params?: Readonly<Record<string, string | number>>,
+) => string;
+
+/** Optional host i18n bag (same `t` signature as Field Remap chrome). */
+export interface WorkbenchI18n {
+  readonly t: WorkbenchTranslate;
+}
+
+export interface WorkbenchShellChromeLabels {
+  readonly activityBarAriaLabel: string;
+  readonly statusBarAriaLabel: string;
+  readonly profileLabel: string;
+  readonly profileTitle: string;
+  readonly settingsLabel: string;
+  readonly commandPaletteTitle: string;
+  readonly commandPalettePlaceholder: string;
+  readonly commandPaletteCloseLabel: string;
+  readonly commandPaletteEmptyLabel: string;
+  readonly quickOpenTitle: string;
+  readonly quickOpenPlaceholder: string;
+  readonly quickOpenCloseLabel: string;
+  readonly quickOpenEmptyLabel: string;
+}
+
+export const defaultWorkbenchShellChromeLabels: WorkbenchShellChromeLabels = {
+  activityBarAriaLabel: 'Activity bar',
+  statusBarAriaLabel: 'Status bar',
+  profileLabel: 'Profile',
+  profileTitle: 'Open profile',
+  settingsLabel: 'Settings',
+  commandPaletteTitle: 'Command Palette',
+  commandPalettePlaceholder: 'Search commands',
+  commandPaletteCloseLabel: 'Close command palette',
+  commandPaletteEmptyLabel: 'No commands match your search',
+  quickOpenTitle: 'Quick Open',
+  quickOpenPlaceholder: 'Search files by name',
+  quickOpenCloseLabel: 'Close Quick Open',
+  quickOpenEmptyLabel: 'No matching files',
+};
+
+/** Stable capability ids for optional `t()` injection (not free prose). */
+export const workbenchShellChromeLabelKeys = {
+  activityBarAriaLabel: 'shell.activityBar',
+  statusBarAriaLabel: 'shell.statusBar',
+  profileLabel: 'shell.profile',
+  profileTitle: 'shell.profileTitle',
+  settingsLabel: 'shell.settings',
+  commandPaletteTitle: 'commandPalette.title',
+  commandPalettePlaceholder: 'commandPalette.placeholder',
+  commandPaletteCloseLabel: 'commandPalette.close',
+  commandPaletteEmptyLabel: 'commandPalette.empty',
+  quickOpenTitle: 'quickOpen.title',
+  quickOpenPlaceholder: 'quickOpen.placeholder',
+  quickOpenCloseLabel: 'quickOpen.close',
+  quickOpenEmptyLabel: 'quickOpen.empty',
+} as const satisfies Record<keyof WorkbenchShellChromeLabels, string>;
+
+export function resolveWorkbenchShellChromeLabels(
+  labels?: Partial<WorkbenchShellChromeLabels> | undefined,
+  t?: WorkbenchTranslate | undefined,
+): WorkbenchShellChromeLabels {
+  const resolve = <K extends keyof WorkbenchShellChromeLabels>(key: K): string => {
+    const override = labels?.[key];
+    if (override !== undefined) {
+      return override;
+    }
+    const fallback = defaultWorkbenchShellChromeLabels[key];
+    return t?.(workbenchShellChromeLabelKeys[key], fallback) ?? fallback;
+  };
+
+  return {
+    activityBarAriaLabel: resolve('activityBarAriaLabel'),
+    statusBarAriaLabel: resolve('statusBarAriaLabel'),
+    profileLabel: resolve('profileLabel'),
+    profileTitle: resolve('profileTitle'),
+    settingsLabel: resolve('settingsLabel'),
+    commandPaletteTitle: resolve('commandPaletteTitle'),
+    commandPalettePlaceholder: resolve('commandPalettePlaceholder'),
+    commandPaletteCloseLabel: resolve('commandPaletteCloseLabel'),
+    commandPaletteEmptyLabel: resolve('commandPaletteEmptyLabel'),
+    quickOpenTitle: resolve('quickOpenTitle'),
+    quickOpenPlaceholder: resolve('quickOpenPlaceholder'),
+    quickOpenCloseLabel: resolve('quickOpenCloseLabel'),
+    quickOpenEmptyLabel: resolve('quickOpenEmptyLabel'),
+  };
+}

package/src/shell/model.tsx

@@ -1,8 +1,13 @@
 import type { ReactNode } from 'react';
-import type { ActivityBarItem, StatusBarSectionModel } from '@workbench-kit/react/workbench/shell';
+import type {
+  ActivityBarItem,
+  StatusBarItemModel,
+  StatusBarSectionModel,
+} from '@workbench-kit/react/workbench/shell';
 import type {
   ExtensionDependencyDiagnosticSeverity,
   WorkbenchActivityContribution,
+  WorkbenchStatusBarContribution,
   WorkbenchViewContainerContribution,
   WorkbenchViewContribution,
 } from '@workbench-kit/workbench-core';
@@ -65,6 +70,63 @@ export function createWorkbenchShellActivityItems({
   });
 }
 
+function compareStatusBarPriority(
+  left: WorkbenchStatusBarContribution,
+  right: WorkbenchStatusBarContribution,
+): number {
+  const leftPriority = left.priority ?? 0;
+  const rightPriority = right.priority ?? 0;
+  if (leftPriority !== rightPriority) {
+    return rightPriority - leftPriority;
+  }
+
+  return left.id.localeCompare(right.id);
+}
+
+function toStatusBarItemModel(item: WorkbenchStatusBarContribution): StatusBarItemModel {
+  return {
+    id: item.id,
+    label: item.text,
+    order: item.priority,
+    title: item.text,
+  };
+}
+
+/** Map extension `contributes.statusBar` items into shell status sections. */
+export function createContributedWorkbenchStatusSections(
+  items: readonly WorkbenchStatusBarContribution[],
+): StatusBarSectionModel[] {
+  const leftItems = items
+    .filter((item) => item.alignment === 'left')
+    .sort(compareStatusBarPriority)
+    .map(toStatusBarItemModel);
+  const rightItems = items
+    .filter((item) => item.alignment === 'right')
+    .sort(compareStatusBarPriority)
+    .map(toStatusBarItemModel);
+
+  return [
+    ...(leftItems.length > 0
+      ? [
+          {
+            align: 'start' as const,
+            id: 'extension-status-left',
+            items: leftItems,
+          },
+        ]
+      : []),
+    ...(rightItems.length > 0
+      ? [
+          {
+            align: 'end' as const,
+            id: 'extension-status-right',
+            items: rightItems,
+          },
+        ]
+      : []),
+  ];
+}
+
 export function createDefaultWorkbenchStatusSections({
   dependencyDiagnostics,
   extensionCount,

package/src/shell/secondary-actions.tsx

@@ -11,6 +11,10 @@ export interface WorkbenchSecondaryActivityItemsInput {
   isProfileOpen: boolean;
   isSettingsOpen: boolean;
   showSettings?: boolean | undefined;
+  /** Resolved chrome labels (defaults match English kit copy). */
+  profileLabel?: string | undefined;
+  profileTitle?: string | undefined;
+  settingsLabel?: string | undefined;
 }
 
 export function createWorkbenchSecondaryActivityItems({
@@ -18,6 +22,9 @@ export function createWorkbenchSecondaryActivityItems({
   isProfileOpen,
   isSettingsOpen,
   showSettings = true,
+  profileLabel = 'Profile',
+  profileTitle = 'Open profile',
+  settingsLabel = 'Settings',
 }: WorkbenchSecondaryActivityItemsInput): ActivityBarItem[] {
   return [
     ...(hasProfile
@@ -26,8 +33,8 @@ export function createWorkbenchSecondaryActivityItems({
             active: isProfileOpen,
             icon: <i aria-hidden="true" className="codicon codicon-account" />,
             id: WORKBENCH_PROFILE_ACTIVITY_ITEM_ID,
-            label: 'Profile',
-            title: 'Open profile',
+            label: profileLabel,
+            title: profileTitle,
           },
         ]
       : []),
@@ -37,7 +44,7 @@ export function createWorkbenchSecondaryActivityItems({
             active: isSettingsOpen,
             icon: <i aria-hidden="true" className="codicon codicon-settings-gear" />,
             id: WORKBENCH_SETTINGS_ACTIVITY_ITEM_ID,
-            label: 'Settings',
+            label: settingsLabel,
           },
         ]
       : []),

package/src/shell/shell.tsx

@@ -35,6 +35,11 @@ import {
   sortActivityBarItems,
 } from '@workbench-kit/react/workbench/activityBarOrder';
 import { useWorkbench } from './provider.js';
+import {
+  resolveWorkbenchShellChromeLabels,
+  type WorkbenchShellChromeLabels,
+  type WorkbenchTranslate,
+} from './chrome-labels.js';
 import { WorkbenchCommandHost, type WorkbenchCommandHostProps } from '../workbench/command-host.js';
 import {
   MANAGE_ACCOUNTS_COMMAND_ID,
@@ -60,10 +65,12 @@ import {
 import { SETTINGS_EXTENSION_ID, WORKBENCH_PREFERENCE_SCOPES } from './settings-constants.js';
 import { createSettingsCategories, type WorkbenchThemeOption } from './settings.js';
 import {
+  createContributedWorkbenchStatusSections,
   createDefaultWorkbenchStatusSections,
   createWorkbenchShellActivityItems,
 } from './model.js';
-import { renderDefaultPrimarySidebar } from './view-host.js';
+import { mergeWorkbenchStatusSections } from '../workbench/status-sections.js';
+import { renderDefaultBottomPanel, renderDefaultPrimarySidebar } from './view-host.js';
 import { WorkbenchShellTitleBarLayoutControls } from './titlebar-layout-controls.js';
 import { WorkbenchProfileModal, type WorkbenchProfileInput } from '../workbench/profile-modal.js';
 import { useContextKeyRevision } from '../commands/use-context-key-revision.js';
@@ -102,6 +109,11 @@ export interface WorkbenchShellProps {
   editorArea?: ReactNode;
   helpContent?: ReactNode;
   helpTitle?: ReactNode;
+  /**
+   * Partial chrome label overrides for ActivityBar / StatusBar / secondary items /
+   * command palette. Wins over `t` when both are set for the same key.
+   */
+  labels?: Partial<WorkbenchShellChromeLabels> | undefined;
   lightPreset?: string | undefined;
   onDarkPresetChange?: ((preset: string) => void) | undefined;
   onLightPresetChange?: ((preset: string) => void) | undefined;
@@ -116,6 +128,11 @@ export interface WorkbenchShellProps {
   rootClassName?: string;
   shellPreset?: string | undefined;
   statusSections?: StatusBarSectionModel[];
+  /**
+   * Optional `t(key, fallback)` injection for shell chrome strings.
+   * Missing `t` keeps English defaults from `resolveWorkbenchShellChromeLabels`.
+   */
+  t?: WorkbenchTranslate | undefined;
   theme?: string;
   themeOptions?: readonly WorkbenchThemeOption[] | undefined;
   title?: ReactNode;
@@ -148,6 +165,7 @@ export function WorkbenchShell({
   editorArea,
   helpContent,
   helpTitle = 'Workbench Help',
+  labels: labelOverrides,
   lightPreset,
   locale = 'en',
   onDarkPresetChange,
@@ -162,6 +180,7 @@ export function WorkbenchShell({
   rootClassName,
   shellPreset = DEFAULT_SHELL_PRESET,
   statusSections,
+  t,
   theme,
   themeOptions,
   title = 'Workbench',
@@ -210,15 +229,20 @@ export function WorkbenchShell({
   const resolvedStatusSections = useMemo(
     () =>
       statusSections ??
-      createDefaultWorkbenchStatusSections({
-        dependencyDiagnostics: extensionRegistry.getDependencyDiagnostics(),
-        extensionCount: extensionRegistry.getExtensions().length,
-        missingExtensionIds,
-        profile,
-      }),
+      mergeWorkbenchStatusSections(
+        createDefaultWorkbenchStatusSections({
+          dependencyDiagnostics: extensionRegistry.getDependencyDiagnostics(),
+          extensionCount: extensionRegistry.getExtensions().length,
+          missingExtensionIds,
+          profile,
+        }),
+        createContributedWorkbenchStatusSections(extensionRegistry.statusBar.getStatusBarItems()),
+      ),
     [extensionRegistry, missingExtensionIds, profile, statusSections],
   );
   const activeViewContainerId = layout.sideBar.activeViewContainer;
+  const activePanelViewContainerId = layout.panel.activeViewContainer;
+  const panelViewContainers = extensionRegistry.views.getViewContainers('panel');
   const visibleActivities = useMemo(
     () =>
       filterActivitiesByWhenClause(
@@ -231,7 +255,7 @@ export function WorkbenchShell({
     createWorkbenchShellActivityItems({
       activeViewContainerId,
       activities: visibleActivities,
-      viewContainers: extensionRegistry.views.getViewContainers(),
+      viewContainers: extensionRegistry.views.getViewContainers('activitybar'),
       views: extensionRegistry.views.getViews(),
     }),
     layout.activityBar.itemOrder,
@@ -243,11 +267,18 @@ export function WorkbenchShell({
   const canOpenSettingsValue = contextKeyService.get(
     WORKBENCH_PERMISSION_CONTEXT_KEY_CAN_OPEN_SETTINGS,
   );
+  const chromeLabels = useMemo(
+    () => resolveWorkbenchShellChromeLabels(labelOverrides, t),
+    [labelOverrides, t],
+  );
   const secondaryActivityItems = createWorkbenchSecondaryActivityItems({
     hasProfile: profile !== undefined,
     isProfileOpen,
     isSettingsOpen,
     showSettings: canOpenSettingsValue !== false,
+    profileLabel: chromeLabels.profileLabel,
+    profileTitle: chromeLabels.profileTitle,
+    settingsLabel: chromeLabels.settingsLabel,
   });
 
   useEffect(() => {
@@ -260,6 +291,20 @@ export function WorkbenchShell({
       layoutService.setActiveViewContainer(visibleActivityItems[0]?.id);
     }
   }, [activeViewContainerId, layoutService, visibleActivityItems]);
+
+  useEffect(() => {
+    if (panelViewContainers.length === 0) {
+      return;
+    }
+
+    const panelContainerIds = new Set(panelViewContainers.map((container) => container.id));
+    if (
+      activePanelViewContainerId === undefined ||
+      !panelContainerIds.has(activePanelViewContainerId)
+    ) {
+      layoutService.setActivePanelViewContainer(panelViewContainers[0]?.id);
+    }
+  }, [activePanelViewContainerId, layoutService, panelViewContainers]);
   const settingsCategories = useMemo(() => {
     const managementCategories: WorkbenchSettingsCategory[] = [];
 
@@ -389,6 +434,16 @@ export function WorkbenchShell({
     }
   }, [activeViewContainerId, extensionRegistry, forceRender]);
 
+  useEffect(() => {
+    if (!activePanelViewContainerId) {
+      return;
+    }
+
+    for (const view of extensionRegistry.views.getViews(activePanelViewContainerId)) {
+      void extensionRegistry.activateView(view.id).then(forceRender);
+    }
+  }, [activePanelViewContainerId, extensionRegistry, forceRender]);
+
   useEffect(() => {
     if (extensionRegistry.capabilityRegistry.has(WORKBENCH_SETTINGS_CAPABILITY_ID)) {
       return undefined;
@@ -429,6 +484,17 @@ export function WorkbenchShell({
     return {
       ...hostProps,
       additionalCommands,
+      commandPaletteCloseLabel:
+        hostProps.commandPaletteCloseLabel ?? chromeLabels.commandPaletteCloseLabel,
+      commandPaletteEmptyLabel:
+        hostProps.commandPaletteEmptyLabel ?? chromeLabels.commandPaletteEmptyLabel,
+      commandPalettePlaceholder:
+        hostProps.commandPalettePlaceholder ?? chromeLabels.commandPalettePlaceholder,
+      commandPaletteTitle: hostProps.commandPaletteTitle ?? chromeLabels.commandPaletteTitle,
+      quickOpenCloseLabel: hostProps.quickOpenCloseLabel ?? chromeLabels.quickOpenCloseLabel,
+      quickOpenEmptyLabel: hostProps.quickOpenEmptyLabel ?? chromeLabels.quickOpenEmptyLabel,
+      quickOpenPlaceholder: hostProps.quickOpenPlaceholder ?? chromeLabels.quickOpenPlaceholder,
+      quickOpenTitle: hostProps.quickOpenTitle ?? chromeLabels.quickOpenTitle,
       onRunCommand: (command, context) => {
         if (command.id === MANAGE_COMMANDS_COMMAND_ID) {
           layoutService.setActiveViewContainer(BUILTIN_COMMANDS_VIEW_CONTAINER_ID);
@@ -455,7 +521,7 @@ export function WorkbenchShell({
         return hostProps.onRunCommand?.(command, context) ?? false;
       },
     };
-  }, [commandHost, layoutService]);
+  }, [chromeLabels, commandHost, layoutService]);
 
   const handleStatusItemActivate = useCallback(
     (item: StatusBarItemModel) => {
@@ -473,14 +539,28 @@ export function WorkbenchShell({
         return;
       }
 
+      const contributed = extensionRegistry.statusBar.getStatusBarItem(item.id);
+      if (contributed?.command) {
+        void executeCommand(contributed.command).catch(() => undefined);
+        return;
+      }
+
       onStatusItemActivate?.(item);
     },
-    [accountManagement, onStatusItemActivate, profile, showProfileModal],
+    [
+      accountManagement,
+      executeCommand,
+      extensionRegistry,
+      onStatusItemActivate,
+      profile,
+      showProfileModal,
+    ],
   );
 
   return (
     <ReactWorkbenchShell
       activityBar={{
+        'aria-label': chromeLabels.activityBarAriaLabel,
         visible: layout.activityBar.visible,
         items: visibleActivityItems,
         reorderable: true,
@@ -506,6 +586,7 @@ export function WorkbenchShell({
         },
       }}
       compactStatus={compactStatus}
+      statusBarAriaLabel={chromeLabels.statusBarAriaLabel}
       onStatusItemActivate={handleStatusItemActivate}
       primarySidebar={{
         isVisible: layout.sideBar.visible,
@@ -536,7 +617,20 @@ export function WorkbenchShell({
       }}
       bottomPanel={{
         isVisible: layout.panel.visible,
-        node: <section aria-label="Panel" className="workbench-bottom-panel" />,
+        node: renderDefaultBottomPanel(extensionRegistry, activePanelViewContainerId, {
+          catalogTrustPolicy,
+          catalogUrl,
+          onActiveViewContainerChange: (viewContainerId) => {
+            layoutService.setActivePanelViewContainer(viewContainerId);
+            if (!layout.panel.visible) {
+              layoutService.setPanelVisible(true);
+            }
+          },
+        }),
+        onSizePercentChange: (sizePercent) => {
+          layoutService.setPanelSizePercent(sizePercent);
+        },
+        sizePercent: layout.panel.sizePercent,
       }}
       rootClassName={rootClassName}
       secondaryArea={resolvedEditorArea}
@@ -563,7 +657,7 @@ export function WorkbenchShell({
               footer={<Button onClick={() => setSettingsOpen(false)}>Close</Button>}
               scopes={[...WORKBENCH_PREFERENCE_SCOPES]}
               searchValue={settingsSearchValue}
-              title="Settings"
+              title={chromeLabels.settingsLabel}
               titleSuffix={
                 <Badge variant="muted">
                   {settingsContributionCount === 1

package/src/shell/view-host.tsx

@@ -56,6 +56,79 @@ export function renderDefaultPrimarySidebar(
   );
 }
 
+export function renderDefaultBottomPanel(
+  extensionRegistry: Pick<ExtensionRegistry, 'viewHostFactories' | 'views'>,
+  activeViewContainerId: string | undefined,
+  options: {
+    catalogTrustPolicy?: ExtensionCatalogTrustPolicy | undefined;
+    catalogUrl?: string | undefined;
+    onActiveViewContainerChange?: ((viewContainerId: string) => void) | undefined;
+  } = {},
+) {
+  const containers = extensionRegistry.views.getViewContainers('panel');
+  if (containers.length === 0) {
+    return (
+      <section aria-label="Panel" className="workbench-bottom-panel">
+        <div className="workbench-bottom-panel__empty">No panel views contributed.</div>
+      </section>
+    );
+  }
+
+  const resolvedActiveViewContainerId =
+    activeViewContainerId !== undefined &&
+    containers.some((container) => container.id === activeViewContainerId)
+      ? activeViewContainerId
+      : containers[0]?.id;
+  const views = resolvedActiveViewContainerId
+    ? extensionRegistry.views.getViews(resolvedActiveViewContainerId)
+    : [];
+
+  return (
+    <section aria-label="Panel" className="workbench-bottom-panel">
+      <div className="workbench-bottom-panel__header" role="tablist" aria-label="Panel views">
+        {containers.map((container) => {
+          const isActive = container.id === resolvedActiveViewContainerId;
+          return (
+            <button
+              key={container.id}
+              type="button"
+              role="tab"
+              aria-selected={isActive}
+              className={
+                isActive
+                  ? 'workbench-bottom-panel__tab workbench-bottom-panel__tab--active'
+                  : 'workbench-bottom-panel__tab'
+              }
+              data-panel-view-container-id={container.id}
+              onClick={() => options.onActiveViewContainerChange?.(container.id)}
+            >
+              {container.title}
+            </button>
+          );
+        })}
+      </div>
+      <div className="workbench-bottom-panel__body">
+        {views.length === 0 ? (
+          <div className="workbench-bottom-panel__empty">No views in this panel container.</div>
+        ) : (
+          views.map((view) => (
+            <section key={view.id} data-view-id={view.id} className="workbench-bottom-panel__view">
+              <WorkbenchViewHost
+                catalogTrustPolicy={options.catalogTrustPolicy}
+                catalogUrl={options.catalogUrl}
+                fallback={view.name}
+                provider={extensionRegistry.views.getViewProvider(view.id)}
+                viewHostFactories={extensionRegistry.viewHostFactories}
+                viewId={view.id}
+              />
+            </section>
+          ))
+        )}
+      </div>
+    </section>
+  );
+}
+
 export function WorkbenchViewHost({
   catalogTrustPolicy,
   catalogUrl,

package/src/storage/local-json-storage.ts

@@ -0,0 +1,66 @@
+import {
+  createBrowserWorkbenchStorage,
+  type WorkbenchStorageAdapter,
+  type WorkbenchStorageReader,
+  type WorkbenchStorageWriter,
+} from '@workbench-kit/workbench-core';
+
+export function resolveLocalWorkbenchStorage<
+  TStorage extends WorkbenchStorageReader | WorkbenchStorageWriter = WorkbenchStorageAdapter,
+>(storage?: TStorage): TStorage | WorkbenchStorageAdapter | undefined {
+  return storage ?? createBrowserWorkbenchStorage({ kind: 'local' });
+}
+
+export function readLocalJsonStorage<T>(
+  storageKey: string,
+  parse: (value: unknown) => T,
+  fallback: () => T,
+  storage?: WorkbenchStorageReader,
+): T {
+  const resolvedStorage = resolveLocalWorkbenchStorage(storage);
+  if (!resolvedStorage) {
+    return fallback();
+  }
+
+  try {
+    const raw = resolvedStorage.getItem(storageKey);
+    if (!raw) {
+      return fallback();
+    }
+
+    return parse(JSON.parse(raw) as unknown);
+  } catch {
+    return fallback();
+  }
+}
+
+export function writeLocalJsonStorage<T>(
+  storageKey: string,
+  value: T,
+  storage?: WorkbenchStorageWriter,
+  options: {
+    readonly errorMode?: 'ignore' | 'throw';
+    readonly toStorageValue?: (value: T) => unknown;
+  } = {},
+): void {
+  const resolvedStorage = resolveLocalWorkbenchStorage(storage);
+  if (!resolvedStorage) {
+    return;
+  }
+
+  try {
+    resolvedStorage.setItem(
+      storageKey,
+      JSON.stringify((options.toStorageValue ?? identity)(value), null, 2),
+    );
+  } catch (error) {
+    if (options.errorMode === 'throw') {
+      throw error;
+    }
+    // Local storage is best-effort; quota, security, and serialization errors stay non-fatal.
+  }
+}
+
+function identity<T>(value: T): T {
+  return value;
+}

package/src/workbench/appearance-storage.ts

@@ -7,11 +7,16 @@ import {
   type WorkbenchColorSchemePreference,
 } from '@workbench-kit/react/workbench';
 import {
-  createBrowserWorkbenchStorage,
   type WorkbenchStorageReader,
   type WorkbenchStorageWriter,
 } from '@workbench-kit/workbench-core';
 
+import {
+  readLocalJsonStorage,
+  resolveLocalWorkbenchStorage,
+  writeLocalJsonStorage,
+} from '../storage/local-json-storage.js';
+
 export type { WorkbenchAppearanceSettings } from '@workbench-kit/react/workbench/themePresets';
 
 export const DEFAULT_WORKBENCH_APPEARANCE_STORAGE_KEY = 'workbench-kit/.workbench/appearance';
@@ -24,28 +29,19 @@ export const DEFAULT_WORKBENCH_APPEARANCE: WorkbenchAppearanceSettings = {
 };
 
 export function isWorkbenchAppearancePersistenceAvailable(): boolean {
-  return createBrowserWorkbenchStorage({ kind: 'local' }) !== undefined;
+  return resolveLocalWorkbenchStorage() !== undefined;
 }
 
 export function readPersistedWorkbenchAppearance(
   storageKey = DEFAULT_WORKBENCH_APPEARANCE_STORAGE_KEY,
   storage?: WorkbenchStorageReader,
 ): WorkbenchAppearanceSettings {
-  const resolvedStorage = storage ?? createBrowserWorkbenchStorage({ kind: 'local' });
-  if (!resolvedStorage) {
-    return DEFAULT_WORKBENCH_APPEARANCE;
-  }
-
-  try {
-    const raw = resolvedStorage.getItem(storageKey);
-    if (!raw) {
-      return DEFAULT_WORKBENCH_APPEARANCE;
-    }
-
-    return normalizeWorkbenchAppearance(JSON.parse(raw) as unknown);
-  } catch {
-    return DEFAULT_WORKBENCH_APPEARANCE;
-  }
+  return readLocalJsonStorage(
+    storageKey,
+    normalizeWorkbenchAppearance,
+    () => DEFAULT_WORKBENCH_APPEARANCE,
+    storage,
+  );
 }
 
 export function writePersistedWorkbenchAppearance(
@@ -53,16 +49,7 @@ export function writePersistedWorkbenchAppearance(
   storageKey = DEFAULT_WORKBENCH_APPEARANCE_STORAGE_KEY,
   storage?: WorkbenchStorageWriter,
 ): void {
-  const resolvedStorage = storage ?? createBrowserWorkbenchStorage({ kind: 'local' });
-  if (!resolvedStorage) {
-    return;
-  }
-
-  try {
-    resolvedStorage.setItem(storageKey, JSON.stringify(settings, null, 2));
-  } catch {
-    // Ignore quota and security errors so the shell keeps working offline.
-  }
+  writeLocalJsonStorage(storageKey, settings, storage);
 }
 
 function normalizeWorkbenchAppearance(value: unknown): WorkbenchAppearanceSettings {