@fgv/ts-res-ui-components 5.0.0-20 → 5.0.0-21

package/README.md

@@ -55,6 +55,51 @@ This library requires the following peer dependencies:
 
 ## Quick Start
 
+### Minimal Editing App (Unified Apply)
+
+```tsx
+import React from 'react';
+import { ResourceOrchestrator, ResolutionView } from '@fgv/ts-res-ui-components';
+
+export default function App() {
+  return (
+    <ResourceOrchestrator>
+      {({ state, actions }) => (
+        <ResolutionView
+          resources={state.resources}
+          resolutionState={state.resolutionState}
+          resolutionActions={{
+            updateContextValue: actions.updateResolutionContext,
+            applyContext: actions.applyResolutionContext,
+            selectResource: actions.selectResourceForResolution,
+            setViewMode: actions.setResolutionViewMode,
+            resetCache: actions.resetResolutionCache,
+            saveEdit: actions.saveResourceEdit,
+            getEditedValue: actions.getEditedValue,
+            hasEdit: actions.hasResourceEdit,
+            clearEdits: actions.clearResourceEdits,
+            discardEdits: actions.discardResourceEdits,
+            startNewResource: actions.startNewResource,
+            updateNewResourceId: actions.updateNewResourceId,
+            selectResourceType: actions.selectResourceType,
+            saveNewResourceAsPending: actions.saveNewResourceAsPending,
+            cancelNewResource: actions.cancelNewResource,
+            removePendingResource: actions.removePendingResource,
+            markResourceForDeletion: actions.markResourceForDeletion,
+            applyPendingResources: actions.applyPendingResources,
+            discardPendingResources: actions.discardPendingResources
+          }}
+          allowResourceCreation
+          defaultResourceType="json"
+          showPendingResourcesInList
+          onMessage={actions.addMessage}
+        />
+      )}
+    </ResourceOrchestrator>
+  );
+}
+```
+
 ### Basic Usage with ResourceOrchestrator
 
 The `ResourceOrchestrator` component provides centralized state management for all ts-res UI functionality:
@@ -75,7 +120,11 @@ function App() {
               <ImportView
                 onImport={actions.importDirectory}
                 onBundleImport={actions.importBundle}
-                onZipImport={actions.importZipWithConfig}
+                onZipImport={(zipData, config) => {
+                  if (config) actions.applyConfiguration(config);
+                  if (zipData.directory) actions.importDirectory(zipData.directory);
+                  else if (zipData.files?.length) actions.importFiles(zipData.files);
+                }}
               />
             ) : (
               <SourceView

package/dist/ts-res-ui-components.d.ts

@@ -680,9 +680,10 @@ declare function createTsResSystemFromConfig(systemConfig?: Config.Model.ISystem
  *           <ResolutionTools.UnifiedChangeControls
  *             editCount={state.editedResources.size}
  *             isApplying={state.isApplyingEdits}
- *             hasEdits={state.hasUnsavedEdits}
- *             onApplyEdits={actions.applyEdits}
- *             onDiscardEdits={actions.clearEdits}
+ *             addCount={state.pendingResources.size}
+ *             deleteCount={state.pendingResourceDeletions.size}
+ *             onApplyAll={actions.applyPendingResources}
+ *             onDiscardAll={() => { actions.clearEdits(); actions.discardPendingResources(); }}
  *           />
  *         </div>
  *       )}
