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

package/README.md

@@ -51,6 +51,23 @@ registry can use `registry-command-descriptors` without importing Provider
 context into that leaf bundle. The root barrel remains the discovery surface,
 not the default runtime import graph.
 
+### Focused extension context migration
+
+`WorkbenchContextValue` no longer exposes the aggregate `ExtensionRegistry`.
+Consumers that read Provider context use the focused `commands`, `menus`,
+`extensionActivation`, `extensionActivationState`, `extensionCatalog`, and
+`settingsCapabilityPublisher` fields instead. The focused contract types remain
+available from the package root for external TypeScript consumers.
+
+Hosts that explicitly own an `ExtensionRegistry` can continue passing that
+instance to `useExtensionRegistryCommandDescriptors(registry, ...)`; this
+host-composition hook is separate from Provider context and remains supported.
+
+`WorkbenchShell` command hosts receive a focused `openSettings(categoryId?)`
+control in their `onRunCommand` context. Use that host-composition seam for
+commands that open a specific settings category without reading an aggregate
+registry or capability map.
+
 Use `host-shell` when the product owns sidebar, editor, panel, and overlay content.
 It keeps Kit layout, Activity Bar ordering, resize persistence, and status routing
 without loading the full Settings/Profile/Help assembly. Use `shell` for the
@@ -94,6 +111,21 @@ import '@workbench-kit/shell-react/field-remap/view.css';
 for Flow-only embeds and custom bundler setups. The full barrel
 `import { FieldRemapPanel } from '@workbench-kit/shell-react'` stays supported.
 
