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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@workbench-kit/shell-react",
-  "version": "0.0.2-prototype.0.2.27",
+  "version": "0.0.2-prototype.0.2.28",
   "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.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"
+    "@workbench-kit/react": "0.0.2-prototype.0.2.28",
+    "@workbench-kit/tokens": "0.0.2-prototype.0.2.28",
+    "@workbench-kit/field-remap": "0.0.2-prototype.0.2.28",
+    "@workbench-kit/workbench-config": "0.0.2-prototype.0.2.28",
+    "@workbench-kit/workbench-extension-sdk": "0.0.2-prototype.0.2.28",
+    "@workbench-kit/platform": "0.0.2-prototype.0.2.28",
+    "@workbench-kit/workspace": "0.0.2-prototype.0.2.28",
+    "@workbench-kit/workbench-core": "0.0.2-prototype.0.2.28"
   },
   "peerDependencies": {
     "react": "^19.0.0",

package/src/editor/view-providers.tsx

@@ -38,13 +38,6 @@ export interface ResolvedEditorDocumentViews {
 }
 
 export const JSON_FORM_PROVIDER_ID = 'workbench-kit.editor.form.json' as const;
-/** @deprecated Prefer `workbench-kit.samples.jdw.widget-form` from samples.jdw. */
-export const JDW_WIDGET_FORM_PROVIDER_ID = 'workbench-kit.samples.jdw.widget-form' as const;
-/** @deprecated Prefer `workbench-kit.samples.jdw.widget-preview` from samples.jdw. */
-export const JDW_PREVIEW_PROVIDER_ID = 'workbench-kit.samples.jdw.widget-preview' as const;
-/** @deprecated Prefer `workbench-kit.builtin.editor.markdown-preview` from builtin.editor. */
-export const MARKDOWN_PREVIEW_PROVIDER_ID =
-  'workbench-kit.builtin.editor.markdown-preview' as const;
 
 /**
  * Opt-in shallow top-level JSON object form.

package/src/field-remap/convert-note-editor.tsx

@@ -57,10 +57,8 @@ export function ConvertNoteEditor({
     if (!transformId) {
       return {};
     }
-    return (
-      resolveOptionSteps(chain, edge.transformOptionSteps, edge.transformOptions)[stepIndex] ?? {}
-    );
-  }, [chain, edge.transformOptionSteps, edge.transformOptions, stepIndex, transformId]);
+    return resolveOptionSteps(chain, edge.transformOptionSteps)[stepIndex] ?? {};
+  }, [chain, edge.transformOptionSteps, stepIndex, transformId]);
 
   const replaceCatalog = listCompatibleTransforms({
     registry: transforms,

package/src/field-remap/convert-palette.tsx

@@ -1,4 +1,5 @@
 import type { JSX } from 'react';
+import { SideBarList, SideBarListItem } from '@workbench-kit/react/layout';
 import { Button } from '@workbench-kit/react/primitives';
 import type { ValueTransformRegistry } from '@workbench-kit/field-remap';
 
@@ -59,7 +60,7 @@ export function FieldRemapConvertPalette({
         </Button>
       </div>
 
-      <ul
+      <SideBarList
         className="workbench-field-remap-convert-palette__list"
         role="listbox"
         aria-label={chromeLabels.convertsListAriaLabel}
@@ -67,27 +68,23 @@ export function FieldRemapConvertPalette({
         {catalog.map((definition) => {
           const selected = definition.id === selectedTransformId;
           return (
-            <li key={definition.id}>
-              <button
-                type="button"
-                role="option"
-                aria-selected={selected}
-                className={
-                  selected
-                    ? 'workbench-field-remap-convert-palette__item is-selected'
-                    : 'workbench-field-remap-convert-palette__item'
-                }
-                data-testid={`field-remap-palette-item-${definition.id}`}
-                onClick={() => onSelectedTransformIdChange(definition.id)}
-                onDoubleClick={() => onPlaceDraft(definition.id)}
-              >
-                <strong>{definition.label}</strong>
-                <code>{definition.id}</code>
-              </button>
-            </li>
+            <SideBarListItem
+              key={definition.id}
+              aria-selected={selected}
+              data-testid={`field-remap-palette-item-${definition.id}`}
+              role="option"
+              selected={selected}
+              variant="stacked"
+              wrapperProps={{ role: 'presentation' }}
+              onClick={() => onSelectedTransformIdChange(definition.id)}
+              onDoubleClick={() => onPlaceDraft(definition.id)}
+            >
+              <strong>{definition.label}</strong>
+              <code title={definition.id}>{definition.id}</code>
+            </SideBarListItem>
           );
         })}
-      </ul>
+      </SideBarList>
 
       {onAddCombine || onAddSplit ? (
         <div

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

@@ -462,28 +462,21 @@ function resolveConnectionPortIds(connection: {
     return {};
   }
 
-  let sourceFieldId: string | undefined;
-  let targetSlotId: string | undefined;
-
-  if (source === SOURCE_OBJECT_NODE_ID && connection.sourceHandle) {
-    sourceFieldId = connection.sourceHandle;
-  } else if (source.startsWith('src:')) {
-    sourceFieldId = source.slice('src:'.length);
-  }
-
-  if (target === TARGET_OBJECT_NODE_ID && connection.targetHandle) {
-    targetSlotId = connection.targetHandle;
-  } else if (target.startsWith('tgt:')) {
-    targetSlotId = target.slice('tgt:'.length);
-  }
-
-  return { sourceFieldId, targetSlotId };
+  return {
+    sourceFieldId:
+      source === SOURCE_OBJECT_NODE_ID && connection.sourceHandle
+        ? connection.sourceHandle
+        : undefined,
+    targetSlotId:
+      target === TARGET_OBJECT_NODE_ID && connection.targetHandle
+        ? connection.targetHandle
+        : undefined,
+  };
 }
 
 /**
  * Supported connect matrix for state-changing canvas drags:
  * - source-object port → target-object port (creates / replaces a `MappingEdge`)
- * - legacy `src:*` → `tgt:*` single-field node ids (tests / older graphs)
  * - source-object port → `draft:*` (bind draft input)
  * - `draft:*` → target-object port (bind draft output; finalize when both ends set)
  * - source-object port → `xf:*` `in` (rebind source; splice off earlier steps)
@@ -640,13 +633,10 @@ export function isValidFieldRemapFlowConnection(
     });
   }
 
-  let topologyOk = false;
-  if (source === SOURCE_OBJECT_NODE_ID && target === TARGET_OBJECT_NODE_ID) {
-    topologyOk = Boolean(connection.sourceHandle && connection.targetHandle);
-  } else if (source.startsWith('src:') && target.startsWith('tgt:')) {
-    // Legacy single-field node ids (older graphs / tests).
-    topologyOk = true;
-  }
+  const topologyOk =
+    source === SOURCE_OBJECT_NODE_ID &&
+    target === TARGET_OBJECT_NODE_ID &&
+    Boolean(connection.sourceHandle && connection.targetHandle);
 
   if (!topologyOk) {
     return false;
@@ -680,7 +670,7 @@ export type FieldRemapFlowConnectResult = {
   readonly removeEdgeIds?: readonly string[];
 };
 
-/** Parse React Flow connection (object ports or legacy) into a kit MappingEdge. */
+/** Parse a React Flow object-port connection into a kit MappingEdge. */
 export function connectionToMappingEdge(input: {
   readonly sourceNodeId: string;
   readonly targetNodeId: string;
@@ -688,21 +678,12 @@ export function connectionToMappingEdge(input: {
   readonly targetHandle?: string | null;
   readonly existing: readonly MappingEdge[];
 }): MappingEdge | null {
-  let sourceFieldId: string | undefined;
-  let targetSlotId: string | undefined;
-
-  if (input.sourceNodeId === SOURCE_OBJECT_NODE_ID && input.sourceHandle) {
-    sourceFieldId = input.sourceHandle;
-  } else if (input.sourceNodeId.startsWith('src:')) {
-    // Legacy single-field node ids (older graphs / tests).
-    sourceFieldId = input.sourceNodeId.slice('src:'.length);
-  }
-
-  if (input.targetNodeId === TARGET_OBJECT_NODE_ID && input.targetHandle) {
-    targetSlotId = input.targetHandle;
-  } else if (input.targetNodeId.startsWith('tgt:')) {
-    targetSlotId = input.targetNodeId.slice('tgt:'.length);
-  }
+  const { sourceFieldId, targetSlotId } = resolveConnectionPortIds({
+    source: input.sourceNodeId,
+    target: input.targetNodeId,
+    sourceHandle: input.sourceHandle,
+    targetHandle: input.targetHandle,
+  });
 
   if (!sourceFieldId || !targetSlotId) {
     return null;
@@ -811,7 +792,6 @@ export function applyFieldRemapFlowConnection(input: {
         itemEdges: undefined,
         itemTransformIds: undefined,
         itemTransformOptionSteps: undefined,
-        itemTransformOptions: undefined,
       },
       removeEdgeIds: [edgeA.id],
     };

package/src/field-remap/index.ts

@@ -47,7 +47,6 @@ export {
   createJsonataValueTransform,
   jsonataValueTransform,
   type CreateJsonataValueTransformOptions,
-  type JsonataTransformErrorPolicy,
 } from './jsonata-transform.js';
 export {
   addTransformStepToEdge,

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';

package/src/workbench/command-host.tsx

@@ -16,6 +16,10 @@ import {
   type WorkbenchCommandRunContext,
   type WorkbenchShellCommandContext,
 } from '@workbench-kit/react/workbench';
+import {
+  matchesWorkbenchCommandPaletteShortcut,
+  matchesWorkbenchQuickAccessShortcut,
+} from '@workbench-kit/react/workbench/command-ui';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 
 import { useContextKeyRevision } from '../commands/use-context-key-revision.js';
@@ -24,8 +28,6 @@ import { registerWorkbenchShellCommandHandlers } from './shell-command-registrat
 import {
   buildWorkbenchPaletteCommands,
   collectExtensionCommandFeaturesById,
-  matchesWorkbenchCommandPaletteShortcut,
-  matchesWorkbenchQuickAccessShortcut,
   resolveShellCommandActivities,
 } from './command-palette.js';
 import { resolveExtensionKeybindingCommand } from './keybinding-bridge.js';

package/src/workbench/command-palette.ts

@@ -10,9 +10,6 @@ import {
   type ExtensionRegistry,
 } from '@workbench-kit/workbench-core';
 
-export const WORKBENCH_COMMAND_PALETTE_SHORTCUT = 'Ctrl+Shift+P';
-export const WORKBENCH_QUICK_ACCESS_SHORTCUT = 'Ctrl+P';
-
 type ExtensionCommand = ReturnType<ExtensionRegistry['commands']['getCommands']>[number];
 
 function resolveCommandValue<TContext, TValue>(
@@ -176,43 +173,3 @@ export function buildWorkbenchPaletteCommands({
     ...additionalCommands,
   ]);
 }
-
-export function matchesWorkbenchCommandPaletteShortcut(
-  event: Pick<KeyboardEvent, 'altKey' | 'ctrlKey' | 'key' | 'metaKey' | 'shiftKey'>,
-) {
-  const key = event.key.toLowerCase();
-
-  if (key !== 'p') {
-    return false;
-  }
-
-  if (!(event.ctrlKey || event.metaKey) || !event.shiftKey || event.altKey) {
-    return false;
-  }
-
-  return true;
-}
-
-export function matchesWorkbenchQuickAccessShortcut(
-  event: Pick<KeyboardEvent, 'altKey' | 'ctrlKey' | 'key' | 'metaKey' | 'shiftKey'>,
-) {
-  const key = event.key.toLowerCase();
-
-  if (key !== 'p') {
-    return false;
-  }
-
-  if (!(event.ctrlKey || event.metaKey) || event.shiftKey || event.altKey) {
-    return false;
-  }
-
-  return true;
-}
-
-export function getWorkbenchCommandPaletteShortcutLabel() {
-  return WORKBENCH_COMMAND_PALETTE_SHORTCUT;
-}
-
-export function getWorkbenchQuickAccessShortcutLabel() {
-  return WORKBENCH_QUICK_ACCESS_SHORTCUT;
-}