@@ -2073,8 +2074,8 @@ declare interface MessagesWindowProps {
  * const newValue = { text: 'Updated welcome message' };
  * actions.saveResourceEdit('user.welcome', newValue);
  *
- * // Apply all edits
- * await actions.applyResourceEdits();
+ * // Apply all pending changes (edits + new resources)
+ * await actions.applyPendingResources();
  * ```
  *
  * @example
@@ -2133,7 +2134,6 @@ export declare interface OrchestratorActions {
     getEditedValue: (resourceId: string) => JsonValue | undefined;
     hasResourceEdit: (resourceId: string) => boolean;
     clearResourceEdits: () => void;
-    applyResourceEdits: () => Promise<void>;
     discardResourceEdits: () => void;
     startNewResource: (defaultTypeName?: string) => void;
     updateNewResourceId: (id: string) => void;
@@ -2825,8 +2825,6 @@ declare interface ResolutionActions {
     hasEdit: (resourceId: string) => boolean;
     /** Clear all pending edits */
     clearEdits: () => void;
-    /** Apply all edits to the resource system */
-    applyEdits: () => Promise<void>;
     /** Discard all pending edits */
     discardEdits: () => void;
     /** Start creating a new resource */

package/lib/components/orchestrator/ResourceOrchestrator.js

@@ -309,7 +309,7 @@ export const ResourceOrchestrator = ({ children, initialConfiguration, qualifier
         getEditedValue: resolutionData.actions.getEditedValue,
         hasResourceEdit: resolutionData.actions.hasEdit,
         clearResourceEdits: resolutionData.actions.clearEdits,
-        applyResourceEdits: resolutionData.actions.applyEdits,
+        // Edits applied through unified applyPendingResources
         discardResourceEdits: resolutionData.actions.discardEdits,
         // Resource creation actions
         startNewResource: resolutionData.actions.startNewResource,

package/lib/components/views/ResolutionView/EditableJsonView.d.ts

@@ -175,9 +175,10 @@ export interface EditableJsonViewProps {
  *           <ResolutionTools.UnifiedChangeControls
  *             editCount={state.editedResources.size}
  *             isApplying={state.isApplyingEdits}
- *             hasEdits={state.hasUnsavedEdits}
- *             onApplyEdits={actions.applyEdits}
- *             onDiscardEdits={actions.clearEdits}
+ *             addCount={state.pendingResources.size}
+ *             deleteCount={state.pendingResourceDeletions.size}
+ *             onApplyAll={actions.applyPendingResources}
+ *             onDiscardAll={() => { actions.clearEdits(); actions.discardPendingResources(); }}
  *           />
  *         </div>
  *       )}

package/lib/components/views/ResolutionView/EditableJsonView.js

@@ -155,9 +155,10 @@ import { validateEditedResource } from '../../../utils/resolutionEditing';
  *           <ResolutionTools.UnifiedChangeControls
  *             editCount={state.editedResources.size}
  *             isApplying={state.isApplyingEdits}
- *             hasEdits={state.hasUnsavedEdits}
- *             onApplyEdits={actions.applyEdits}
- *             onDiscardEdits={actions.clearEdits}
+ *             addCount={state.pendingResources.size}
+ *             deleteCount={state.pendingResourceDeletions.size}
+ *             onApplyAll={actions.applyPendingResources}
+ *             onDiscardAll={() => { actions.clearEdits(); actions.discardPendingResources(); }}
  *           />
  *         </div>
  *       )}

package/lib/hooks/useResolutionState.js

@@ -1,7 +1,7 @@
 import React, { useState, useCallback, useMemo } from 'react';
 import { Runtime } from '@fgv/ts-res';
 import { createResolverWithContext, resolveResourceDetailed, getAvailableQualifiers, hasPendingContextChanges } from '../utils/resolutionUtils';
-import { validateEditedResource, computeResourceDelta, rebuildSystemWithEdits, rebuildSystemWithChanges, extractResolutionContext, checkEditConflicts } from '../utils/resolutionEditing';
+import { validateEditedResource, computeResourceDelta, rebuildSystemWithChanges, extractResolutionContext } from '../utils/resolutionEditing';
 /**
  * Hook for managing resource resolution state and editing operations.
  *
@@ -447,59 +447,7 @@ export function useResolutionState(processedResources, onMessage, onSystemUpdate
             onMessage?.('info', 'All unsaved edits discarded');
         }
     }, [hasUnsavedEdits, onMessage]);
-    const applyEdits = useCallback(async () => {
-        if (!processedResources || editedResources.size === 0) {
-            onMessage?.('warning', 'No edits to apply');
-            return;
-        }
-        if (!onSystemUpdate) {
-            onMessage?.('error', 'System update callback not provided');
-            return;
-        }
-        setIsApplyingEdits(true);
-        try {
-            // Extract current resolution context (filter out undefined values)
-            const cleanedContextValues = {};
-            Object.entries(effectiveContext).forEach(([key, value]) => {
-                if (value !== undefined) {
-                    cleanedContextValues[key] = value;
-                }
-            });
-            const currentContext = extractResolutionContext(currentResolver, cleanedContextValues);
-            // Check for potential conflicts
-            const conflictCheck = checkEditConflicts(processedResources.system.resourceManager, editedResourcesInternal, currentContext);
-            // Show warnings about potential conflicts
-            conflictCheck.warnings.forEach((warning) => onMessage?.('warning', warning));
-            if (conflictCheck.conflicts.length > 0) {
-                onMessage?.('error', `Conflicts detected: ${conflictCheck.conflicts.join(', ')}`);
-                return;
-            }
-            // Rebuild the system with edits
-            const rebuildResult = await rebuildSystemWithEdits(processedResources.system, editedResourcesInternal, currentContext);
-            if (rebuildResult.isFailure()) {
-                onMessage?.('error', `Failed to apply edits: ${rebuildResult.message}`);
-                return;
-            }
-            // Update the system through the callback
-            onSystemUpdate(rebuildResult.value);
-            // Clear edits after successful application
-            setEditedResourcesInternal(new Map());
-            onMessage?.('success', `Successfully applied ${editedResourcesInternal.size} edit(s)`);
-        }
-        catch (error) {
-            onMessage?.('error', `Error applying edits: ${error instanceof Error ? error.message : String(error)}`);
-        }
-        finally {
-            setIsApplyingEdits(false);
-        }
-    }, [
-        processedResources,
-        editedResourcesInternal,
-        onSystemUpdate,
-        currentResolver,
-        onMessage,
-        effectiveContext
-    ]);
+    // Removed applyEdits in favor of unified applyPendingResources
     // Resource creation actions
     const startNewResource = useCallback((defaultTypeName) => {
         const defaultType = defaultTypeName
@@ -616,9 +564,10 @@ export function useResolutionState(processedResources, onMessage, onSystemUpdate
         onMessage?.('info', `Marked resource ${resourceId} for deletion`);
     }, [onMessage]);
     const applyPendingResources = useCallback(async () => {
-        if (!hasPendingResourceChanges || !processedResources || !onSystemUpdate) {
-            if (!hasPendingResourceChanges) {
-                onMessage?.('warning', 'No pending resource changes to apply');
+        const hasAnyChanges = editedResourcesInternal.size > 0 || pendingResources.size > 0 || pendingResourceDeletions.size > 0;
+        if (!hasAnyChanges || !processedResources || !onSystemUpdate) {
+            if (!hasAnyChanges) {
+                onMessage?.('warning', 'No pending changes to apply');
             }
             else if (!processedResources) {
                 onMessage?.('error', 'No resource system available');
@@ -629,6 +578,7 @@ export function useResolutionState(processedResources, onMessage, onSystemUpdate
             return;
         }
         try {
+            setIsApplyingEdits(true);
             // Extract current resolution context (filter out undefined values)
             const cleanedContextValues = {};
             Object.entries(effectiveContext).forEach(([key, value]) => {
@@ -663,7 +613,7 @@ export function useResolutionState(processedResources, onMessage, onSystemUpdate
                 return;
             }
             onSystemUpdate(rebuildResult.value);
-            onMessage?.('success', `Applied ${newResourcesArray.length} additions and ${pendingResourceDeletions.size} deletions`);
+            onMessage?.('success', `Applied ${editedResourcesInternal.size} edits, ${newResourcesArray.length} additions, and ${pendingResourceDeletions.size} deletions`);
             // Clear pending additions after successful application (deletions still deferred)
             setPendingResources(new Map());
             setPendingResourceDeletions(new Set());
@@ -675,8 +625,10 @@ export function useResolutionState(processedResources, onMessage, onSystemUpdate
         catch (error) {
             onMessage?.('error', `Failed to apply pending resources: ${error instanceof Error ? error.message : String(error)}`);
         }
+        finally {
+            setIsApplyingEdits(false);
+        }
     }, [
-        hasPendingResourceChanges,
         pendingResources,
         pendingResourceDeletions,
         processedResources,
@@ -723,7 +675,6 @@ export function useResolutionState(processedResources, onMessage, onSystemUpdate
         getEditedValue,
         hasEdit,
         clearEdits,
-        applyEdits,
         discardEdits,
         // Resource creation actions
         startNewResource,
@@ -745,7 +696,6 @@ export function useResolutionState(processedResources, onMessage, onSystemUpdate
         getEditedValue,
         hasEdit,
         clearEdits,
-        applyEdits,
         discardEdits,
         startNewResource,
         updateNewResourceId,

package/lib/types/index.d.ts

@@ -436,8 +436,6 @@ export interface ResolutionActions {
     hasEdit: (resourceId: string) => boolean;
     /** Clear all pending edits */
     clearEdits: () => void;
-    /** Apply all edits to the resource system */
-    applyEdits: () => Promise<void>;
     /** Discard all pending edits */
     discardEdits: () => void;
     /** Start creating a new resource */
@@ -1117,8 +1115,8 @@ export interface OrchestratorState {
  * const newValue = { text: 'Updated welcome message' };
  * actions.saveResourceEdit('user.welcome', newValue);
  *
- * // Apply all edits
- * await actions.applyResourceEdits();
+ * // Apply all pending changes (edits + new resources)
+ * await actions.applyPendingResources();
  * ```
  *
  * @example
@@ -1177,7 +1175,6 @@ export interface OrchestratorActions {
     getEditedValue: (resourceId: string) => JsonValue | undefined;
     hasResourceEdit: (resourceId: string) => boolean;
     clearResourceEdits: () => void;
-    applyResourceEdits: () => Promise<void>;
     discardResourceEdits: () => void;
     startNewResource: (defaultTypeName?: string) => void;
     updateNewResourceId: (id: string) => void;

package/lib-commonjs/components/orchestrator/ResourceOrchestrator.js

@@ -313,7 +313,7 @@ const ResourceOrchestrator = ({ children, initialConfiguration, qualifierTypeFac
         getEditedValue: resolutionData.actions.getEditedValue,
         hasResourceEdit: resolutionData.actions.hasEdit,
         clearResourceEdits: resolutionData.actions.clearEdits,
-        applyResourceEdits: resolutionData.actions.applyEdits,
+        // Edits applied through unified applyPendingResources
         discardResourceEdits: resolutionData.actions.discardEdits,
         // Resource creation actions
         startNewResource: resolutionData.actions.startNewResource,

package/lib-commonjs/components/views/ResolutionView/EditableJsonView.js

@@ -159,9 +159,10 @@ const resolutionEditing_1 = require("../../../utils/resolutionEditing");
  *           <ResolutionTools.UnifiedChangeControls
  *             editCount={state.editedResources.size}
  *             isApplying={state.isApplyingEdits}
- *             hasEdits={state.hasUnsavedEdits}
- *             onApplyEdits={actions.applyEdits}
- *             onDiscardEdits={actions.clearEdits}
+ *             addCount={state.pendingResources.size}
+ *             deleteCount={state.pendingResourceDeletions.size}
+ *             onApplyAll={actions.applyPendingResources}
+ *             onDiscardAll={() => { actions.clearEdits(); actions.discardPendingResources(); }}
  *           />
  *         </div>
  *       )}

package/lib-commonjs/hooks/useResolutionState.js

@@ -451,59 +451,7 @@ function useResolutionState(processedResources, onMessage, onSystemUpdate) {
             onMessage?.('info', 'All unsaved edits discarded');
         }
     }, [hasUnsavedEdits, onMessage]);