+### Semantic history ownership
+
+`FieldRemapPanel` keeps a private composite `{ edges, operators }` undo/redo stack only
+when both durable channels are uncontrolled. If either channel is controlled, pass one
+`historyOwner` for the complete composite state; the Panel never creates a partial stack.
+`historyActionsRef` exposes host-chrome actions and
+`onHistoryAvailabilityChange` reports whether those actions are available. Keyboard
+routing remains host-owned.
+
+Only semantic edits coming from the Flow mapper create entries. Hidden mappings are
+reconstructed before an entry is recorded, so undo does not discard filtered state.
+Shape apply or external source/target replacement prunes invalid mappings and resets
+past/future without adding a history entry. Draft placement, selection, viewport, and
+detail-panel state stay outside this history.
+
 ### Flow host chrome hooks
 
 `FieldRemapFlowMapper` (and `FieldRemapPanel` pass-through) accept optional chrome

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@workbench-kit/shell-react",
-  "version": "0.0.2-prototype.0.2.32",
+  "version": "0.0.2-prototype.0.2.34",
   "private": false,
   "sideEffects": [
     "**/*.css"
@@ -31,14 +31,14 @@
     "@radix-ui/react-slot": "^1.3.0",
     "@xyflow/react": "^12.11.2",
     "jsonata": "^2.2.0",
-    "@workbench-kit/platform": "0.0.2-prototype.0.2.32",
-    "@workbench-kit/field-remap": "0.0.2-prototype.0.2.32",
-    "@workbench-kit/tokens": "0.0.2-prototype.0.2.32",
-    "@workbench-kit/workbench-core": "0.0.2-prototype.0.2.32",
-    "@workbench-kit/workbench-extension-sdk": "0.0.2-prototype.0.2.32",
-    "@workbench-kit/workbench-config": "0.0.2-prototype.0.2.32",
-    "@workbench-kit/react": "0.0.2-prototype.0.2.32",
-    "@workbench-kit/workspace": "0.0.2-prototype.0.2.32"
+    "@workbench-kit/platform": "0.0.2-prototype.0.2.34",
+    "@workbench-kit/field-remap": "0.0.2-prototype.0.2.34",
+    "@workbench-kit/workbench-core": "0.0.2-prototype.0.2.34",
+    "@workbench-kit/react": "0.0.2-prototype.0.2.34",
+    "@workbench-kit/workbench-config": "0.0.2-prototype.0.2.34",
+    "@workbench-kit/tokens": "0.0.2-prototype.0.2.34",
+    "@workbench-kit/workbench-extension-sdk": "0.0.2-prototype.0.2.34",
+    "@workbench-kit/workspace": "0.0.2-prototype.0.2.34"
   },
   "peerDependencies": {
     "react": "^19.0.0",

package/src/commands/use-command-descriptors.ts

@@ -1,13 +1,17 @@
 import type { WorkbenchCommandDescriptor } from '@workbench-kit/react/workbench';
 
 import { useWorkbench } from '../shell/provider.js';
-import { useExtensionRegistryCommandDescriptors } from './use-extension-registry-command-descriptors.js';
+import { useCommandRegistryCommandDescriptors } from './use-extension-registry-command-descriptors.js';
 
 const EMPTY_COMMAND_DESCRIPTORS: readonly WorkbenchCommandDescriptor[] = [];
 
 export function useWorkbenchCommandDescriptors(
   additionalCommands: readonly WorkbenchCommandDescriptor[] = EMPTY_COMMAND_DESCRIPTORS,
 ) {
-  const { extensionRegistry } = useWorkbench();
-  return useExtensionRegistryCommandDescriptors(extensionRegistry, additionalCommands);
+  const { commands, extensionCatalog } = useWorkbench();
+  return useCommandRegistryCommandDescriptors(
+    commands,
+    extensionCatalog.getFeatureSpecs(),
+    additionalCommands,
+  );
 }

package/src/commands/use-extension-registry-command-descriptors.ts

@@ -1,5 +1,6 @@
 import type { WorkbenchCommandDescriptor } from '@workbench-kit/react/workbench';
-import type { ExtensionRegistry } from '@workbench-kit/workbench-core';
+import type { CommandRegistry } from '@workbench-kit/platform';
+import type { ExtensionFeatureSpec, ExtensionRegistry } from '@workbench-kit/workbench-core';
 import { useEffect, useMemo, useReducer } from 'react';
 
 import {
@@ -18,29 +19,45 @@ const EMPTY_COMMAND_DESCRIPTORS: readonly WorkbenchCommandDescriptor[] = [];
 export function useExtensionRegistryCommandDescriptors(
   extensionRegistry: ExtensionRegistry,
   additionalCommands: readonly WorkbenchCommandDescriptor[] = EMPTY_COMMAND_DESCRIPTORS,
+): readonly WorkbenchCommandDescriptor[] {
+  return useCommandRegistryCommandDescriptors(
+    extensionRegistry.commands,
+    extensionRegistry.getFeatureSpecs(),
+    additionalCommands,
+  );
+}
+
+export function useCommandRegistryCommandDescriptors(
+  commands: CommandRegistry,
+  featureSpecs: readonly ExtensionFeatureSpec[],
+  additionalCommands: readonly WorkbenchCommandDescriptor[] = EMPTY_COMMAND_DESCRIPTORS,
 ): readonly WorkbenchCommandDescriptor[] {
   const [refreshToken, refreshCommands] = useReducer((count: number) => count + 1, 0);
 
   useEffect(() => {
-    const disposable = extensionRegistry.commands.onDidChangeCommands(() => {
+    const disposable = commands.onDidChangeCommands(() => {
       refreshCommands();
     });
+    // A host may register commands in a layout effect after this hook rendered
+    // but before its passive subscription was installed. Re-read once after
+    // subscribing so that transition cannot leave the memoized snapshot stale.
+    refreshCommands();
 
     return () => {
       disposable.dispose();
     };
-  }, [extensionRegistry.commands]);
+  }, [commands]);
 
   return useMemo(() => {
-    const commandFeaturesById = collectExtensionCommandFeaturesById(extensionRegistry);
+    const commandFeaturesById = collectExtensionCommandFeaturesById(featureSpecs);
 
     return mergeWorkbenchCommandDescriptors(
-      extensionRegistry.commands
+      commands
         .getCommands()
         .map((command) =>
           extensionCommandToDescriptor(command, commandFeaturesById.get(command.id)),
         ),
       [...additionalCommands],
     );
-  }, [additionalCommands, extensionRegistry, refreshToken]);
+  }, [additionalCommands, commands, featureSpecs, refreshToken]);
 }

