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

package/src/extensions/use-extension-management.ts

@@ -1,22 +1,18 @@
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useState, useSyncExternalStore } from 'react';
 import {
   DEFAULT_EXTENSION_CATALOG_TRUST_POLICY,
   DEFAULT_EXTENSION_INSTALL_TRUST_STORAGE_KEY,
-  DEFAULT_INSTALLED_EXTENSIONS_STORAGE_KEY,
   ExtensionInstallApprovalRequiredError,
   applyExtensionInstallPlanToRecords,
   assertExtensionCatalogUrlAllowed,
   loadExtensionInstallTrustRecords,
-  loadInstalledExtensions,
   parseExtensionCatalog,
   recordExtensionInstallTrust,
-  saveExtensionInstallTrustRecords,
-  saveInstalledExtensions,
-  toggleInstalledExtensionEnabled,
+  saveExtensionInstallTrustRecordsResult,
   type ExtensionCatalogEntry,
   type ExtensionCatalogTrustPolicy,
   type ExtensionInstallTrustRecord,
-  type InstalledExtensionRecord,
+  type WorkbenchPersistenceDiagnosticHandler,
 } from '@workbench-kit/workbench-core';
 import type {
   ExtensionCatalogBrowseEntry,
@@ -30,61 +26,67 @@ import {
   createExtensionCatalogBrowseEntries,
   createExtensionInstallPlanningContext,
   createExtensionManagementEntries,
+  type ExtensionUninstallActionConstraint,
 } from './management-model.js';
 import { useWorkbench, type WorkbenchStorageAdapter } from '../shell/provider.js';
+import { useExtensionEnablementController } from './extension-enablement-context.js';
+import type {
+  ExtensionEnablementTransitionResult,
+  ExtensionUninstallActionResult,
+} from './extension-enablement-controller.js';
+import { useWorkbenchPersistenceDiagnosticHandler } from '../shell/persistence-diagnostic-context.js';
+import {
+  reportPersistenceWriteResult,
+  usePersistenceDiagnosticHandlerRef,
+} from '../storage/persistence-diagnostics.js';
 
 export interface UseExtensionManagementModelOptions {
   catalogTrustPolicy?: ExtensionCatalogTrustPolicy | undefined;
   catalogUrl?: string | undefined;
-  installedExtensionsStorage?: WorkbenchStorageAdapter | undefined;
-  installedExtensionsStorageKey?: string | undefined;
   installTrustStorage?: WorkbenchStorageAdapter | undefined;
   installTrustStorageKey?: string | undefined;
+  onPersistenceDiagnostic?: WorkbenchPersistenceDiagnosticHandler | undefined;
 }
 
 export function useExtensionManagementModel({
   catalogTrustPolicy = DEFAULT_EXTENSION_CATALOG_TRUST_POLICY,
   catalogUrl = '/extension-catalog.json',
-  installedExtensionsStorage,
-  installedExtensionsStorageKey,
   installTrustStorage,
   installTrustStorageKey = DEFAULT_EXTENSION_INSTALL_TRUST_STORAGE_KEY,
+  onPersistenceDiagnostic,
 }: UseExtensionManagementModelOptions = {}) {
   const workbench = useWorkbench();
-  const { availableExtensions, extensionRegistry } = workbench;
-  const resolvedInstalledExtensionsStorage =
-    installedExtensionsStorage ?? workbench.installedExtensionsStorage;
-  const resolvedInstalledExtensionsStorageKey =
-    installedExtensionsStorageKey ??
-    workbench.installedExtensionsStorageKey ??
-    DEFAULT_INSTALLED_EXTENSIONS_STORAGE_KEY;
-  const resolvedInstallTrustStorage = installTrustStorage ?? resolvedInstalledExtensionsStorage;
+  const providerPersistenceDiagnostic = useWorkbenchPersistenceDiagnosticHandler();
+  const diagnosticHandlerRef = usePersistenceDiagnosticHandlerRef(
+    onPersistenceDiagnostic ?? providerPersistenceDiagnostic,
+  );
+  const extensionEnablement = useExtensionEnablementController();
+  const { availableExtensions, extensionCatalog } = workbench;
+  const resolvedInstallTrustStorage = installTrustStorage ?? workbench.installedExtensionsStorage;
+  const installedRecords = useSyncExternalStore(
+    extensionEnablement.subscribeInstalledRecords,
+    extensionEnablement.getInstalledRecordsSnapshot,
+    extensionEnablement.getInstalledRecordsSnapshot,
+  );
   const [catalogEntries, setCatalogEntries] = useState<readonly ExtensionCatalogEntry[]>([]);
   const [catalogLoading, setCatalogLoading] = useState(Boolean(catalogUrl));
   const [catalogError, setCatalogError] = useState<string | undefined>();
   const [pendingAction, setPendingAction] = useState<
     ExtensionManagementPendingAction | undefined
   >();
-  const [installedRecords, setInstalledRecords] = useState<readonly InstalledExtensionRecord[]>(
-    () =>
-      loadInstalledExtensions(
-        resolvedInstalledExtensionsStorageKey,
-        resolvedInstalledExtensionsStorage,
-      ),
-  );
+  const [pendingUninstallEntry, setPendingUninstallEntry] = useState<
+    ExtensionManagementEntry | undefined
+  >();
+  const [uninstallActionConstraint, setUninstallActionConstraint] = useState<
+    ExtensionUninstallActionConstraint | undefined
+  >();
+  const [lastTransition, setLastTransition] = useState<
+    ExtensionEnablementTransitionResult | undefined
+  >();
   const [installTrustRecords, setInstallTrustRecords] = useState<
     readonly ExtensionInstallTrustRecord[]
   >(() => loadExtensionInstallTrustRecords(installTrustStorageKey, resolvedInstallTrustStorage));
 
-  useEffect(() => {
-    setInstalledRecords(
-      loadInstalledExtensions(
-        resolvedInstalledExtensionsStorageKey,
-        resolvedInstalledExtensionsStorage,
-      ),
-    );
-  }, [resolvedInstalledExtensionsStorage, resolvedInstalledExtensionsStorageKey]);
-
   useEffect(() => {
     setInstallTrustRecords(
       loadExtensionInstallTrustRecords(installTrustStorageKey, resolvedInstallTrustStorage),
@@ -138,28 +140,66 @@ export function useExtensionManagementModel({
   }, [catalogTrustPolicy, catalogUrl]);
 
   const installedEntries = useMemo<readonly ExtensionManagementEntry[]>(() => {
-    return createExtensionManagementEntries({
+    const projectedEntries = createExtensionManagementEntries({
       availableExtensions,
-      extensionRegistry,
+      extensionCatalog,
       installedRecords,
+      transition: lastTransition,
+      uninstallActionConstraint,
     });
-  }, [availableExtensions, extensionRegistry, installedRecords]);
+    if (!pendingUninstallEntry) {
+      return projectedEntries;
+    }
+
+    return [
+      ...projectedEntries.filter((entry) => entry.id !== pendingUninstallEntry.id),
+      pendingUninstallEntry,
+    ].sort((left, right) => left.displayName.localeCompare(right.displayName));
+  }, [
+    availableExtensions,
+    extensionCatalog,
+    installedRecords,
+    lastTransition,
+    pendingUninstallEntry,
+    uninstallActionConstraint,
+  ]);
+
+  const handleTransition = useCallback(
+    (
+      result: ExtensionEnablementTransitionResult,
+      pendingKind: ExtensionManagementPendingAction['kind'],
+    ) => {
+      setLastTransition(result);
+      if (result.kind !== 'reloadRequired') {
+        setPendingAction(undefined);
+        return;
+      }
+
+      setPendingAction({ entryId: result.extensionId, kind: pendingKind });
+      if (typeof window !== 'undefined') {
+        window.requestAnimationFrame(() => {
+          window.location.reload();
+        });
+      }
+    },
+    [],
+  );
 
   const browseEntries = useMemo<readonly ExtensionCatalogBrowseEntry[]>(() => {
     return createExtensionCatalogBrowseEntries({
       availableExtensions,
       catalogEntries,
-      extensionRegistry,
+      extensionCatalog,
       installedRecords,
     });
-  }, [availableExtensions, catalogEntries, extensionRegistry, installedRecords]);
+  }, [availableExtensions, catalogEntries, extensionCatalog, installedRecords]);
 
   const installCatalogEntry = useCallback(
     (entry: ExtensionCatalogBrowseEntry, options?: ExtensionInstallOptions) => {
       const installContext = createExtensionInstallPlanningContext({
         availableExtensions,
         catalogEntries,
-        extensionRegistry,
+        extensionCatalog,
         installedRecords,
       });
       const plan = createCatalogEntryInstallPlan(entry, installContext);
@@ -178,26 +218,15 @@ export function useExtensionManagementModel({
         installSources: installContext.installSources,
         plan,
       });
-      saveInstalledExtensions(
-        next,
-        resolvedInstalledExtensionsStorageKey,
-        resolvedInstalledExtensionsStorage,
-      );
-      setInstalledRecords(next);
-      setPendingAction({ entryId: entry.id, kind: 'install' });
-      if (typeof window !== 'undefined') {
-        window.requestAnimationFrame(() => {
-          window.location.reload();
-        });
-      }
+      handleTransition(extensionEnablement.commitInstalledRecords(next, entry.id), 'install');
     },
     [
       availableExtensions,
       catalogEntries,
-      extensionRegistry,
+      extensionCatalog,
       installedRecords,
-      resolvedInstalledExtensionsStorage,
-      resolvedInstalledExtensionsStorageKey,
+      extensionEnablement,
+      handleTransition,
     ],
   );
 
@@ -207,31 +236,58 @@ export function useExtensionManagementModel({
         return;
       }
 
-      const next = toggleInstalledExtensionEnabled(
-        entry.id,
-        enabled,
-        resolvedInstalledExtensionsStorageKey,
-        resolvedInstalledExtensionsStorage,
-      );
-      setInstalledRecords(next);
-      setPendingAction({ entryId: entry.id, kind: 'toggle' });
+      handleTransition(extensionEnablement.toggleInstalledExtension(entry.id, enabled), 'toggle');
+    },
+    [extensionEnablement, handleTransition],
+  );
+
+  const uninstallInstalledEntry = useCallback(
+    (entry: ExtensionManagementEntry) => {
+      if (entry.source !== 'installed' || entry.id.startsWith('workbench-kit.builtin.')) {
+        return;
+      }
+
+      const result = extensionEnablement.uninstallInstalledExtension(entry.id);
+      if (result.kind === 'blocked' || result.kind === 'ineligibleTarget') {
+        setUninstallActionConstraint(toExtensionUninstallActionConstraint(result));
+        return;
+      }
+
+      setUninstallActionConstraint(undefined);
+      setLastTransition(result);
+      if (result.kind !== 'reloadRequired') {
+        setPendingUninstallEntry(undefined);
+        return;
+      }
+
+      setPendingUninstallEntry(entry);
       if (typeof window !== 'undefined') {
         window.requestAnimationFrame(() => {
           window.location.reload();
         });
       }
     },
-    [resolvedInstalledExtensionsStorage, resolvedInstalledExtensionsStorageKey],
+    [extensionEnablement],
   );
 
   const rememberInstallTrust = useCallback(
     (entry: ExtensionCatalogBrowseEntry) => {
       const permissions = entry.installPlan?.permissions ?? [];
       const next = recordExtensionInstallTrust(entry.id, permissions, installTrustRecords);
-      saveExtensionInstallTrustRecords(next, installTrustStorageKey, resolvedInstallTrustStorage);
       setInstallTrustRecords(next);
+      const persistence = saveExtensionInstallTrustRecordsResult(
+        next,
+        installTrustStorageKey,
+        resolvedInstallTrustStorage,
+      );
+      reportPersistenceWriteResult(persistence, diagnosticHandlerRef);
     },
-    [installTrustRecords, installTrustStorageKey, resolvedInstallTrustStorage],
+    [
+      diagnosticHandlerRef,
+      installTrustRecords,
+      installTrustStorageKey,
+      resolvedInstallTrustStorage,
+    ],
   );
 
   return {
@@ -242,7 +298,35 @@ export function useExtensionManagementModel({
     installedEntries,
     installTrustRecords,
     pendingAction,
+    pendingUninstallEntryId: pendingUninstallEntry?.id,
     rememberInstallTrust,
     toggleInstalledEntry,
+    uninstallInstalledEntry,
+  };
+}
+
+function toExtensionUninstallActionConstraint(
+  result: Extract<
+    ExtensionUninstallActionResult,
+    { readonly kind: 'blocked' | 'ineligibleTarget' }
+  >,
+): ExtensionUninstallActionConstraint {
+  if (result.kind === 'blocked') {
+    return {
+      eligibility: {
+        dependentExtensionIds: result.dependentExtensionIds,
+        kind: result.kind,
+        unresolvedExtensionIds: result.unresolvedExtensionIds,
+      },
+      extensionId: result.extensionId,
+    };
+  }
+  return {
+    eligibility: {
+      diagnosticExtensionIds: result.diagnosticExtensionIds,
+      kind: result.kind,
+      reason: result.reason,
+    },
+    extensionId: result.extensionId,
   };
 }

package/src/extensions/view.tsx

@@ -32,8 +32,10 @@ export function BuiltinExtensionsView({
     installedEntries,
     installTrustRecords,
     pendingAction,
+    pendingUninstallEntryId,
     rememberInstallTrust,
     toggleInstalledEntry,
+    uninstallInstalledEntry,
   } = useExtensionManagementModel({ catalogTrustPolicy, catalogUrl });
 
   const isInstallTrusted = useCallback(
@@ -55,9 +57,11 @@ export function BuiltinExtensionsView({
       isInstallTrusted={isInstallTrusted}
       missingExtensionIds={missingExtensionIds}
       pendingAction={pendingAction}
+      pendingUninstallEntryId={pendingUninstallEntryId}
       onInstall={installCatalogEntry}
       onRememberInstallTrust={rememberInstallTrust}
       onToggleEnabled={toggleInstalledEntry}
+      onUninstall={uninstallInstalledEntry}
     />
   );
 }

package/src/field-remap/chrome-labels.ts

@@ -18,31 +18,76 @@ export interface FieldRemapChromeLabels {
   readonly convertPaletteDescription: string;
   readonly convertPaletteAriaLabel: string;
   readonly convertsListAriaLabel: string;
+  /** Additive filter copy. Omitted legacy label objects use the English defaults. */
+  readonly convertFilterLabel?: string;
+  readonly convertFilterPlaceholder?: string;
+  readonly clearConvertFilter?: string;
+  readonly noMatchingConverts?: string;
   readonly placeConvert: string;
+  readonly addCombine: string;
+  readonly addSplit: string;
   readonly operatorsTitle: string;
   readonly operatorsDescription: string;
+  readonly addTransform: string;
+  readonly editItems: string;
+  readonly removeBinding: string;
   readonly showMinimap: string;
   readonly hideMinimap: string;
   readonly showHiddenFields: string;
   readonly hideHiddenFields: string;
+  readonly emptyDetailTitle: string;
+  readonly emptyDetailDescription: string;
+  /** Additive Flow preview copy. Omitted legacy label objects use English defaults. */
+  readonly previewTitle?: string;
+  readonly previewLoading?: string;
+  readonly previewError?: string;
+  readonly previewDocumentResult?: string;
+  readonly previewBindingResult?: string;
+  readonly previewStepIntermediateUnavailable?: string;
+  readonly previewOperatorIntermediateUnavailable?: string;
+  readonly previewDraftUnavailable?: string;
+  readonly previewSelectionUnavailable?: string;
 }
 
-export const defaultFieldRemapChromeLabels: FieldRemapChromeLabels = {
+export const defaultFieldRemapChromeLabels = {
   bindingsTitle: 'Bindings',
   convertPaletteTitle: 'Convert palette',
   convertPaletteDescription:
     'Place a convert first, then wire source → draft → target. Drafts stay off the document until both ports bind.',
   convertPaletteAriaLabel: 'Convert palette',
   convertsListAriaLabel: 'Converts',
+  convertFilterLabel: 'Filter converts',
+  convertFilterPlaceholder: 'Filter by label or id',
+  clearConvertFilter: 'Clear convert filter',
+  noMatchingConverts: 'No matching converts.',
   placeConvert: 'Place convert',
+  addCombine: 'Add combine',
+  addSplit: 'Add split',
   operatorsTitle: 'n→m operators',
   operatorsDescription:
     'Create combine (n→1) or split (1→n), then wire ports or edit in the side rail.',
+  addTransform: 'Add convert',
+  editItems: 'Edit items',
+  removeBinding: 'Remove binding',
   showMinimap: 'Show minimap',
   hideMinimap: 'Hide minimap',
   showHiddenFields: 'Show hidden fields',
   hideHiddenFields: 'Hide hidden fields',
-};
+  emptyDetailTitle: 'Start with a convert',
+  emptyDetailDescription:
+    'Use the Convert palette to place a convert, then wire source → draft → target. Or select an existing binding / convert note on the canvas.',
+  previewTitle: 'Sample preview',
+  previewLoading: 'Updating preview…',
+  previewError: 'Preview failed',
+  previewDocumentResult: 'Final document output',
+  previewBindingResult: 'Final binding value',
+  previewStepIntermediateUnavailable:
+    'Per-step intermediate values are unavailable; this is the final binding value.',
+  previewOperatorIntermediateUnavailable:
+    'Selected-operator intermediate values are unavailable; this is the final document output.',
+  previewDraftUnavailable: 'Draft converts are not executable until they become a binding.',
+  previewSelectionUnavailable: 'The selected binding or operator is no longer available.',
+} as const satisfies Required<FieldRemapChromeLabels>;
 
 /** Stable capability ids for optional `t()` injection (not free prose). */
 export const fieldRemapChromeLabelKeys = {
@@ -51,13 +96,33 @@ export const fieldRemapChromeLabelKeys = {
   convertPaletteDescription: 'fieldRemap.convertPaletteDescription',
   convertPaletteAriaLabel: 'fieldRemap.convertPaletteAriaLabel',
   convertsListAriaLabel: 'fieldRemap.convertsListAriaLabel',
+  convertFilterLabel: 'fieldRemap.convertFilterLabel',
+  convertFilterPlaceholder: 'fieldRemap.convertFilterPlaceholder',
+  clearConvertFilter: 'fieldRemap.clearConvertFilter',
+  noMatchingConverts: 'fieldRemap.noMatchingConverts',
   placeConvert: 'fieldRemap.placeConvert',
+  addCombine: 'fieldRemap.addCombine',
+  addSplit: 'fieldRemap.addSplit',
   operatorsTitle: 'fieldRemap.operatorsTitle',
   operatorsDescription: 'fieldRemap.operatorsDescription',
+  addTransform: 'fieldRemap.addTransform',
+  editItems: 'fieldRemap.editItems',
+  removeBinding: 'fieldRemap.removeBinding',
   showMinimap: 'fieldRemap.showMinimap',
   hideMinimap: 'fieldRemap.hideMinimap',
   showHiddenFields: 'fieldRemap.showHiddenFields',
   hideHiddenFields: 'fieldRemap.hideHiddenFields',
+  emptyDetailTitle: 'fieldRemap.emptyDetailTitle',
+  emptyDetailDescription: 'fieldRemap.emptyDetailDescription',
+  previewTitle: 'fieldRemap.previewTitle',
+  previewLoading: 'fieldRemap.previewLoading',
+  previewError: 'fieldRemap.previewError',
+  previewDocumentResult: 'fieldRemap.previewDocumentResult',
+  previewBindingResult: 'fieldRemap.previewBindingResult',
+  previewStepIntermediateUnavailable: 'fieldRemap.previewStepIntermediateUnavailable',
+  previewOperatorIntermediateUnavailable: 'fieldRemap.previewOperatorIntermediateUnavailable',
+  previewDraftUnavailable: 'fieldRemap.previewDraftUnavailable',
+  previewSelectionUnavailable: 'fieldRemap.previewSelectionUnavailable',
 } as const satisfies Record<keyof FieldRemapChromeLabels, string>;
 
 export function resolveFieldRemapChromeLabels(
@@ -79,12 +144,32 @@ export function resolveFieldRemapChromeLabels(
     convertPaletteDescription: resolve('convertPaletteDescription'),
     convertPaletteAriaLabel: resolve('convertPaletteAriaLabel'),
     convertsListAriaLabel: resolve('convertsListAriaLabel'),
+    convertFilterLabel: resolve('convertFilterLabel'),
+    convertFilterPlaceholder: resolve('convertFilterPlaceholder'),
+    clearConvertFilter: resolve('clearConvertFilter'),
+    noMatchingConverts: resolve('noMatchingConverts'),
     placeConvert: resolve('placeConvert'),
+    addCombine: resolve('addCombine'),
+    addSplit: resolve('addSplit'),
     operatorsTitle: resolve('operatorsTitle'),
     operatorsDescription: resolve('operatorsDescription'),
+    addTransform: resolve('addTransform'),
+    editItems: resolve('editItems'),
+    removeBinding: resolve('removeBinding'),
     showMinimap: resolve('showMinimap'),
     hideMinimap: resolve('hideMinimap'),
     showHiddenFields: resolve('showHiddenFields'),
     hideHiddenFields: resolve('hideHiddenFields'),
+    emptyDetailTitle: resolve('emptyDetailTitle'),
+    emptyDetailDescription: resolve('emptyDetailDescription'),
+    previewTitle: resolve('previewTitle'),
+    previewLoading: resolve('previewLoading'),
+    previewError: resolve('previewError'),
+    previewDocumentResult: resolve('previewDocumentResult'),
+    previewBindingResult: resolve('previewBindingResult'),
+    previewStepIntermediateUnavailable: resolve('previewStepIntermediateUnavailable'),
+    previewOperatorIntermediateUnavailable: resolve('previewOperatorIntermediateUnavailable'),
+    previewDraftUnavailable: resolve('previewDraftUnavailable'),
+    previewSelectionUnavailable: resolve('previewSelectionUnavailable'),
   };
 }