-    const applyEdits = (0, react_1.useCallback)(async () => {
-        if (!processedResources || editedResources.size === 0) {
-            onMessage?.('warning', 'No edits to apply');
-            return;
-        }
-        if (!onSystemUpdate) {
-            onMessage?.('error', 'System update callback not provided');
-            return;
-        }
-        setIsApplyingEdits(true);
-        try {
-            // Extract current resolution context (filter out undefined values)
-            const cleanedContextValues = {};
-            Object.entries(effectiveContext).forEach(([key, value]) => {
-                if (value !== undefined) {
-                    cleanedContextValues[key] = value;
-                }
-            });
-            const currentContext = (0, resolutionEditing_1.extractResolutionContext)(currentResolver, cleanedContextValues);
-            // Check for potential conflicts
-            const conflictCheck = (0, resolutionEditing_1.checkEditConflicts)(processedResources.system.resourceManager, editedResourcesInternal, currentContext);
-            // Show warnings about potential conflicts
-            conflictCheck.warnings.forEach((warning) => onMessage?.('warning', warning));
-            if (conflictCheck.conflicts.length > 0) {
-                onMessage?.('error', `Conflicts detected: ${conflictCheck.conflicts.join(', ')}`);
-                return;
-            }
-            // Rebuild the system with edits
-            const rebuildResult = await (0, resolutionEditing_1.rebuildSystemWithEdits)(processedResources.system, editedResourcesInternal, currentContext);
-            if (rebuildResult.isFailure()) {
-                onMessage?.('error', `Failed to apply edits: ${rebuildResult.message}`);
-                return;
-            }
-            // Update the system through the callback
-            onSystemUpdate(rebuildResult.value);
-            // Clear edits after successful application
-            setEditedResourcesInternal(new Map());
-            onMessage?.('success', `Successfully applied ${editedResourcesInternal.size} edit(s)`);
-        }
-        catch (error) {
-            onMessage?.('error', `Error applying edits: ${error instanceof Error ? error.message : String(error)}`);
-        }
-        finally {
-            setIsApplyingEdits(false);
-        }
-    }, [
-        processedResources,
-        editedResourcesInternal,
-        onSystemUpdate,
-        currentResolver,
-        onMessage,
-        effectiveContext
-    ]);
+    // Removed applyEdits in favor of unified applyPendingResources
     // Resource creation actions
     const startNewResource = (0, react_1.useCallback)((defaultTypeName) => {
         const defaultType = defaultTypeName
@@ -620,9 +568,10 @@ function useResolutionState(processedResources, onMessage, onSystemUpdate) {
         onMessage?.('info', `Marked resource ${resourceId} for deletion`);
     }, [onMessage]);
     const applyPendingResources = (0, react_1.useCallback)(async () => {
-        if (!hasPendingResourceChanges || !processedResources || !onSystemUpdate) {
-            if (!hasPendingResourceChanges) {
-                onMessage?.('warning', 'No pending resource changes to apply');
+        const hasAnyChanges = editedResourcesInternal.size > 0 || pendingResources.size > 0 || pendingResourceDeletions.size > 0;
+        if (!hasAnyChanges || !processedResources || !onSystemUpdate) {
+            if (!hasAnyChanges) {
+                onMessage?.('warning', 'No pending changes to apply');
             }
             else if (!processedResources) {
                 onMessage?.('error', 'No resource system available');
@@ -633,6 +582,7 @@ function useResolutionState(processedResources, onMessage, onSystemUpdate) {
             return;
         }
         try {
+            setIsApplyingEdits(true);
             // Extract current resolution context (filter out undefined values)
             const cleanedContextValues = {};
             Object.entries(effectiveContext).forEach(([key, value]) => {
@@ -667,7 +617,7 @@ function useResolutionState(processedResources, onMessage, onSystemUpdate) {
                 return;
             }
             onSystemUpdate(rebuildResult.value);
-            onMessage?.('success', `Applied ${newResourcesArray.length} additions and ${pendingResourceDeletions.size} deletions`);
+            onMessage?.('success', `Applied ${editedResourcesInternal.size} edits, ${newResourcesArray.length} additions, and ${pendingResourceDeletions.size} deletions`);
             // Clear pending additions after successful application (deletions still deferred)
             setPendingResources(new Map());
             setPendingResourceDeletions(new Set());
@@ -679,8 +629,10 @@ function useResolutionState(processedResources, onMessage, onSystemUpdate) {
         catch (error) {
             onMessage?.('error', `Failed to apply pending resources: ${error instanceof Error ? error.message : String(error)}`);
         }
+        finally {
+            setIsApplyingEdits(false);
+        }
     }, [
-        hasPendingResourceChanges,
         pendingResources,
         pendingResourceDeletions,
         processedResources,
@@ -727,7 +679,6 @@ function useResolutionState(processedResources, onMessage, onSystemUpdate) {
         getEditedValue,
         hasEdit,
         clearEdits,
-        applyEdits,
         discardEdits,
         // Resource creation actions
         startNewResource,
@@ -749,7 +700,6 @@ function useResolutionState(processedResources, onMessage, onSystemUpdate) {
         getEditedValue,
         hasEdit,
         clearEdits,
-        applyEdits,
         discardEdits,
         startNewResource,
         updateNewResourceId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fgv/ts-res-ui-components",
-  "version": "5.0.0-20",
+  "version": "5.0.0-21",
   "description": "Reusable React components for ts-res resource visualization and management",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -23,11 +23,11 @@
     "@heroicons/react": "~2.2.0",
     "tslib": "^2.8.1",
     "json-edit-react": "~1.28.2",
-    "@fgv/ts-res": "5.0.0-20",
-    "@fgv/ts-utils": "5.0.0-20",
-    "@fgv/ts-json": "5.0.0-20",
-    "@fgv/ts-json-base": "5.0.0-20",
-    "@fgv/ts-extras": "5.0.0-20"
+    "@fgv/ts-res": "5.0.0-21",
+    "@fgv/ts-utils": "5.0.0-21",
+    "@fgv/ts-json": "5.0.0-21",
+    "@fgv/ts-extras": "5.0.0-21",
+    "@fgv/ts-json-base": "5.0.0-21"
   },
   "peerDependencies": {
     "react": ">=18.0.0",
@@ -62,7 +62,7 @@
     "@microsoft/api-documenter": "^7.26.31",
     "@microsoft/api-extractor": "^7.52.10",
     "@testing-library/dom": "^10.4.0",
-    "@fgv/ts-utils-jest": "5.0.0-20"
+    "@fgv/ts-utils-jest": "5.0.0-21"
   },
   "scripts": {
     "build": "heft build --clean",

package/src/components/orchestrator/ResourceOrchestrator.tsx

@@ -411,7 +411,7 @@ export const ResourceOrchestrator: React.FC<ResourceOrchestratorProps> = ({
       getEditedValue: resolutionData.actions.getEditedValue,
       hasResourceEdit: resolutionData.actions.hasEdit,
       clearResourceEdits: resolutionData.actions.clearEdits,
-      applyResourceEdits: resolutionData.actions.applyEdits,
+      // Edits applied through unified applyPendingResources
       discardResourceEdits: resolutionData.actions.discardEdits,
 
       // Resource creation actions

package/src/components/views/ResolutionView/EditableJsonView.tsx

@@ -180,9 +180,10 @@ export interface EditableJsonViewProps {
  *           <ResolutionTools.UnifiedChangeControls
  *             editCount={state.editedResources.size}
  *             isApplying={state.isApplyingEdits}
- *             hasEdits={state.hasUnsavedEdits}
- *             onApplyEdits={actions.applyEdits}
- *             onDiscardEdits={actions.clearEdits}
+ *             addCount={state.pendingResources.size}
+ *             deleteCount={state.pendingResourceDeletions.size}
+ *             onApplyAll={actions.applyPendingResources}
+ *             onDiscardAll={() => { actions.clearEdits(); actions.discardPendingResources(); }}
  *           />
  *         </div>
  *       )}

package/src/hooks/useResolutionState.ts

@@ -568,80 +568,7 @@ export function useResolutionState(
     }
   }, [hasUnsavedEdits, onMessage]);
 
-  const applyEdits = useCallback(async () => {
-    if (!processedResources || editedResources.size === 0) {
-      onMessage?.('warning', 'No edits to apply');
-      return;
-    }
-
-    if (!onSystemUpdate) {
-      onMessage?.('error', 'System update callback not provided');
-      return;
-    }
-
-    setIsApplyingEdits(true);
-
-    try {
-      // Extract current resolution context (filter out undefined values)
-      const cleanedContextValues: Record<string, string> = {};
-      Object.entries(effectiveContext).forEach(([key, value]) => {
-        if (value !== undefined) {
-          cleanedContextValues[key] = value;
-        }
-      });
-
-      const currentContext = extractResolutionContext(
-        currentResolver as Runtime.ResourceResolver,
-        cleanedContextValues
-      );
-
-      // Check for potential conflicts
-      const conflictCheck = checkEditConflicts(
-        processedResources.system.resourceManager,
-        editedResourcesInternal,
-        currentContext
-      );
-
-      // Show warnings about potential conflicts
-      conflictCheck.warnings.forEach((warning) => onMessage?.('warning', warning));
-
-      if (conflictCheck.conflicts.length > 0) {
-        onMessage?.('error', `Conflicts detected: ${conflictCheck.conflicts.join(', ')}`);
-        return;
-      }
-
-      // Rebuild the system with edits
-      const rebuildResult = await rebuildSystemWithEdits(
-        processedResources.system,
-        editedResourcesInternal,
-        currentContext
-      );
-
-      if (rebuildResult.isFailure()) {
-        onMessage?.('error', `Failed to apply edits: ${rebuildResult.message}`);
-        return;
-      }
-
-      // Update the system through the callback
-      onSystemUpdate(rebuildResult.value);
-
-      // Clear edits after successful application
-      setEditedResourcesInternal(new Map());
-
-      onMessage?.('success', `Successfully applied ${editedResourcesInternal.size} edit(s)`);
-    } catch (error) {
-      onMessage?.('error', `Error applying edits: ${error instanceof Error ? error.message : String(error)}`);
-    } finally {
-      setIsApplyingEdits(false);
-    }
-  }, [
-    processedResources,
-    editedResourcesInternal,
-    onSystemUpdate,
-    currentResolver,
-    onMessage,
-    effectiveContext
-  ]);
+  // Removed applyEdits in favor of unified applyPendingResources
 
   // Resource creation actions
   const startNewResource = useCallback(
@@ -792,9 +719,11 @@ export function useResolutionState(
   );
 
   const applyPendingResources = useCallback(async () => {
-    if (!hasPendingResourceChanges || !processedResources || !onSystemUpdate) {
-      if (!hasPendingResourceChanges) {
-        onMessage?.('warning', 'No pending resource changes to apply');
+    const hasAnyChanges =
+      editedResourcesInternal.size > 0 || pendingResources.size > 0 || pendingResourceDeletions.size > 0;
+    if (!hasAnyChanges || !processedResources || !onSystemUpdate) {
+      if (!hasAnyChanges) {
+        onMessage?.('warning', 'No pending changes to apply');
       } else if (!processedResources) {
         onMessage?.('error', 'No resource system available');
       } else if (!onSystemUpdate) {
@@ -804,6 +733,7 @@ export function useResolutionState(
     }
 
     try {
+      setIsApplyingEdits(true);
       // Extract current resolution context (filter out undefined values)
       const cleanedContextValues: Record<string, string> = {};
       Object.entries(effectiveContext).forEach(([key, value]) => {
@@ -851,7 +781,7 @@ export function useResolutionState(
 
       onMessage?.(
         'success',
-        `Applied ${newResourcesArray.length} additions and ${pendingResourceDeletions.size} deletions`
+        `Applied ${editedResourcesInternal.size} edits, ${newResourcesArray.length} additions, and ${pendingResourceDeletions.size} deletions`
       );
 
       // Clear pending additions after successful application (deletions still deferred)
@@ -866,9 +796,10 @@ export function useResolutionState(
         'error',
         `Failed to apply pending resources: ${error instanceof Error ? error.message : String(error)}`
       );
+    } finally {
+      setIsApplyingEdits(false);
     }
   }, [
-    hasPendingResourceChanges,
     pendingResources,
     pendingResourceDeletions,
     processedResources,
@@ -919,7 +850,6 @@ export function useResolutionState(
       getEditedValue,
       hasEdit,
       clearEdits,
-      applyEdits,
       discardEdits,
       // Resource creation actions
       startNewResource,
@@ -942,7 +872,6 @@ export function useResolutionState(
       getEditedValue,
       hasEdit,
       clearEdits,
-      applyEdits,
       discardEdits,
       startNewResource,
       updateNewResourceId,

package/src/types/index.ts

@@ -475,8 +475,6 @@ export interface ResolutionActions {
   hasEdit: (resourceId: string) => boolean;
   /** Clear all pending edits */
   clearEdits: () => void;
-  /** Apply all edits to the resource system */
-  applyEdits: () => Promise<void>;
   /** Discard all pending edits */
   discardEdits: () => void;
   /** Start creating a new resource */
@@ -1173,8 +1171,8 @@ export interface OrchestratorState {
  * const newValue = { text: 'Updated welcome message' };
  * actions.saveResourceEdit('user.welcome', newValue);
  *
- * // Apply all edits
- * await actions.applyResourceEdits();
+ * // Apply all pending changes (edits + new resources)
+ * await actions.applyPendingResources();
  * ```
  *
  * @example
@@ -1245,7 +1243,7 @@ export interface OrchestratorActions {
   getEditedValue: (resourceId: string) => JsonValue | undefined;
   hasResourceEdit: (resourceId: string) => boolean;
   clearResourceEdits: () => void;
-  applyResourceEdits: () => Promise<void>;
+  // Removed: unified apply via applyPendingResources
   discardResourceEdits: () => void;
 
   // Resource creation actions