package/src/devtools/use-workbench-devtools-snapshot.ts

@@ -8,14 +8,31 @@ import { useWorkbench } from '../shell/provider.js';
 import type { WorkbenchWorkspaceHostPort as WorkspaceHostPort } from '@workbench-kit/workspace';
 
 export function useWorkbenchDevtoolsSnapshot(): WorkbenchDevtoolsSnapshot {
-  const { editorService, extensionRegistry, layoutService, workspaceHostPort } = useWorkbench();
+  const {
+    activities,
+    commands,
+    editorService,
+    extensionActivationState,
+    extensionCatalog,
+    keybindings,
+    layoutService,
+    menus,
+    views,
+    workspaceHostPort,
+  } = useWorkbench();
 
   const store = useMemo(() => {
     const collectSnapshot = () =>
       collectWorkbenchDevtoolsSnapshot({
+        activities,
+        commands,
         editorService,
-        extensionRegistry,
+        extensionActivationState,
+        extensionCatalog,
+        keybindings,
         layoutService,
+        menus,
+        views,
         workspaceHostPort,
       });
     let snapshot = collectSnapshot();
@@ -35,31 +52,28 @@ export function useWorkbenchDevtoolsSnapshot(): WorkbenchDevtoolsSnapshot {
           editorService.onDidChangeEditors(() => {
             notifyChange(onStoreChange);
           }),
-          extensionRegistry.commands.onDidChangeCommands(() => {
+          commands.onDidChangeCommands(() => {
             notifyChange(onStoreChange);
           }),
-          extensionRegistry.menus.onDidRegisterMenuItem(() => {
+          menus.onDidRegisterMenuItem(() => {
             notifyChange(onStoreChange);
           }),
-          extensionRegistry.keybindings.onDidRegisterKeybinding(() => {
+          keybindings.onDidRegisterKeybinding(() => {
             notifyChange(onStoreChange);
           }),
-          extensionRegistry.views.onDidRegisterView(() => {
+          views.onDidRegisterView(() => {
             notifyChange(onStoreChange);
           }),
-          extensionRegistry.views.onDidRegisterViewContainer(() => {
+          views.onDidRegisterViewContainer(() => {
             notifyChange(onStoreChange);
           }),
-          extensionRegistry.views.onDidRegisterViewProvider(() => {
+          views.onDidRegisterViewProvider(() => {
             notifyChange(onStoreChange);
           }),
-          extensionRegistry.activities.onDidRegisterActivity(() => {
+          activities.onDidRegisterActivity(() => {
             notifyChange(onStoreChange);
           }),
-          extensionRegistry.onDidActivateExtension(() => {
-            notifyChange(onStoreChange);
-          }),
-          extensionRegistry.onDidDeactivateExtension(() => {
+          extensionActivationState.onDidChangeActiveExtensions(() => {
             notifyChange(onStoreChange);
           }),
         ];
@@ -78,7 +92,18 @@ export function useWorkbenchDevtoolsSnapshot(): WorkbenchDevtoolsSnapshot {
         };
       },
     };
-  }, [editorService, extensionRegistry, layoutService, workspaceHostPort]);
+  }, [
+    activities,
+    commands,
+    editorService,
+    extensionActivationState,
+    extensionCatalog,
+    keybindings,
+    layoutService,
+    menus,
+    views,
+    workspaceHostPort,
+  ]);
 
   return useSyncExternalStore(store.subscribe, store.getSnapshot, store.getSnapshot);
 }

package/src/devtools/workbench-devtools-snapshot.ts

@@ -1,17 +1,24 @@
 import type {
   EditorService,
   EditorState,
+  ActivityRegistry,
   ExtensionDependencyDiagnostic,
-  ExtensionRegistry,
   LayoutService,
+  MenuRegistry,
+  ViewRegistry,
   WorkbenchLayoutState,
 } from '@workbench-kit/workbench-core';
+import type { CommandRegistry, KeybindingRegistry } from '@workbench-kit/platform';
 import type {
   WorkbenchWorkspaceHostPort as WorkspaceHostPort,
   WorkspaceResourceTransaction,
 } from '@workbench-kit/workspace';
 
-import type { WorkbenchWorkspaceHostPort } from '../shell/provider.js';
+import type {
+  WorkbenchExtensionActivationStateReader,
+  WorkbenchExtensionCatalogReader,
+  WorkbenchWorkspaceHostPort,
+} from '../shell/provider.js';
 
 export interface WorkbenchDevtoolsSnapshot {
   readonly activeExtensions: readonly { readonly extensionId: string }[];
@@ -58,18 +65,30 @@ export interface WorkbenchDevtoolsSnapshot {
 }
 
 export interface CollectWorkbenchDevtoolsSnapshotInput {
+  readonly activities: ActivityRegistry;
   readonly capturedAt?: string | undefined;
+  readonly commands: CommandRegistry;
   readonly editorService: EditorService;
-  readonly extensionRegistry: ExtensionRegistry;
+  readonly extensionActivationState: WorkbenchExtensionActivationStateReader;
+  readonly extensionCatalog: WorkbenchExtensionCatalogReader;
+  readonly keybindings: KeybindingRegistry;
   readonly layoutService: LayoutService;
+  readonly menus: MenuRegistry;
+  readonly views: ViewRegistry;
   readonly workspaceHostPort?: WorkbenchWorkspaceHostPort | undefined;
 }
 
 export function collectWorkbenchDevtoolsSnapshot({
+  activities,
   capturedAt = new Date().toISOString(),
+  commands,
   editorService,
-  extensionRegistry,
+  extensionActivationState,
+  extensionCatalog,
+  keybindings,
   layoutService,
+  menus,
+  views,
   workspaceHostPort,
 }: CollectWorkbenchDevtoolsSnapshotInput): WorkbenchDevtoolsSnapshot {
   const layout = layoutService.getState();
@@ -77,17 +96,17 @@ export function collectWorkbenchDevtoolsSnapshot({
   const activeTabCount = editor.groups.reduce((count, group) => count + group.tabs.length, 0);
 
   return {
-    activeExtensions: extensionRegistry.getActiveExtensions().map(({ extensionId }) => ({
+    activeExtensions: extensionActivationState.getActiveExtensions().map(({ extensionId }) => ({
       extensionId,
     })),
-    activities: extensionRegistry.activities.getActivities().map((activity) => ({
+    activities: activities.getActivities().map((activity) => ({
       icon: activity.icon,
       id: activity.id,
       title: activity.title,
     })),
-    capabilities: extensionRegistry.capabilityRegistry.listProviderIds(),
+    capabilities: extensionCatalog.listCapabilityProviderIds(),
     capturedAt,
-    commands: extensionRegistry.commands.getCommands().map((command) => ({
+    commands: commands.getCommands().map((command) => ({
       category: command.category,
       id: command.id,
       title: command.title,
@@ -102,15 +121,15 @@ export function collectWorkbenchDevtoolsSnapshot({
       'layout.sideBar.visible': layout.sideBar.visible,
       'workspace.hasHostPort': workspaceHostPort !== undefined,
     },
-    dependencyDiagnostics: extensionRegistry.getDependencyDiagnostics(),
+    dependencyDiagnostics: extensionCatalog.getDependencyDiagnostics(),
     editor,
-    keybindings: extensionRegistry.keybindings.getKeybindings().map((binding) => ({
+    keybindings: keybindings.getKeybindings().map((binding) => ({
       command: binding.command,
       key: binding.key,
       when: binding.when,
     })),
     layout,
-    menus: extensionRegistry.menus.getMenuItems().map((menu) => ({
+    menus: menus.getMenuItems().map((menu) => ({
       command: menu.command,
       group: menu.group,
       menu: menu.menu,
@@ -118,13 +137,13 @@ export function collectWorkbenchDevtoolsSnapshot({
       when: menu.when,
     })),
     transactions: readWorkspaceTransactionJournal(workspaceHostPort),
-    viewContainers: extensionRegistry.views.getViewContainers().map((container) => ({
+    viewContainers: views.getViewContainers().map((container) => ({
       icon: container.icon,
       id: container.id,
       location: container.location,
       title: container.title,
     })),
-    views: extensionRegistry.views.getViews().map((view) => ({
+    views: views.getViews().map((view) => ({
       containerId: view.containerId,
       id: view.id,
       name: view.name,

package/src/editor/area.tsx

@@ -265,7 +265,7 @@ function EditorGroupPane({
   viewProviders: readonly EditorDocumentViewProvider[];
 }) {
   const editorService = useEditorService();
-  const { executeCommand, extensionRegistry } = useWorkbench();
+  const { commands, executeCommand, menus } = useWorkbench();
   const tabs = group.tabs;
   const activeTabId = group.activeTabId ?? tabs[0]?.id ?? '';
   const activeTab = tabs.find((tab) => tab.id === activeTabId) ?? tabs[0];
@@ -659,10 +659,11 @@ function EditorGroupPane({
         <ContextMenu
           ariaLabel="Editor tab menu"
           items={createEditorTabContextMenuItems({
+            commands,
             editorService,
             executeExtensionCommand: (commandId) => executeCommand(commandId),
-            extensionRegistry,
             groupId: group.id,
+            menus,
             tab: contextTab,
             tabs,
           })}

package/src/editor/state-storage.ts

@@ -4,6 +4,9 @@ import {
   type EditorLayoutNode,
   type EditorState,
   type EditorTabState,
+  type WorkbenchPersistenceDiagnosticOptions,
+  type WorkbenchPersistenceReadResult,
+  type WorkbenchPersistenceWriteResult,
   type WorkbenchStorageReader,
   type WorkbenchStorageWriter,
 } from '@workbench-kit/workbench-core';
@@ -11,8 +14,10 @@ import {
 import { isRecord } from '../is-record.js';
 import {
   readLocalJsonStorage,
+  readLocalJsonStorageResult,
   resolveLocalWorkbenchStorage,
   writeLocalJsonStorage,
+  writeLocalJsonStorageResult,
 } from '../storage/local-json-storage.js';
 
 export const DEFAULT_WORKBENCH_EDITOR_STATE_STORAGE_KEY = 'workbench-kit/.workbench/editors';
@@ -49,6 +54,20 @@ export function readPersistedEditorState(
   return readLocalJsonStorage(storageKey, parseEditorStateStorageValue, () => undefined, storage);
 }
 
+export function readPersistedEditorStateResult(
+  storageKey = DEFAULT_WORKBENCH_EDITOR_STATE_STORAGE_KEY,
+  storage?: WorkbenchStorageReader,
+  options: WorkbenchPersistenceDiagnosticOptions = {},
+): WorkbenchPersistenceReadResult<EditorState | undefined> {
+  return readLocalJsonStorageResult(
+    storageKey,
+    parseEditorStateStorageValue,
+    () => undefined,
+    storage,
+    options,
+  );
+}
+
 export function writePersistedEditorState(
   state: EditorState,
   storageKey = DEFAULT_WORKBENCH_EDITOR_STATE_STORAGE_KEY,
@@ -59,6 +78,18 @@ export function writePersistedEditorState(
   });
 }
 
+export function writePersistedEditorStateResult(
+  state: EditorState,
+  storageKey = DEFAULT_WORKBENCH_EDITOR_STATE_STORAGE_KEY,
+  storage?: WorkbenchStorageWriter,
+  options: WorkbenchPersistenceDiagnosticOptions = {},
+): WorkbenchPersistenceWriteResult {
+  return writeLocalJsonStorageResult(storageKey, state, storage, {
+    ...options,
+    toStorageValue: editorStateToStorageValue,
+  });
+}
+
 function parseEditorStateStorageValue(value: unknown): EditorState | undefined {
   if (!isRecord(value)) {
     return undefined;

package/src/editor/tab-context-menu.ts

@@ -12,11 +12,8 @@ import {
   createWorkbenchEditorTabMenuEntries,
   type WorkbenchEditorCommandContext,
 } from '@workbench-kit/react/workbench/commands';
-import type {
-  EditorService,
-  EditorTabState,
-  ExtensionRegistry,
-} from '@workbench-kit/workbench-core';
+import type { EditorService, EditorTabState, MenuRegistry } from '@workbench-kit/workbench-core';
+import type { CommandRegistry } from '@workbench-kit/platform';
 
 import { copyResourcePath, pathForResource } from './resource.js';
 import {
@@ -34,17 +31,19 @@ const EDITOR_TAB_CONTEXT_MENU = 'editor/tab/context';
 const EDITOR_TAB_EXTENSION_MENU_SEPARATOR_ID = 'editor-tab-extension-separator';
 
 export function createEditorTabContextMenuItems({
+  commands,
   editorService,
   executeExtensionCommand,
-  extensionRegistry,
   groupId,
+  menus,
   tab,
   tabs,
 }: {
+  commands?: CommandRegistry | undefined;
   editorService: EditorService;
   executeExtensionCommand?: ((commandId: string) => unknown) | undefined;
-  extensionRegistry?: ExtensionRegistry | undefined;
   groupId: string;
+  menus?: MenuRegistry | undefined;
   tab: EditorTabState;
   tabs: readonly EditorTabState[];
 }): ContextMenuItem[] {
@@ -108,10 +107,11 @@ export function createEditorTabContextMenuItems({
   return appendExtensionContextMenuItems(
     baseItems,
     createExtensionContextMenuItems({
+      commands,
       contextKeys,
       executeCommand: executeExtensionCommand,
-      extensionRegistry,
       menu: EDITOR_TAB_CONTEXT_MENU,
+      menus,
     }),
     EDITOR_TAB_EXTENSION_MENU_SEPARATOR_ID,
   );

package/src/editor/use-editor.ts

@@ -38,7 +38,7 @@ export function useActiveEditorTab(): EditorTabState | undefined {
 
 export function useEditorHost(tabId?: string): EditorHost | undefined {
   const editorService = useEditorService();
-  const { extensionRegistry, waitForExtensionStartup } = useWorkbench();
+  const { extensionActivation, waitForExtensionStartup } = useWorkbench();
   const editorState = useEditorState();
   const forceRender = useForceRender();
   const activeGroup = editorState.groups.find((group) => group.id === editorState.activeGroupId);
@@ -68,11 +68,11 @@ export function useEditorHost(tabId?: string): EditorHost | undefined {
   useEffect(() => {
     // Late onView / onCommand activations register editor host factories after the
     // first paint that restores persisted tabs. Retry host creation when they land.
-    const disposable = extensionRegistry.onDidActivateExtension(forceRender);
+    const disposable = extensionActivation.onDidActivateExtension(forceRender);
     return () => {
       disposable.dispose();
     };
-  }, [extensionRegistry, forceRender]);
+  }, [extensionActivation, forceRender]);
 
   if (!resolvedTabId) {
     return undefined;
@@ -87,7 +87,7 @@ export function useEditorHost(tabId?: string): EditorHost | undefined {
 export function useEditorDocumentViewProviders(
   localProviders?: readonly EditorDocumentViewProvider[] | undefined,
 ): readonly EditorDocumentViewProvider[] {
-  const { editorDocumentViewProviders, extensionRegistry, waitForExtensionStartup } =
+  const { editorDocumentViewProviders, extensionActivation, waitForExtensionStartup } =
     useWorkbench();
   const forceRender = useForceRender();
 
@@ -115,11 +115,11 @@ export function useEditorDocumentViewProviders(
   }, [forceRender, waitForExtensionStartup]);
 
   useEffect(() => {
-    const disposable = extensionRegistry.onDidActivateExtension(forceRender);
+    const disposable = extensionActivation.onDidActivateExtension(forceRender);
     return () => {
       disposable.dispose();
     };
-  }, [extensionRegistry, forceRender]);
+  }, [extensionActivation, forceRender]);
 
   const registryProviders = editorDocumentViewProviders.getProviders();
 

package/src/explorer/context-menu.ts

@@ -8,12 +8,13 @@ import {
   type WorkbenchWorkspaceCommandContext,
 } from '@workbench-kit/react/workbench/commands';
 import {
+  type CommandRegistry,
   createCommandRegistry,
   executeCommand as executeRegisteredCommand,
   resolveCommandMenuItems,
 } from '@workbench-kit/platform';
 import { parentPathOf, type WorkspaceTreeNode } from '@workbench-kit/workspace';
-import type { ExtensionRegistry } from '@workbench-kit/workbench-core';
+import type { MenuRegistry } from '@workbench-kit/workbench-core';
 import {
   appendExtensionContextMenuItems,
   createExtensionContextMenuItems,
@@ -29,26 +30,28 @@ const EXPLORER_EXTENSION_MENU_SEPARATOR_ID = 'explorer-extension-separator';
 
 export function createExplorerItemContextMenuItems({
   actionPaths,
+  commands,
   copyPaths,
   createFile,
   createFolder,
   deleteTargets,
   executeExtensionCommand,
-  extensionRegistry,
   files,
+  menus,
   node,
   openFiles,
   revealFolder,
   renameTarget,
 }: {
   actionPaths: readonly string[];
+  commands?: CommandRegistry | undefined;
   copyPaths: (paths: string[]) => void;
   createFile: (parentPath: string) => void;
   createFolder: (parentPath: string) => void;
   deleteTargets: (paths: string[]) => void;
   executeExtensionCommand?: ((commandId: string) => unknown) | undefined;
-  extensionRegistry?: ExtensionRegistry | undefined;
   files: readonly { path: string }[];
+  menus?: MenuRegistry | undefined;
   node: WorkspaceTreeNode;
   openFiles: (paths: string[]) => void;
   revealFolder: (path: string) => void;
@@ -104,10 +107,11 @@ export function createExplorerItemContextMenuItems({
   return appendExtensionContextMenuItems(
     baseItems,
     createExtensionContextMenuItems({
+      commands,
       contextKeys,
       executeCommand: executeExtensionCommand,
-      extensionRegistry,
       menu: EXPLORER_CONTEXT_MENU,
+      menus,
     }),
     EXPLORER_EXTENSION_MENU_SEPARATOR_ID,
   );

package/src/explorer/view.tsx

@@ -52,7 +52,7 @@ interface ExplorerContextMenuState {
 }
 
 export function BuiltinExplorerView() {
-  const { executeCommand, extensionRegistry, workspaceHostPort } = useWorkbench();
+  const { commands, executeCommand, menus, workspaceHostPort } = useWorkbench();
   const activeTab = useActiveEditorTab();
   const workspaceService = isWorkspaceResourceService(workspaceHostPort?.service)
     ? workspaceHostPort.service
@@ -146,6 +146,7 @@ export function BuiltinExplorerView() {
         ariaLabel: `${node.name} menu`,
         items: createExplorerItemContextMenuItems({
           actionPaths: meta.actionPaths,
+          commands,
           copyPaths: (paths) => {
             void executeWorkspaceCommand(WORKBENCH_WORKSPACE_COPY_PATH_COMMAND_ID, { paths });
           },
@@ -158,8 +159,8 @@ export function BuiltinExplorerView() {
             });
           },
           executeExtensionCommand: (commandId) => executeCommand(commandId),
-          extensionRegistry,
           files: workspaceState?.files ?? [],
+          menus,
           node,
           openFiles: (paths) => {
             void executeWorkspaceCommand(WORKBENCH_WORKSPACE_OPEN_COMMAND_ID, {
@@ -174,7 +175,7 @@ export function BuiltinExplorerView() {
         y: event.clientY,
       });
     },
-    [executeWorkspaceCommand, explorer, workspaceState?.files],
+    [commands, executeWorkspaceCommand, explorer, menus, workspaceState?.files],
   );
 
   if (!workspaceService || !workspaceState) {