@workbench-kit/shell-react 0.0.2-prototype.0.2.25 → 0.0.2-prototype.0.2.27

package/README.md

@@ -17,6 +17,7 @@ Peer: React 19.
 ## Quick start
 
 ```tsx
+import { AppIcon } from '@workbench-kit/react/primitives';
 import { BUILTIN_WORKBENCH_EXTENSIONS } from '@workbench-kit/shell-react';
 import { EditorArea } from '@workbench-kit/shell-react';
 import { WorkbenchProvider } from '@workbench-kit/shell-react/provider';
@@ -25,7 +26,12 @@ import { WorkbenchShell } from '@workbench-kit/shell-react/shell';
 export function App() {
   return (
     <WorkbenchProvider availableExtensions={BUILTIN_WORKBENCH_EXTENSIONS}>
-      <WorkbenchShell title="Workbench" primarySidebar={<aside />} editorArea={<EditorArea />} />
+      <WorkbenchShell
+        appIcon={<AppIcon alt="" src="/app-icon.svg" />}
+        title="Workbench"
+        primarySidebar={<aside />}
+        editorArea={<EditorArea />}
+      />
     </WorkbenchProvider>
   );
 }
@@ -40,7 +46,9 @@ host wants the Kit editor, or omit it for a product-owned editor region.
 
 Performance-sensitive hosts should import orchestration from the focused
 `provider`, `host-shell`, `shell`, `command-host`, `command-palette`, and
-`command-descriptors` subpaths. The root barrel remains the discovery surface,
+`command-descriptors` subpaths. Hosts that already own the canonical extension
+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.
 
 Use `host-shell` when the product owns sidebar, editor, panel, and overlay content.
@@ -53,6 +61,14 @@ layout-only chrome without host services, start from
 `@workbench-kit/react/workbench/shell` — see
 [Getting Started](../../docs/guides/getting-started.md).
 
+## Host-owned branding
+
+The default title bar does not embed a product mark. Pass the host-owned mark through
+`appIcon`, omit it for a text-only identity, or replace the complete `titleBar` surface.
+The shell wraps `appIcon` as decorative content, so interactive controls do not belong
+in this slot. `AppIcon` from `@workbench-kit/react/primitives` is the optional sizing
+and image-fit helper; it does not include fallback artwork.
+
 ## Field Remap embed (slim subpath)
 
 Hosts that only need the Field Remap mapper UI can import the slim subpath instead

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@workbench-kit/shell-react",
-  "version": "0.0.2-prototype.0.2.25",
+  "version": "0.0.2-prototype.0.2.27",
   "private": false,
   "sideEffects": [
     "**/*.css"
@@ -9,6 +9,7 @@
   "exports": {
     ".": "./src/index.ts",
     "./command-descriptors": "./src/commands/use-command-descriptors.ts",
+    "./registry-command-descriptors": "./src/commands/use-extension-registry-command-descriptors.ts",
     "./command-host": "./src/workbench/command-host.tsx",
     "./command-palette": "./src/workbench/command-palette.ts",
     "./field-remap": "./src/field-remap/index.ts",
@@ -30,15 +31,14 @@
     "@radix-ui/react-slot": "^1.3.0",
     "@xyflow/react": "^12.11.2",
     "jsonata": "^2.2.0",
-    "react-table-mapping": "^1.0.3",
-    "@workbench-kit/react": "0.0.2-prototype.0.2.25",
-    "@workbench-kit/tokens": "0.0.2-prototype.0.2.25",
-    "@workbench-kit/workbench-core": "0.0.2-prototype.0.2.25",
-    "@workbench-kit/workbench-extension-sdk": "0.0.2-prototype.0.2.25",
-    "@workbench-kit/workbench-config": "0.0.2-prototype.0.2.25",
-    "@workbench-kit/platform": "0.0.2-prototype.0.2.25",
-    "@workbench-kit/field-remap": "0.0.2-prototype.0.2.25",
-    "@workbench-kit/workspace": "0.0.2-prototype.0.2.25"
+    "@workbench-kit/platform": "0.0.2-prototype.0.2.27",
+    "@workbench-kit/react": "0.0.2-prototype.0.2.27",
+    "@workbench-kit/tokens": "0.0.2-prototype.0.2.27",
+    "@workbench-kit/workbench-config": "0.0.2-prototype.0.2.27",
+    "@workbench-kit/field-remap": "0.0.2-prototype.0.2.27",
+    "@workbench-kit/workbench-extension-sdk": "0.0.2-prototype.0.2.27",
+    "@workbench-kit/workbench-core": "0.0.2-prototype.0.2.27",
+    "@workbench-kit/workspace": "0.0.2-prototype.0.2.27"
   },
   "peerDependencies": {
     "react": "^19.0.0",

package/src/chat/command-policy.ts

@@ -1,6 +1,6 @@
-import type {
-  ResolveWorkbenchCommandExecutionPolicyInput,
-  WorkbenchCommandExecutionPolicy,
+import {
+  isWorkbenchCommandExecutionPolicy,
+  type ResolveWorkbenchCommandExecutionPolicyInput,
 } from '@workbench-kit/react/workbench';
 import type { WorkbenchStorageReader } from '@workbench-kit/workbench-core';
 
@@ -8,12 +8,6 @@ import { readPersistedLocalPreferences } from '../management/preference-settings
 
 export const WORKBENCH_AI_CHAT_COMMAND_DEFAULT_POLICY_KEY = 'workbench.chat.aiCommandDefaultPolicy';
 
-function isWorkbenchCommandExecutionPolicy(
-  value: unknown,
-): value is WorkbenchCommandExecutionPolicy {
-  return value === 'auto-allow' || value === 'approval-required' || value === 'auto-deny';
-}
-
 export function readWorkbenchAiChatCommandPolicyInput(
   storageKey?: string,
   storage?: WorkbenchStorageReader,
@@ -29,14 +23,6 @@ export function readWorkbenchAiChatCommandPolicyInput(
   };
 }
 
-export function createWorkbenchAiChatCommandPolicyById(
-  entries: Readonly<Record<string, WorkbenchCommandExecutionPolicy>>,
-): ResolveWorkbenchCommandExecutionPolicyInput {
-  return {
-    policyByCommandId: entries,
-  };
-}
-
 export function mergeWorkbenchAiChatCommandPolicyInput(
   ...inputs: readonly ResolveWorkbenchCommandExecutionPolicyInput[]
 ): ResolveWorkbenchCommandExecutionPolicyInput {

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

@@ -1,12 +1,7 @@
-import { useEffect, useMemo, useReducer } from 'react';
 import type { WorkbenchCommandDescriptor } from '@workbench-kit/react/workbench';
 
 import { useWorkbench } from '../shell/provider.js';
-import {
-  collectExtensionCommandFeaturesById,
-  extensionCommandToDescriptor,
-  mergeWorkbenchCommandDescriptors,
-} from '../workbench/command-palette.js';
+import { useExtensionRegistryCommandDescriptors } from './use-extension-registry-command-descriptors.js';
 
 const EMPTY_COMMAND_DESCRIPTORS: readonly WorkbenchCommandDescriptor[] = [];
 
@@ -14,28 +9,5 @@ export function useWorkbenchCommandDescriptors(
   additionalCommands: readonly WorkbenchCommandDescriptor[] = EMPTY_COMMAND_DESCRIPTORS,
 ) {
   const { extensionRegistry } = useWorkbench();
-  const [refreshToken, refreshCommands] = useReducer((count: number) => count + 1, 0);
-
-  useEffect(() => {
-    const disposable = extensionRegistry.commands.onDidRegisterCommand(() => {
-      refreshCommands();
-    });
-
-    return () => {
-      disposable.dispose();
-    };
-  }, [extensionRegistry.commands]);
-
-  return useMemo(() => {
-    const commandFeaturesById = collectExtensionCommandFeaturesById(extensionRegistry);
-
-    return mergeWorkbenchCommandDescriptors(
-      extensionRegistry.commands
-        .getCommands()
-        .map((command) =>
-          extensionCommandToDescriptor(command, commandFeaturesById.get(command.id)),
-        ),
-      [...additionalCommands],
-    );
-  }, [additionalCommands, extensionRegistry, refreshToken]);
+  return useExtensionRegistryCommandDescriptors(extensionRegistry, additionalCommands);
 }

package/src/commands/use-context-key-revision.ts

@@ -1,18 +1,18 @@
-import { useEffect, useState } from 'react';
+import { useCallback, useSyncExternalStore } from 'react';
 import type { ContextKeyService } from '@workbench-kit/platform';
 
 export function useContextKeyRevision(contextKeyService: ContextKeyService): number {
-  const [revision, setRevision] = useState(0);
+  const subscribe = useCallback(
+    (onStoreChange: () => void) => {
+      const disposable = contextKeyService.onDidChangeContext(onStoreChange);
 
-  useEffect(() => {
-    const disposable = contextKeyService.onDidChangeContext(() => {
-      setRevision((current) => current + 1);
-    });
+      return () => {
+        disposable.dispose();
+      };
+    },
+    [contextKeyService],
+  );
+  const getSnapshot = useCallback(() => contextKeyService.getRevision(), [contextKeyService]);
 
-    return () => {
-      disposable.dispose();
-    };
-  }, [contextKeyService]);
-
-  return revision;
+  return useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
 }

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

@@ -0,0 +1,46 @@
+import type { WorkbenchCommandDescriptor } from '@workbench-kit/react/workbench';
+import type { ExtensionRegistry } from '@workbench-kit/workbench-core';
+import { useEffect, useMemo, useReducer } from 'react';
+
+import {
+  collectExtensionCommandFeaturesById,
+  extensionCommandToDescriptor,
+  mergeWorkbenchCommandDescriptors,
+} from '../workbench/command-palette.js';
+
+const EMPTY_COMMAND_DESCRIPTORS: readonly WorkbenchCommandDescriptor[] = [];
+
+/**
+ * Resolves command descriptors from a host-owned registry without importing
+ * WorkbenchProvider. Use this leaf hook when the host already owns the
+ * canonical registry instance or when bundler context isolation matters.
+ */
+export function useExtensionRegistryCommandDescriptors(
+  extensionRegistry: ExtensionRegistry,
+  additionalCommands: readonly WorkbenchCommandDescriptor[] = EMPTY_COMMAND_DESCRIPTORS,
+): readonly WorkbenchCommandDescriptor[] {
+  const [refreshToken, refreshCommands] = useReducer((count: number) => count + 1, 0);
+
+  useEffect(() => {
+    const disposable = extensionRegistry.commands.onDidChangeCommands(() => {
+      refreshCommands();
+    });
+
+    return () => {
+      disposable.dispose();
+    };
+  }, [extensionRegistry.commands]);
+
+  return useMemo(() => {
+    const commandFeaturesById = collectExtensionCommandFeaturesById(extensionRegistry);
+
+    return mergeWorkbenchCommandDescriptors(
+      extensionRegistry.commands
+        .getCommands()
+        .map((command) =>
+          extensionCommandToDescriptor(command, commandFeaturesById.get(command.id)),
+        ),
+      [...additionalCommands],
+    );
+  }, [additionalCommands, extensionRegistry, refreshToken]);
+}

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

@@ -35,7 +35,7 @@ export function useWorkbenchDevtoolsSnapshot(): WorkbenchDevtoolsSnapshot {
           editorService.onDidChangeEditors(() => {
             notifyChange(onStoreChange);
           }),
-          extensionRegistry.commands.onDidRegisterCommand(() => {
+          extensionRegistry.commands.onDidChangeCommands(() => {
             notifyChange(onStoreChange);
           }),
           extensionRegistry.menus.onDidRegisterMenuItem(() => {

package/src/editor/pane-visibility.ts

@@ -71,29 +71,6 @@ export function countVisibleEditorPanes(visibility: EditorPaneVisibility): numbe
   return Number(visibility.code) + Number(visibility.form) + Number(visibility.preview);
 }
 
-export function toggleEditorPaneVisibility(
-  visibility: EditorPaneVisibility,
-  pane: EditorPaneKind,
-): EditorPaneVisibility {
-  const nextValue = !visibility[pane];
-
-  if (!nextValue && countVisibleEditorPanes(visibility) <= 1) {
-    return visibility;
-  }
-
-  return {
-    ...visibility,
-    [pane]: nextValue,
-  };
-}
-
-export function sanitizeEditorPaneVisibility(
-  visibility: EditorPaneVisibility,
-  options: { formEligible: boolean; previewEligible: boolean },
-): EditorPaneVisibility {
-  return resolveEffectiveEditorPaneVisibility(visibility, options);
-}
-
 export function resolveEffectiveEditorPaneVisibility(
   preference: EditorPaneVisibility,
   options: { formEligible: boolean; previewEligible: boolean },

package/src/explorer/reveal.ts

@@ -1,3 +1,4 @@
+import { workspaceExplorerParentPaths } from '@workbench-kit/react/workbench/workspace';
 import type { WorkspaceSelectionState } from '@workbench-kit/workspace';
 
 import {
@@ -69,18 +70,6 @@ export function applyExplorerPathReveal(
   });
 }
 
-function workspaceExplorerParentPaths(path: string): string[] {
-  const segments = path.split('/').filter(Boolean);
-  return segments.slice(0, -1).map((_, index) => segments.slice(0, index + 1).join('/'));
-}
-
-export function isExplorerHostCommand(commandId: string): boolean {
-  return (
-    commandId === BUILTIN_EXPLORER_REVEAL_COMMAND_ID ||
-    commandId === BUILTIN_EXPLORER_FOCUS_COMMAND_ID
-  );
-}
-
 export async function runExplorerHostCommandSideEffects(
   commandId: string,
   args: readonly unknown[],

package/src/extensions/builtin/commands/src/command-inspector-editor-host.ts

@@ -1,7 +1,6 @@
+import { parseCommandInspectorUri } from '@workbench-kit/react/workbench/management';
 import type { EditorHost } from '@workbench-kit/workbench-extension-sdk';
 
-const COMMAND_INSPECTOR_URI_PREFIX = 'workbench://command/inspect/' as const;
-
 export const COMMAND_INSPECTOR_EDITOR_ID = 'workbench-kit.builtin.commands.inspector' as const;
 export const COMMAND_INSPECTOR_EDITOR_HOST_RENDER_KIND =
   'workbench-kit.builtin.commands/inspector' as const;
@@ -46,23 +45,6 @@ export class CommandInspectorEditorHost implements EditorHost {
   }
 }
 
-export function parseCommandInspectorUri(resourceUri: string): string | undefined {
-  if (!resourceUri.startsWith(COMMAND_INSPECTOR_URI_PREFIX)) {
-    return undefined;
-  }
-
-  const encodedId = resourceUri.slice(COMMAND_INSPECTOR_URI_PREFIX.length);
-  if (!encodedId) {
-    return undefined;
-  }
-
-  try {
-    return decodeURIComponent(encodedId);
-  } catch {
-    return undefined;
-  }
-}
-
 export function isCommandInspectorEditorHostRenderData(
   value: unknown,
 ): value is CommandInspectorEditorHostRenderData {

package/src/extensions/builtin/commands/src/index.ts

@@ -1,9 +1,9 @@
+import { parseCommandInspectorUri } from '@workbench-kit/react/workbench/management';
 import type { ExtensionContext } from '@workbench-kit/workbench-extension-sdk';
 
 import {
   COMMAND_INSPECTOR_EDITOR_ID,
   CommandInspectorEditorHost,
-  parseCommandInspectorUri,
 } from './command-inspector-editor-host.js';
 
 export const EXTENSION_ID = 'workbench-kit.builtin.commands' as const;
@@ -21,9 +21,9 @@ export {
   COMMAND_INSPECTOR_EDITOR_ID,
   CommandInspectorEditorHost,
   isCommandInspectorEditorHostRenderData,
-  parseCommandInspectorUri,
   type CommandInspectorEditorHostRenderData,
 } from './command-inspector-editor-host.js';
+export { parseCommandInspectorUri };
 
 export function activate(context: ExtensionContext): void {
   context.editorResolvers.registerResolver({

package/src/field-remap/flow-adapter.ts

@@ -14,14 +14,6 @@ import {
   type ValueTransformRegistry,
 } from '@workbench-kit/field-remap';
 
-export type FieldRemapFlowNodeKind =
-  | 'source-object'
-  | 'target-object'
-  | 'transform'
-  | 'draft-transform'
-  | 'combine-operator'
-  | 'split-operator';
-
 export type FieldRemapPort = {
   fieldId: string;
   label: string;
@@ -106,14 +98,6 @@ const TRANSFORM_X = 320;
 const TARGET_X = 620;
 const TRANSFORM_ROW_GAP = 72;
 
-export function sourceObjectNodeId(): string {
-  return SOURCE_OBJECT_NODE_ID;
-}
-
-export function targetObjectNodeId(): string {
-  return TARGET_OBJECT_NODE_ID;
-}
-
 /** Handle id for a field/slot port on an object node. */
 export function portHandleId(fieldOrSlotId: string): string {
   return fieldOrSlotId;

package/src/field-remap/flow-ops.ts

@@ -7,7 +7,6 @@ import {
   findTargetSlot,
   isTransformChainCompatible,
   optionFieldsForStep,
-  patchOptionStep,
   resizeOptionSteps,
   sanitizeOptionRecord,
   type CombineMappingOperator,
@@ -214,29 +213,6 @@ export function removeTransformStepFromEdge(edge: MappingEdge, stepIndex: number
   };
 }
 
-export function patchTransformStepOptionOnEdge(
-  edge: MappingEdge,
-  stepIndex: number,
-  key: string,
-  value: unknown,
-): MappingEdge {
-  const length = edge.transformIds?.length ?? 0;
-  if (stepIndex < 0 || stepIndex >= length) {
-    return edge;
-  }
-  return {
-    ...edge,
-    transformOptionSteps: patchOptionStep(
-      edge.transformOptionSteps,
-      length,
-      stepIndex,
-      key,
-      value,
-      edge.transformOptions,
-    ),
-  };
-}
-
 export function replaceTransformStepOptionsOnEdge(
   edge: MappingEdge,
   stepIndex: number,

package/src/index.ts

@@ -242,6 +242,7 @@ export {
   type WorkbenchChatCommandSurfaceOptions,
 } from './chat/command-surface.js';
 export { useWorkbenchCommandDescriptors } from './commands/use-command-descriptors.js';
+export { useExtensionRegistryCommandDescriptors } from './commands/use-extension-registry-command-descriptors.js';
 export {
   executeWorkbenchUserCommandAction,
   registerWorkbenchUserCommands,

package/src/jdw/widget-form-view.tsx

@@ -1,4 +1,4 @@
-import { useCallback, useMemo } from 'react';
+import { useMemo } from 'react';
 import { resolveWidgetStudioAssetCatalog } from '@workbench-kit/react/widget-studio';
 import { WidgetTreeLab } from '@workbench-kit/react/widget-tree';
 import { BUILTIN_JDW_REGISTRY } from '@workbench-kit/react/jdw';
@@ -6,7 +6,7 @@ import { BUILTIN_JDW_REGISTRY } from '@workbench-kit/react/jdw';
 import { useWorkbench } from '../shell/provider.js';
 import {
   isWorkspaceResourceService,
-  useWorkspaceResourceState,
+  useWorkspaceTextDocuments,
 } from '../workbench/workspace-view-state.js';
 
 export interface JdwWidgetFormViewProps {
@@ -15,8 +15,6 @@ export interface JdwWidgetFormViewProps {
   readonly onContentChange: (content: string) => void;
 }
 
-const EMPTY_WORKSPACE_FILES: readonly { readonly path: string; readonly content: string }[] = [];
-
 /**
  * Form authoring surface for JDW widgets. Builds the Assets palette from built-in
  * assets, workspace asset packages, and other workspace `*.jdw.json` documents.
@@ -28,22 +26,7 @@ export function JdwWidgetFormView({ path, content, onContentChange }: JdwWidgetF
   const workspaceService = isWorkspaceResourceService(workspaceHostPort?.service)
     ? workspaceHostPort.service
     : undefined;
-  const workspaceState = useWorkspaceResourceState(workspaceService);
-  const files =
-    workspaceState?.files ?? workspaceService?.getState().files ?? EMPTY_WORKSPACE_FILES;
-
-  const filesByPath = useMemo(() => {
-    const map = new Map<string, string>();
-    for (const file of files) {
-      map.set(file.path.replace(/\\/g, '/'), file.content);
-    }
-    return map;
-  }, [files]);
-
-  const loadDocument = useCallback(
-    (documentPath: string) => filesByPath.get(documentPath.replace(/\\/g, '/')) ?? null,
-    [filesByPath],
-  );
+  const { files, loadDocument } = useWorkspaceTextDocuments(workspaceService);
 
   const assetCatalog = useMemo(
     () =>

package/src/jdw/widget-preview-view.tsx

@@ -1,11 +1,10 @@
-import { useCallback, useMemo } from 'react';
 import { JdwPreviewViewport } from '@workbench-kit/react/jdw/preview-viewport';
 import { BUILTIN_JDW_REGISTRY } from '@workbench-kit/react/jdw';
 
 import { useWorkbench } from '../shell/provider.js';
 import {
   isWorkspaceResourceService,
-  useWorkspaceResourceState,
+  useWorkspaceTextDocuments,
 } from '../workbench/workspace-view-state.js';
 
 export interface JdwWidgetPreviewViewProps {
@@ -14,8 +13,6 @@ export interface JdwWidgetPreviewViewProps {
   readonly className?: string | undefined;
 }
 
-const EMPTY_WORKSPACE_FILES: readonly { readonly path: string; readonly content: string }[] = [];
-
 /**
  * Preview viewport for JDW documents. Expands workspace `type: "ref"` imports
  * before layout/draw without rewriting the source buffer.
@@ -25,22 +22,7 @@ export function JdwWidgetPreviewView({ path, content, className }: JdwWidgetPrev
   const workspaceService = isWorkspaceResourceService(workspaceHostPort?.service)
     ? workspaceHostPort.service
     : undefined;
-  const workspaceState = useWorkspaceResourceState(workspaceService);
-  const files =
-    workspaceState?.files ?? workspaceService?.getState().files ?? EMPTY_WORKSPACE_FILES;
-
-  const filesByPath = useMemo(() => {
-    const map = new Map<string, string>();
-    for (const file of files) {
-      map.set(file.path.replace(/\\/g, '/'), file.content);
-    }
-    return map;
-  }, [files]);
-
-  const loadDocument = useCallback(
-    (documentPath: string) => filesByPath.get(documentPath.replace(/\\/g, '/')) ?? null,
-    [filesByPath],
-  );
+  const { loadDocument } = useWorkspaceTextDocuments(workspaceService);
 
   return (
     <JdwPreviewViewport

package/src/management/use-command-management.ts

@@ -7,6 +7,7 @@ import {
 } from '@workbench-kit/react/workbench/management';
 import { createWorkbenchShellCommands } from '@workbench-kit/react/workbench';
 
+import { useContextKeyRevision } from '../commands/use-context-key-revision.js';
 import { useWorkbench } from '../shell/provider.js';
 import {
   collectExtensionCommandFeaturesById,
@@ -14,12 +15,17 @@ import {
 } from '../workbench/command-palette.js';
 
 export function useCommandManagementModel() {
-  const { executeCommand, extensionRegistry } = useWorkbench();
+  const { contextKeyService, executeCommand, extensionRegistry } = useWorkbench();
+  const contextKeyRevision = useContextKeyRevision(contextKeyService);
+  const contextKeySnapshot = useMemo(
+    () => contextKeyService.createSnapshot(),
+    [contextKeyRevision, contextKeyService],
+  );
   const [lastRun, setLastRun] = useState<CommandManagementRunState | undefined>();
   const [refreshToken, refreshRegistry] = useReducer((count: number) => count + 1, 0);
 
   useEffect(() => {
-    const commandDisposable = extensionRegistry.commands.onDidRegisterCommand(() => {
+    const commandDisposable = extensionRegistry.commands.onDidChangeCommands(() => {
       refreshRegistry();
     });
 
@@ -29,8 +35,8 @@ export function useCommandManagementModel() {
   }, [extensionRegistry]);
 
   const groups = useMemo(
-    () => buildCommandManagementModelGroups(extensionRegistry, refreshToken),
-    [extensionRegistry, refreshToken],
+    () => buildCommandManagementModelGroups(extensionRegistry, refreshToken, contextKeySnapshot),
+    [contextKeySnapshot, extensionRegistry, refreshToken],
   );
 
   const totalCount = countCommandManagementEntries(groups);
@@ -71,19 +77,28 @@ export function useCommandManagementModel() {
 export function buildCommandManagementModelGroups(
   extensionRegistry: ExtensionRegistry,
   _refreshToken = 0,
+  contextKeys?: object | undefined,
 ) {
-  const shellCommands = createWorkbenchShellCommands({
+  const managedShellCommands = createWorkbenchShellCommands({
     activities: resolveShellCommandActivities(extensionRegistry),
     includeSettings: true,
     includeSidebarToggle: true,
   });
-  const shellCommandIds = new Set(shellCommands.map((command) => command.id));
+  const managedShellCommandIds = new Set(managedShellCommands.map((command) => command.id));
+  const shellCommands =
+    contextKeys === undefined
+      ? managedShellCommands
+      : createWorkbenchShellCommands({
+          activities: resolveShellCommandActivities(extensionRegistry, contextKeys),
+          includeSettings: true,
+          includeSidebarToggle: true,
+        });
   const commandFeaturesById = collectExtensionCommandFeaturesById(extensionRegistry);
 
   return buildCommandManagementGroups({
     extensionCommands: collectExtensionCommandEntries(
       extensionRegistry,
-      shellCommandIds,
+      managedShellCommandIds,
       commandFeaturesById,
     ),
     keybindingsByCommandId: collectKeybindingsByCommandId(extensionRegistry),

package/src/management/use-keybinding-management.ts

@@ -1,8 +1,5 @@
 import { useMemo } from 'react';
-import {
-  buildKeybindingManagementEntries,
-  type KeybindingDefinition,
-} from '@workbench-kit/platform';
+import { buildKeybindingManagementEntries } from '@workbench-kit/platform';
 import { createWorkbenchShellCommands } from '@workbench-kit/react/workbench';
 import type { ExtensionRegistry } from '@workbench-kit/workbench-core';
 
@@ -122,9 +119,3 @@ function collectKeybindingManagementCommands(extensionRegistry: ExtensionRegistr
 
   return commands;
 }
-
-export function toKeybindingOverrideDefinitions(
-  overrides: readonly KeybindingDefinition[],
-): KeybindingDefinition[] {
-  return overrides.map((binding) => ({ ...binding }));
-}

package/src/shell/provider.tsx

@@ -185,6 +185,24 @@ interface DeferredProviderDispose {
 
 const WorkbenchContext = createContext<WorkbenchContextValue | undefined>(undefined);
 
+function createInitialContextKeyService(
+  contextKeyValues: Readonly<Record<string, ContextKeyValue>> | undefined,
+): ContextKeyService {
+  const service = new ContextKeyService();
+
+  for (const [key, value] of Object.entries(
+    createWorkbenchPermissionContextKeys({ role: 'owner' }),
+  )) {
+    service.set(key, value);
+  }
+
+  for (const [key, value] of Object.entries(contextKeyValues ?? {})) {
+    service.set(key, value);
+  }
+
+  return service;
+}
+
 export function WorkbenchProvider({
   availableExtensions,
   children,
@@ -267,15 +285,7 @@ export function WorkbenchProvider({
   const [keybindingOverrides, setKeybindingOverridesState] = useState(
     resolvedInitialKeybindingOverrides,
   );
-  const contextKeyService = useMemo(() => {
-    const service = new ContextKeyService();
-    for (const [key, value] of Object.entries(
-      createWorkbenchPermissionContextKeys({ role: 'owner' }),
-    )) {
-      service.set(key, value);
-    }
-    return service;
-  }, []);
+  const [contextKeyService] = useState(() => createInitialContextKeyService(contextKeyValues));
 
   useEffect(() => {
     return () => {