@workbench-kit/shell-react 0.0.2-prototype.0.2.26 → 0.0.2-prototype.0.2.28

package/src/field-remap/io-class-browse.tsx

@@ -20,6 +20,10 @@ export interface FieldRemapIoClassBrowseProps {
   readonly targetsTitle?: string;
   readonly className?: string;
   readonly emptyLabel?: string;
+  readonly labels?: {
+    readonly hiddenBadge?: string;
+    readonly classRefTitle?: string;
+  };
 }
 
 export function resolveFieldRemapIoChrome(
@@ -39,9 +43,11 @@ function formatClassRef(classRef: { readonly id: string; readonly version: numbe
 function FieldTree({
   nodes,
   emptyLabel,
+  labels,
 }: {
   readonly nodes: readonly (SourceField | TargetSlot)[];
   readonly emptyLabel: string;
+  readonly labels: FieldRemapIoClassBrowseProps['labels'];
 }): JSX.Element {
   if (nodes.length === 0) {
     return <p className="workbench-field-remap-io-browse__empty">{emptyLabel}</p>;
@@ -55,19 +61,22 @@ function FieldTree({
             <span className="workbench-field-remap-io-browse__meta">
               {node.dataType ? <span>{node.dataType}</span> : null}
               {node.classRef ? (
-                <span className="workbench-field-remap-io-browse__badge" title="classRef">
+                <span
+                  className="workbench-field-remap-io-browse__badge"
+                  title={labels?.classRefTitle ?? 'classRef'}
+                >
                   {formatClassRef(node.classRef)}
                 </span>
               ) : null}
               {node.hidden === true ? (
                 <span className="workbench-field-remap-io-browse__badge" title="hidden">
-                  Hidden
+                  {labels?.hiddenBadge ?? 'Hidden'}
                 </span>
               ) : null}
             </span>
           </div>
           {node.children?.length ? (
-            <FieldTree emptyLabel={emptyLabel} nodes={node.children} />
+            <FieldTree emptyLabel={emptyLabel} labels={labels} nodes={node.children} />
           ) : null}
         </li>
       ))}
@@ -79,10 +88,12 @@ function PortSection({
   title,
   nodes,
   emptyLabel,
+  labels,
 }: {
   readonly title: string;
   readonly nodes: readonly (SourceField | TargetSlot)[];
   readonly emptyLabel: string;
+  readonly labels: FieldRemapIoClassBrowseProps['labels'];
 }): JSX.Element {
   return (
     <section aria-label={title} className="workbench-field-remap-io-browse__section">
@@ -96,11 +107,12 @@ function PortSection({
               <span className="workbench-field-remap-io-browse__port-id">{node.label}</span>
               <span className="workbench-field-remap-io-browse__port-meta">
                 {node.classRef ? formatClassRef(node.classRef) : node.id}
-                {node.hidden === true ? ' · Hidden' : ''}
+                {node.hidden === true ? ` · ${labels?.hiddenBadge ?? 'Hidden'}` : ''}
               </span>
             </p>
             <FieldTree
               emptyLabel={emptyLabel}
+              labels={labels}
               nodes={node.children?.length ? node.children : [node]}
             />
           </div>
@@ -123,6 +135,7 @@ export function FieldRemapIoClassBrowse({
   targetsTitle = 'Outputs',
   className,
   emptyLabel = 'No fields',
+  labels,
 }: FieldRemapIoClassBrowseProps): JSX.Element {
   const projectedSources = useMemo(
     () => projectSourceFields(sources, { includeHidden }),
@@ -138,8 +151,18 @@ export function FieldRemapIoClassBrowse({
       className={['workbench-field-remap-io-browse', className].filter(Boolean).join(' ')}
       data-testid="field-remap-io-browse"
     >
-      <PortSection emptyLabel={emptyLabel} nodes={projectedSources} title={sourcesTitle} />
-      <PortSection emptyLabel={emptyLabel} nodes={projectedTargets} title={targetsTitle} />
+      <PortSection
+        emptyLabel={emptyLabel}
+        labels={labels}
+        nodes={projectedSources}
+        title={sourcesTitle}
+      />
+      <PortSection
+        emptyLabel={emptyLabel}
+        labels={labels}
+        nodes={projectedTargets}
+        title={targetsTitle}
+      />
     </div>
   );
 }

package/src/field-remap/jsonata-transform.ts

@@ -10,8 +10,6 @@ export const DEFAULT_JSONATA_TIMEOUT_MS = 2_000;
 /** Default maximum expression source length (characters). */
 export const DEFAULT_JSONATA_MAX_EXPRESSION_LENGTH = 4_096;
 
-export type JsonataTransformErrorPolicy = 'passthrough' | 'throw';
-
 export interface CreateJsonataValueTransformOptions {
   /** Wall-clock timeout for `evaluate` (default {@link DEFAULT_JSONATA_TIMEOUT_MS}). */
   readonly timeoutMs?: number;
@@ -20,11 +18,6 @@ export interface CreateJsonataValueTransformOptions {
    * (default {@link DEFAULT_JSONATA_MAX_EXPRESSION_LENGTH}).
    */
   readonly maxExpressionLength?: number;
-  /**
-   * - `throw` (default): surface timeout / compile / evaluate failures to the host
-   * - `passthrough`: return the original value (legacy silent identity)
-   */
-  readonly onError?: JsonataTransformErrorPolicy;
 }
 
 export function createJsonataValueTransform(
@@ -32,7 +25,6 @@ export function createJsonataValueTransform(
 ): ValueTransformDefinition {
   const timeoutMs = options.timeoutMs ?? DEFAULT_JSONATA_TIMEOUT_MS;
   const maxExpressionLength = options.maxExpressionLength ?? DEFAULT_JSONATA_MAX_EXPRESSION_LENGTH;
-  const onError = options.onError ?? 'throw';
 
   return {
     id: JSONATA_TRANSFORM_ID,
@@ -57,30 +49,22 @@ export function createJsonataValueTransform(
       }
 
       if (expression.length > maxExpressionLength) {
-        return handleJsonataError(
-          new Error(
-            `JSONata expression exceeds max length (${expression.length} > ${maxExpressionLength}).`,
-          ),
-          value,
-          onError,
+        throw new Error(
+          `JSONata expression exceeds max length (${expression.length} > ${maxExpressionLength}).`,
         );
       }
 
-      try {
-        const compiled = jsonata(expression);
-        // jsonata@2.x evaluate returns a Promise (1.x was synchronous).
-        return await raceJsonataEvaluation(compiled.evaluate(value), {
-          timeoutMs,
-          signal: context.signal,
-        });
-      } catch (error) {
-        return handleJsonataError(error, value, onError);
-      }
+      const compiled = jsonata(expression);
+      // jsonata@2.x evaluate returns a Promise (1.x was synchronous).
+      return await raceJsonataEvaluation(compiled.evaluate(value), {
+        timeoutMs,
+        signal: context.signal,
+      });
     },
   };
 }
 
-/** Default bounded transform (`onError: 'throw'`, 2s timeout, 4k expression cap). */
+/** Default bounded transform (2s timeout, 4k expression cap). */
 export const jsonataValueTransform: ValueTransformDefinition = createJsonataValueTransform();
 
 export class JsonataTransformTimeoutError extends Error {
@@ -150,17 +134,3 @@ export async function raceJsonataEvaluation<T>(
     );
   });
 }
-
-function handleJsonataError(
-  error: unknown,
-  value: unknown,
-  onError: JsonataTransformErrorPolicy,
-): unknown {
-  if (onError === 'passthrough') {
-    return value;
-  }
-  if (error instanceof Error) {
-    throw error;
-  }
-  throw new Error(String(error));
-}

package/src/field-remap/shape-io-editor.tsx

@@ -34,7 +34,7 @@ function formatJson(value: unknown): string {
 
 /**
  * Host-owned shape IO surface: paste JSON → ingest fields/slots, edit FieldDataType.
- * Persistence stays host-owned (`FieldRemapDocument` v1 is edges-only).
+ * Persistence stays host-owned (`FieldRemapDocument` stores mappings, not shapes).
  */
 export function FieldRemapShapeIoEditor({
   role,

package/src/field-remap/transform-options-editor.tsx

@@ -195,8 +195,7 @@ function JsonOptionEditor({
 
 /**
  * Presentational editor for `TransformOptionField` kinds (string / number / boolean /
- * stringMap / json). Emits a full options record; callers typically pass through
- * `patchOptionStep` / `sanitizeOptionRecord`.
+ * stringMap / json). Emits the full options record for one transform step.
  */
 export function TransformOptionsEditor({
   fields,

package/src/field-remap/view.css

@@ -365,41 +365,16 @@
 }
 
 .workbench-field-remap-convert-palette__list {
-  list-style: none;
-  margin: 0;
-  padding: 0;
-  display: flex;
   flex: 1 1 auto;
-  flex-direction: column;
-  gap: 0.35rem;
   min-height: 0;
   overflow: auto;
 }
 
-.workbench-field-remap-convert-palette__item {
-  display: flex;
-  flex-direction: column;
-  align-items: flex-start;
-  gap: 0.15rem;
-  width: 100%;
-  margin: 0;
-  padding: 0.45rem 0.5rem;
-  border: 1px solid var(--vscode-panel-border, var(--color-border));
-  border-radius: 0.25rem;
-  background: var(--vscode-editor-background, var(--color-bg));
-  color: inherit;
-  text-align: left;
-  cursor: pointer;
-  font: inherit;
-}
-
-.workbench-field-remap-convert-palette__item.is-selected {
-  border-color: var(--vscode-focusBorder, var(--color-accent, #3794ff));
-}
-
-.workbench-field-remap-convert-palette__item code {
+.workbench-field-remap-convert-palette__list code {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
   font-size: 0.7rem;
-  word-break: break-all;
 }
 
 .workbench-field-remap-convert-palette__operators {

package/src/index.ts

@@ -63,11 +63,8 @@ export { EditorArea, type EditorAreaProps, type EditorViewMode } from './editor/
 export {
   DEFAULT_EDITOR_DOCUMENT_VIEW_PROVIDERS,
   EditorDocumentViewProviderRegistry,
-  JDW_PREVIEW_PROVIDER_ID,
-  JDW_WIDGET_FORM_PROVIDER_ID,
   JSON_FORM_PROVIDER,
   JSON_FORM_PROVIDER_ID,
-  MARKDOWN_PREVIEW_PROVIDER_ID,
   createEditorDocumentViewProviderRegistry,
   resolveEditorDocumentViewProvider,
   resolveEditorDocumentViews,
@@ -182,7 +179,6 @@ export {
   createJsonataValueTransform,
   jsonataValueTransform,
   type CreateJsonataValueTransformOptions,
-  type JsonataTransformErrorPolicy,
 } from './field-remap/jsonata-transform.js';
 export {
   FIELD_REMAP_SAMPLES,
@@ -216,13 +212,7 @@ export {
   type WorkbenchThemeOption,
 } from './shell/shell.js';
 export {
-  getWorkbenchCommandPaletteShortcutLabel,
-  getWorkbenchQuickAccessShortcutLabel,
-  WORKBENCH_COMMAND_PALETTE_SHORTCUT,
-  WORKBENCH_QUICK_ACCESS_SHORTCUT,
   buildWorkbenchPaletteCommands,
-  matchesWorkbenchCommandPaletteShortcut,
-  matchesWorkbenchQuickAccessShortcut,
   mergeWorkbenchCommandDescriptors,
   resolveShellCommandActivities,
 } from './workbench/command-palette.js';
@@ -242,6 +232,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 () => {

package/src/shell/shell.tsx

@@ -1,6 +1,5 @@
 import { useCallback, useEffect, useMemo, useReducer, useState, type ReactNode } from 'react';
 import { Modal } from '@workbench-kit/react/modal';
-import { TilepaperAppIcon } from '@workbench-kit/react';
 import { Badge, Button, IconButton } from '@workbench-kit/react/primitives';
 import {
   WorkbenchSettingsModal,
@@ -89,6 +88,8 @@ export type { WorkbenchLocaleOption, WorkbenchThemeOption } from './settings.js'
 export interface WorkbenchShellProps {
   accountManagement?: WorkbenchAccountManagementInput | undefined;
   additionalSettingsCategories?: readonly WorkbenchSettingsCategory[] | undefined;
+  /** Host-owned product mark shown by the default title bar. */
+  appIcon?: ReactNode;
   catalogTrustPolicy?: ExtensionCatalogTrustPolicy | undefined;
   catalogUrl?: string | undefined;
   commandHost?: false | Omit<WorkbenchCommandHostProps, 'onOpenSettings'>;
@@ -147,6 +148,7 @@ const OPEN_SETTINGS_COMMAND_ID = 'workbench-kit.builtin.settings.open';
 export function WorkbenchShell({
   accountManagement,
   additionalSettingsCategories,
+  appIcon,
   catalogTrustPolicy,
   catalogUrl = '/extension-catalog.json',
   commandHost,
@@ -383,6 +385,7 @@ export function WorkbenchShell({
   const resolvedTitleBar =
     titleBar === undefined ? (
       <WorkbenchShellTitleBar
+        appIcon={appIcon}
         helpContent={helpContent}
         isAuxiliarySidebarVisible={layout.auxiliaryBar.visible}
         isPanelVisible={layout.panel.visible}
@@ -725,6 +728,7 @@ export function WorkbenchShell({
 }
 
 function WorkbenchShellTitleBar({
+  appIcon,
   helpContent,
   isAuxiliarySidebarVisible,
   isPanelVisible,
@@ -739,6 +743,7 @@ function WorkbenchShellTitleBar({
   onTogglePanel,
   onTogglePrimarySidebar,
 }: {
+  appIcon: ReactNode | undefined;
   helpContent: ReactNode | undefined;
   isAuxiliarySidebarVisible: boolean;
   isPanelVisible: boolean;
@@ -756,9 +761,11 @@ function WorkbenchShellTitleBar({
   return (
     <>
       <div className="workbench-shell-titlebar__identity">
-        <span aria-hidden className="workbench-shell-titlebar__app-icon">
-          <TilepaperAppIcon compact />
-        </span>
+        {appIcon ? (
+          <span aria-hidden className="workbench-shell-titlebar__app-icon">
+            {appIcon}
+          </span>
+        ) : null}
         <span className="workbench-shell-titlebar__title">{title}</span>
         {titleMeta ? <span className="workbench-shell-titlebar__meta">{titleMeta}</span> : null}
       </div>