@workbench-kit/shell-react 0.0.2-prototype.0.2.33 → 0.0.2-prototype.0.2.34

package/src/shell/provider.tsx

@@ -13,7 +13,7 @@ import {
   createEditorService,
   ExtensionRegistry,
   LayoutService,
-  loadInstalledExtensions,
+  loadInstalledExtensionsResult,
   mergeExtensionsConfigWithInstallState,
   PreferenceService,
   registerEditorSaveCommand,
@@ -25,9 +25,18 @@ import {
   verifyWorkbenchExtensionsAgainstLock,
   type EditorState,
   type EditorService,
+  type ActivityRegistry,
+  type ConfigurationRegistry,
   type ExtensionIntegrityMode,
+  type LocalizationRegistry,
+  type MenuRegistry,
   type PreferenceService as PreferenceServiceType,
+  type StatusBarRegistry,
+  type ThemeRegistry,
+  type ViewRegistry,
+  type ViewHostFactoryRegistry,
   type WorkbenchHostThemeRegistration,
+  type WorkbenchPersistenceDiagnosticHandler,
   type WorkbenchStorageAdapter,
   type WorkbenchEditorSavePort,
   type WorkbenchExtensionDescription,
@@ -37,7 +46,9 @@ import {
 import {
   ContextKeyService,
   createWorkbenchPermissionContextKeys,
+  type CommandRegistry,
   type ContextKeyValue,
+  type KeybindingRegistry,
 } from '@workbench-kit/platform';
 import type {
   WorkbenchExtensionsConfig,
@@ -49,20 +60,20 @@ import type {
 import {
   DEFAULT_WORKBENCH_LAYOUT_STORAGE_KEY,
   isWorkbenchLayoutPersistenceAvailable,
-  resolvePersistedWorkbenchLayout,
-  writePersistedWorkbenchLayout,
+  resolvePersistedWorkbenchLayoutResult,
+  writePersistedWorkbenchLayoutResult,
 } from '../workbench/layout-storage.js';
 import {
   DEFAULT_WORKBENCH_EDITOR_STATE_STORAGE_KEY,
   isWorkbenchEditorStatePersistenceAvailable,
-  readPersistedEditorState,
-  writePersistedEditorState,
+  readPersistedEditorStateResult,
+  writePersistedEditorStateResult,
 } from '../editor/state-storage.js';
 import {
   DEFAULT_WORKBENCH_KEYBINDING_STORAGE_KEY,
   isWorkbenchKeybindingPersistenceAvailable,
-  readPersistedKeybindingOverrides,
-  writePersistedKeybindingOverrides,
+  readPersistedKeybindingOverridesResult,
+  writePersistedKeybindingOverridesResult,
 } from '../management/keybinding-overrides-storage.js';
 import {
   BUILTIN_EXPLORER_VIEW_CONTAINER_ID,
@@ -73,11 +84,29 @@ import {
   BUILTIN_EXTENSIONS_FOCUS_COMMAND_ID,
   BUILTIN_EXTENSIONS_VIEW_CONTAINER_ID,
 } from '../extensions/view-data.js';
+import {
+  createWorkbenchExtensionActivationAccess,
+  createWorkbenchExtensionActivationStateReader,
+  createWorkbenchExtensionCatalogReader,
+  createWorkbenchSettingsCapabilityPublisher,
+  type WorkbenchExtensionActivationAccess,
+  type WorkbenchExtensionActivationStateReader,
+  type WorkbenchExtensionCatalogReader,
+  type WorkbenchSettingsCapabilityPublisher,
+} from './focused-extension-services.js';
+
+export type {
+  WorkbenchExtensionActivationAccess,
+  WorkbenchExtensionActivationStateReader,
+  WorkbenchExtensionCatalogReader,
+  WorkbenchSettingsCapabilityPublication,
+  WorkbenchSettingsCapabilityPublisher,
+} from './focused-extension-services.js';
 import {
   DEFAULT_WORKBENCH_LOCAL_PREFERENCE_STORAGE_KEY,
   isWorkbenchLocalPreferencePersistenceAvailable,
-  readPersistedLocalPreferences,
-  writePersistedLocalPreferences,
+  readPersistedLocalPreferencesResult,
+  writePersistedLocalPreferencesResult,
 } from '../management/preference-settings-storage.js';
 import { registerWorkbenchUserCommands } from '../workbench/user-commands.js';
 import { EditorWorkspaceReconciler } from '../editor/workspace-reconcile.js';
@@ -86,6 +115,15 @@ import {
   type EditorDocumentViewProvider,
 } from '../editor/view-providers.js';
 import type { EditorDocumentViewProviderRegistry } from '@workbench-kit/workbench-core';
+import { ExtensionEnablementController } from '../extensions/extension-enablement-controller.js';
+import { ExtensionEnablementContext } from '../extensions/extension-enablement-context.js';
+import {
+  reportPersistenceWriteResult,
+  reportPersistenceDiagnostic,
+  usePersistenceDiagnosticHandlerRef,
+  useReportPersistenceReadDiagnostic,
+} from '../storage/persistence-diagnostics.js';
+import { WorkbenchPersistenceDiagnosticContext } from './persistence-diagnostic-context.js';
 
 export interface WorkbenchWorkspaceHostPort extends WorkbenchEditorSavePort {
   readonly capabilityId?: string | undefined;
@@ -134,6 +172,7 @@ export interface WorkbenchProviderProps {
   localPreferenceStorageKey?: string;
   onKeybindingOverridesChange?:
     ((overrides: readonly WorkbenchKeybindingDefinition[]) => void) | undefined;
+  onPersistenceDiagnostic?: WorkbenchPersistenceDiagnosticHandler | undefined;
   persistEditorState?: boolean;
   persistKeybindingOverrides?: boolean;
   persistLayout?: boolean;
@@ -146,20 +185,33 @@ export interface WorkbenchProviderProps {
 
 export interface WorkbenchContextValue {
   activateCommand(commandId: string): Promise<readonly { readonly extensionId: string }[]>;
+  activities: ActivityRegistry;
   availableExtensions: readonly WorkbenchExtensionDescription[];
+  commands: CommandRegistry;
+  configurations: ConfigurationRegistry;
   contextKeyService: ContextKeyService;
   editorDocumentViewProviders: EditorDocumentViewProviderRegistry;
   editorService: EditorService;
   executeCommand(commandId: string, ...args: unknown[]): Promise<unknown>;
-  extensionRegistry: ExtensionRegistry;
+  extensionActivation: WorkbenchExtensionActivationAccess;
+  extensionActivationState: WorkbenchExtensionActivationStateReader;
+  extensionCatalog: WorkbenchExtensionCatalogReader;
   installedExtensionsStorage?: WorkbenchStorageAdapter;
   installedExtensionsStorageKey: string;
+  keybindings: KeybindingRegistry;
   keybindingOverrides: readonly WorkbenchKeybindingDefinition[];
   layoutService: LayoutService;
+  localizations: LocalizationRegistry;
+  menus: MenuRegistry;
   missingExtensionIds: readonly string[];
   preferenceService: PreferenceServiceType;
   resetCommandKeybindingOverride(commandId: string): void;
   setCommandKeybindingOverride(commandId: string, key: string): void;
+  settingsCapabilityPublisher: WorkbenchSettingsCapabilityPublisher;
+  statusBar: StatusBarRegistry;
+  themes: ThemeRegistry;
+  viewHostFactories: ViewHostFactoryRegistry;
+  views: ViewRegistry;
   waitForExtensionStartup(): Promise<void>;
   workspaceHostPort?: WorkbenchWorkspaceHostPort | undefined;
 }
@@ -170,6 +222,7 @@ interface WorkbenchProviderServices {
   dispose(): void;
   editorDocumentViewProviders: EditorDocumentViewProviderRegistry;
   editorService: EditorService;
+  extensionEnablement: ExtensionEnablementController;
   extensionRegistry: ExtensionRegistry;
   layoutService: LayoutService;
   missingExtensionIds: readonly string[];
@@ -183,8 +236,50 @@ interface DeferredProviderDispose {
   readonly timeout: ReturnType<typeof setTimeout>;
 }
 
+interface KeybindingOverridesState {
+  readonly initialOverrides: readonly WorkbenchKeybindingDefinition[] | undefined;
+  readonly overrides: readonly WorkbenchKeybindingDefinition[];
+  readonly shouldPersist: boolean;
+  readonly storage: WorkbenchStorageAdapter | undefined;
+  readonly storageKey: string;
+  readonly writeEligible: boolean;
+}
+
 const WorkbenchContext = createContext<WorkbenchContextValue | undefined>(undefined);
 
+function isKeybindingStateCurrent(
+  state: KeybindingOverridesState,
+  initialOverrides: readonly WorkbenchKeybindingDefinition[] | undefined,
+  shouldPersist: boolean,
+  storage: WorkbenchStorageAdapter | undefined,
+  storageKey: string,
+): boolean {
+  return (
+    state.initialOverrides === initialOverrides &&
+    state.shouldPersist === shouldPersist &&
+    state.storage === storage &&
+    state.storageKey === storageKey
+  );
+}
+
+function createKeybindingOverridesState(
+  initialOverrides: readonly WorkbenchKeybindingDefinition[] | undefined,
+  resolvedOverrides: readonly WorkbenchKeybindingDefinition[],
+  readFailed: boolean,
+  shouldPersist: boolean,
+  storage: WorkbenchStorageAdapter | undefined,
+  storageKey: string,
+): KeybindingOverridesState {
+  return {
+    initialOverrides,
+    overrides: resolvedOverrides,
+    shouldPersist,
+    storage,
+    storageKey,
+    writeEligible: initialOverrides !== undefined || !readFailed,
+  };
+}
+
 function createInitialContextKeyService(
   contextKeyValues: Readonly<Record<string, ContextKeyValue>> | undefined,
 ): ContextKeyService {
@@ -228,6 +323,7 @@ export function WorkbenchProvider({
   localPreferenceStorage,
   localPreferenceStorageKey = DEFAULT_WORKBENCH_LOCAL_PREFERENCE_STORAGE_KEY,
   onKeybindingOverridesChange,
+  onPersistenceDiagnostic,
   persistEditorState,
   persistKeybindingOverrides,
   persistLayout,
@@ -249,32 +345,37 @@ export function WorkbenchProvider({
   const shouldPersistLocalPreferences =
     persistLocalPreferences ??
     (localPreferenceStorage !== undefined || isWorkbenchLocalPreferencePersistenceAvailable());
-  const resolvedInitialLayout = useMemo(
+  const diagnosticHandlerRef = usePersistenceDiagnosticHandlerRef(onPersistenceDiagnostic);
+  const resolvedInitialLayoutResult = useMemo(
     () =>
-      resolvePersistedWorkbenchLayout(initialLayout, {
+      resolvePersistedWorkbenchLayoutResult(initialLayout, {
         persistLayout: shouldPersistLayout,
         storage: layoutStorage,
         storageKey: layoutStorageKey,
       }),
     [initialLayout, layoutStorage, layoutStorageKey, shouldPersistLayout],
   );
-  const resolvedInitialEditorState = useMemo(
+  const resolvedInitialLayout = resolvedInitialLayoutResult.value;
+  const resolvedInitialEditorStateResult = useMemo(
     () =>
-      initialEditorState ??
-      (shouldPersistEditorState
-        ? readPersistedEditorState(editorStateStorageKey, editorStateStorage)
-        : undefined),
+      initialEditorState !== undefined
+        ? { value: initialEditorState }
+        : shouldPersistEditorState
+          ? readPersistedEditorStateResult(editorStateStorageKey, editorStateStorage)
+          : { value: undefined },
     [editorStateStorage, editorStateStorageKey, initialEditorState, shouldPersistEditorState],
   );
-  const resolvedInitialKeybindingOverrides = useMemo(
+  const resolvedInitialEditorState = resolvedInitialEditorStateResult.value;
+  const resolvedInitialKeybindingOverridesResult = useMemo(
     () =>
-      initialKeybindingOverrides ??
-      (shouldPersistKeybindingOverrides
-        ? readPersistedKeybindingOverrides(
-            keybindingOverridesStorageKey,
-            keybindingOverridesStorage,
-          )
-        : []),
+      initialKeybindingOverrides !== undefined
+        ? { value: initialKeybindingOverrides }
+        : shouldPersistKeybindingOverrides
+          ? readPersistedKeybindingOverridesResult(
+              keybindingOverridesStorageKey,
+              keybindingOverridesStorage,
+            )
+          : { value: [] },
     [
       initialKeybindingOverrides,
       keybindingOverridesStorage,
@@ -282,9 +383,27 @@ export function WorkbenchProvider({
       shouldPersistKeybindingOverrides,
     ],
   );
-  const [keybindingOverrides, setKeybindingOverridesState] = useState(
-    resolvedInitialKeybindingOverrides,
+  const resolvedInitialKeybindingOverrides = resolvedInitialKeybindingOverridesResult.value;
+  const [keybindingState, setKeybindingState] = useState<KeybindingOverridesState>(() =>
+    createKeybindingOverridesState(
+      initialKeybindingOverrides,
+      resolvedInitialKeybindingOverrides,
+      resolvedInitialKeybindingOverridesResult.diagnostic !== undefined,
+      shouldPersistKeybindingOverrides,
+      keybindingOverridesStorage,
+      keybindingOverridesStorageKey,
+    ),
+  );
+  const keybindingStateIsCurrent = isKeybindingStateCurrent(
+    keybindingState,
+    initialKeybindingOverrides,
+    shouldPersistKeybindingOverrides,
+    keybindingOverridesStorage,
+    keybindingOverridesStorageKey,
   );
+  const keybindingOverrides = keybindingStateIsCurrent
+    ? keybindingState.overrides
+    : resolvedInitialKeybindingOverrides;
   const [contextKeyService] = useState(() => createInitialContextKeyService(contextKeyValues));
 
   useEffect(() => {
@@ -304,48 +423,168 @@ export function WorkbenchProvider({
   }, [contextKeyService, contextKeyValues]);
 
   useEffect(() => {
-    setKeybindingOverridesState(resolvedInitialKeybindingOverrides);
-  }, [resolvedInitialKeybindingOverrides]);
+    setKeybindingState((current) =>
+      isKeybindingStateCurrent(
+        current,
+        initialKeybindingOverrides,
+        shouldPersistKeybindingOverrides,
+        keybindingOverridesStorage,
+        keybindingOverridesStorageKey,
+      )
+        ? current
+        : createKeybindingOverridesState(
+            initialKeybindingOverrides,
+            resolvedInitialKeybindingOverrides,
+            resolvedInitialKeybindingOverridesResult.diagnostic !== undefined,
+            shouldPersistKeybindingOverrides,
+            keybindingOverridesStorage,
+            keybindingOverridesStorageKey,
+          ),
+    );
+  }, [
+    initialKeybindingOverrides,
+    keybindingOverridesStorage,
+    keybindingOverridesStorageKey,
+    resolvedInitialKeybindingOverrides,
+    resolvedInitialKeybindingOverridesResult.diagnostic,
+    shouldPersistKeybindingOverrides,
+  ]);
 
-  const setCommandKeybindingOverride = useCallback((commandId: string, key: string) => {
-    setKeybindingOverridesState((current) => {
-      const without = current.filter((binding) => binding.command !== commandId);
-      return [...without, { command: commandId, key }];
-    });
-  }, []);
+  const setCommandKeybindingOverride = useCallback(
+    (commandId: string, key: string) => {
+      setKeybindingState((current) => {
+        const currentOverrides = isKeybindingStateCurrent(
+          current,
+          initialKeybindingOverrides,
+          shouldPersistKeybindingOverrides,
+          keybindingOverridesStorage,
+          keybindingOverridesStorageKey,
+        )
+          ? current.overrides
+          : resolvedInitialKeybindingOverrides;
+        const without = currentOverrides.filter((binding) => binding.command !== commandId);
+        return {
+          initialOverrides: initialKeybindingOverrides,
+          overrides: [...without, { command: commandId, key }],
+          shouldPersist: shouldPersistKeybindingOverrides,
+          storage: keybindingOverridesStorage,
+          storageKey: keybindingOverridesStorageKey,
+          writeEligible: true,
+        };
+      });
+    },
+    [
+      initialKeybindingOverrides,
+      keybindingOverridesStorage,
+      keybindingOverridesStorageKey,
+      resolvedInitialKeybindingOverrides,
+      shouldPersistKeybindingOverrides,
+    ],
+  );
 
-  const resetCommandKeybindingOverride = useCallback((commandId: string) => {
-    setKeybindingOverridesState((current) =>
-      current.filter((binding) => binding.command !== commandId),
-    );
-  }, []);
+  const resetCommandKeybindingOverride = useCallback(
+    (commandId: string) => {
+      setKeybindingState((current) => {
+        const currentOverrides = isKeybindingStateCurrent(
+          current,
+          initialKeybindingOverrides,
+          shouldPersistKeybindingOverrides,
+          keybindingOverridesStorage,
+          keybindingOverridesStorageKey,
+        )
+          ? current.overrides
+          : resolvedInitialKeybindingOverrides;
+        return {
+          initialOverrides: initialKeybindingOverrides,
+          overrides: currentOverrides.filter((binding) => binding.command !== commandId),
+          shouldPersist: shouldPersistKeybindingOverrides,
+          storage: keybindingOverridesStorage,
+          storageKey: keybindingOverridesStorageKey,
+          writeEligible: true,
+        };
+      });
+    },
+    [
+      initialKeybindingOverrides,
+      keybindingOverridesStorage,
+      keybindingOverridesStorageKey,
+      resolvedInitialKeybindingOverrides,
+      shouldPersistKeybindingOverrides,
+    ],
+  );
 
   useEffect(() => {
-    onKeybindingOverridesChange?.(keybindingOverrides);
-    if (!shouldPersistKeybindingOverrides) {
+    if (!keybindingStateIsCurrent) {
       return;
     }
 
-    writePersistedKeybindingOverrides(
-      keybindingOverrides,
-      keybindingOverridesStorageKey,
-      keybindingOverridesStorage,
+    onKeybindingOverridesChange?.(keybindingState.overrides);
+    if (!shouldPersistKeybindingOverrides || !keybindingState.writeEligible) {
+      return;
+    }
+
+    reportPersistenceWriteResult(
+      writePersistedKeybindingOverridesResult(
+        keybindingState.overrides,
+        keybindingOverridesStorageKey,
+        keybindingOverridesStorage,
+      ),
+      diagnosticHandlerRef,
     );
   }, [
-    keybindingOverrides,
+    diagnosticHandlerRef,
+    keybindingState,
+    keybindingStateIsCurrent,
     keybindingOverridesStorage,
     keybindingOverridesStorageKey,
     onKeybindingOverridesChange,
     shouldPersistKeybindingOverrides,
   ]);
 
-  const resolvedInitialLocalPreferences = useMemo(
+  const resolvedInitialLocalPreferencesResult = useMemo(
     () =>
       shouldPersistLocalPreferences
-        ? readPersistedLocalPreferences(localPreferenceStorageKey, localPreferenceStorage)
-        : {},
+        ? readPersistedLocalPreferencesResult(localPreferenceStorageKey, localPreferenceStorage)
+        : { value: {} },
     [localPreferenceStorage, localPreferenceStorageKey, shouldPersistLocalPreferences],
   );
+  const resolvedInitialLocalPreferences = resolvedInitialLocalPreferencesResult.value;
+  const installedExtensionsReadResult = useMemo(
+    () => loadInstalledExtensionsResult(installedExtensionsStorageKey, installedExtensionsStorage),
+    [installedExtensionsStorage, installedExtensionsStorageKey],
+  );
+  const installedExtensionRecords = installedExtensionsReadResult.value;
+
+  useReportPersistenceReadDiagnostic(
+    resolvedInitialLayoutResult.diagnostic,
+    [initialLayout, layoutStorage, layoutStorageKey, shouldPersistLayout],
+    diagnosticHandlerRef,
+  );
+  useReportPersistenceReadDiagnostic(
+    resolvedInitialEditorStateResult.diagnostic,
+    [initialEditorState, editorStateStorage, editorStateStorageKey, shouldPersistEditorState],
+    diagnosticHandlerRef,
+  );
+  useReportPersistenceReadDiagnostic(
+    resolvedInitialKeybindingOverridesResult.diagnostic,
+    [
+      initialKeybindingOverrides,
+      keybindingOverridesStorage,
+      keybindingOverridesStorageKey,
+      shouldPersistKeybindingOverrides,
+    ],
+    diagnosticHandlerRef,
+  );
+  useReportPersistenceReadDiagnostic(
+    resolvedInitialLocalPreferencesResult.diagnostic,
+    [localPreferenceStorage, localPreferenceStorageKey, shouldPersistLocalPreferences],
+    diagnosticHandlerRef,
+  );
+  useReportPersistenceReadDiagnostic(
+    installedExtensionsReadResult.diagnostic,
+    [installedExtensionsStorage, installedExtensionsStorageKey],
+    diagnosticHandlerRef,
+  );
 
   const services = useMemo<WorkbenchProviderServices>(() => {
     const extensionRegistry = new ExtensionRegistry();
@@ -366,10 +605,7 @@ export function WorkbenchProvider({
       initialState: resolvedInitialEditorState,
       resolveEditorResource: workspaceHostPort?.resolveResource?.bind(workspaceHostPort),
     });
-    const installedRecords = loadInstalledExtensions(
-      installedExtensionsStorageKey,
-      installedExtensionsStorage,
-    );
+    const installedRecords = installedExtensionRecords;
     const baseExtensionsConfig =
       extensionsConfig ??
       ({
@@ -396,7 +632,26 @@ export function WorkbenchProvider({
         console.warn(`[workbench-kit] ${diagnostic.message}`);
       }
     }
-    const extensionDisposables = extensionRegistry.registerExtensions(integrity.accepted);
+    const extensionRegistrations = extensionRegistry.registerExtensions(integrity.accepted);
+    const availableIntegrity = verifyWorkbenchExtensionsAgainstLock(
+      resolvedAvailableExtensions,
+      extensionsLock,
+      extensionIntegrityMode,
+    );
+    const extensionEnablement = new ExtensionEnablementController({
+      availableExtensions: resolvedAvailableExtensions,
+      initialEnabledExtensions: integrity.accepted,
+      initialInstalledRecords: installedRecords,
+      installedExtensionsStorage,
+      installedExtensionsStorageKey,
+      integrityAcceptedExtensionIds: new Set(
+        availableIntegrity.accepted.map((description) => description.manifest.id),
+      ),
+      onPersistenceDiagnostic: (diagnostic) =>
+        reportPersistenceDiagnostic(diagnostic, diagnosticHandlerRef),
+      registrationLifetime: extensionRegistrations,
+      registry: extensionRegistry,
+    });
     const hostThemeDisposables = registerHostWorkbenchThemes(extensionRegistry.themes, hostThemes);
     const editorServiceCapabilityDisposable = extensionRegistry.capabilityRegistry.register({
       id: WORKBENCH_EDITOR_SERVICE_CAPABILITY_ID,
@@ -443,7 +698,7 @@ export function WorkbenchProvider({
         editorServiceCapabilityDisposable.dispose();
         workspaceHostCapabilityDisposable?.dispose();
         hostThemeDisposables.dispose();
-        extensionDisposables.dispose();
+        extensionEnablement.dispose();
         if (!workspaceHostCapabilityDisposable) {
           workspaceHostPort?.dispose?.();
         }
@@ -460,6 +715,7 @@ export function WorkbenchProvider({
       },
       editorDocumentViewProviders,
       editorService,
+      extensionEnablement,
       extensionRegistry,
       layoutService,
       missingExtensionIds: [
@@ -482,12 +738,14 @@ export function WorkbenchProvider({
     initialWorkspaceSettings,
     installedExtensionsStorage,
     installedExtensionsStorageKey,
+    installedExtensionRecords,
     resolvedInitialEditorState,
     resolvedInitialLayout,
     resolvedInitialLocalPreferences,
     userCommands,
     viewHostFactories,
     workspaceHostPort,
+    diagnosticHandlerRef,
   ]);
 
   useEffect(() => {
@@ -500,13 +758,22 @@ export function WorkbenchProvider({
         return;
       }
 
-      writePersistedWorkbenchLayout(state, layoutStorageKey, layoutStorage);
+      reportPersistenceWriteResult(
+        writePersistedWorkbenchLayoutResult(state, layoutStorageKey, layoutStorage),
+        diagnosticHandlerRef,
+      );
     });
 
     return () => {
       disposable.dispose();
     };
-  }, [layoutStorage, layoutStorageKey, services.layoutService, shouldPersistLayout]);
+  }, [
+    diagnosticHandlerRef,
+    layoutStorage,
+    layoutStorageKey,
+    services.layoutService,
+    shouldPersistLayout,
+  ]);
 
   useEffect(() => {
     if (!shouldPersistEditorState) {
@@ -514,13 +781,22 @@ export function WorkbenchProvider({
     }
 
     const disposable = services.editorService.onDidChangeEditors(({ state }) => {
-      writePersistedEditorState(state, editorStateStorageKey, editorStateStorage);
+      reportPersistenceWriteResult(
+        writePersistedEditorStateResult(state, editorStateStorageKey, editorStateStorage),
+        diagnosticHandlerRef,
+      );
     });
 
     return () => {
       disposable.dispose();
     };
-  }, [editorStateStorage, editorStateStorageKey, services.editorService, shouldPersistEditorState]);
+  }, [
+    diagnosticHandlerRef,
+    editorStateStorage,
+    editorStateStorageKey,
+    services.editorService,
+    shouldPersistEditorState,
+  ]);
 
   useEffect(() => {
     if (!shouldPersistLocalPreferences) {
@@ -532,10 +808,13 @@ export function WorkbenchProvider({
         return;
       }
 
-      writePersistedLocalPreferences(
-        services.preferenceService.getScopedValues('local'),
-        localPreferenceStorageKey,
-        localPreferenceStorage,
+      reportPersistenceWriteResult(
+        writePersistedLocalPreferencesResult(
+          services.preferenceService.getScopedValues('local'),
+          localPreferenceStorageKey,
+          localPreferenceStorage,
+        ),
+        diagnosticHandlerRef,
       );
     });
 
@@ -543,6 +822,7 @@ export function WorkbenchProvider({
       disposable.dispose();
     };
   }, [
+    diagnosticHandlerRef,
     localPreferenceStorage,
     localPreferenceStorageKey,
     services.preferenceService,
@@ -573,7 +853,10 @@ export function WorkbenchProvider({
   const value = useMemo<WorkbenchContextValue>(
     () => ({
       activateCommand: (commandId) => services.extensionRegistry.activateCommand(commandId),
+      activities: services.extensionRegistry.activities,
       availableExtensions: services.availableExtensions,
+      commands: services.extensionRegistry.commands,
+      configurations: services.extensionRegistry.configurations,
       contextKeyService,
       editorDocumentViewProviders: services.editorDocumentViewProviders,
       editorService: services.editorService,
@@ -592,15 +875,32 @@ export function WorkbenchProvider({
         }
         return result;
       },
-      extensionRegistry: services.extensionRegistry,
+      extensionActivation: createWorkbenchExtensionActivationAccess(
+        services.extensionRegistry,
+        services.waitForExtensionStartup,
+      ),
+      extensionActivationState: createWorkbenchExtensionActivationStateReader(
+        services.extensionRegistry,
+      ),
+      extensionCatalog: createWorkbenchExtensionCatalogReader(services.extensionRegistry),
       installedExtensionsStorage,
       installedExtensionsStorageKey,
+      keybindings: services.extensionRegistry.keybindings,
       keybindingOverrides,
       layoutService: services.layoutService,
+      localizations: services.extensionRegistry.localizations,
+      menus: services.extensionRegistry.menus,
       missingExtensionIds: services.missingExtensionIds,
       preferenceService: services.preferenceService,
       resetCommandKeybindingOverride,
       setCommandKeybindingOverride,
+      settingsCapabilityPublisher: createWorkbenchSettingsCapabilityPublisher(
+        services.extensionRegistry.capabilityRegistry,
+      ),
+      statusBar: services.extensionRegistry.statusBar,
+      themes: services.extensionRegistry.themes,
+      viewHostFactories: services.extensionRegistry.viewHostFactories,
+      views: services.extensionRegistry.views,
       waitForExtensionStartup: services.waitForExtensionStartup,
       workspaceHostPort: services.workspaceHostPort,
     }),
@@ -616,10 +916,14 @@ export function WorkbenchProvider({
   );
 
   return (
-    <WorkbenchContext.Provider value={value}>
-      <EditorWorkspaceReconciler />
-      {children}
-    </WorkbenchContext.Provider>
+    <WorkbenchPersistenceDiagnosticContext.Provider value={onPersistenceDiagnostic}>
+      <WorkbenchContext.Provider value={value}>
+        <ExtensionEnablementContext.Provider value={services.extensionEnablement}>
+          <EditorWorkspaceReconciler />
+          {children}
+        </ExtensionEnablementContext.Provider>
+      </WorkbenchContext.Provider>
+    </WorkbenchPersistenceDiagnosticContext.Provider>
   );
 }