fix: cross-scope configuration import failing incorrectly

Importing configuration from Global scope to Local scope failed with "Configuration scope has changed since preview" error

Cause: comparing preview.sourceTarget (original export scope) with current import target scope, which always mismatched for cross-scope imports

Solution: added targetScope field to ImportPreviewData to store the intended import scope at preview time and compare against it during confirmation

Author: kubrickcode

src/internal/managers/import-export-manager.spec.ts

@@ -877,6 +877,7 @@ describe("ImportExportManager", () => {
         buttons: sampleButtons,
         fileUri: "/import/config.json",
         sourceTarget: "global" as const,
+        targetScope: "global" as const,
         timestamp: Date.now(),
       };
 
@@ -895,6 +896,7 @@ describe("ImportExportManager", () => {
         buttons: sampleButtons,
         fileUri: "/import/config.json",
         sourceTarget: "global" as const,
+        targetScope: "global" as const,
         timestamp: Date.now() - EXPIRED_PREVIEW_OFFSET_MS,
       };
 
@@ -915,6 +917,7 @@ describe("ImportExportManager", () => {
         buttons: sampleButtons,
         fileUri: "/import/config.json",
         sourceTarget: "global" as const,
+        targetScope: "global" as const,
         timestamp: Date.now(),
       };
 
@@ -934,6 +937,7 @@ describe("ImportExportManager", () => {
         buttons: sampleButtons,
         fileUri: "/import/config.json",
         sourceTarget: "global" as const,
+        targetScope: "global" as const,
         timestamp: Date.now(),
       };
 

src/internal/managers/import-export-manager.ts

@@ -233,6 +233,7 @@ export class ImportExportManager {
         buttons: data.buttons,
         fileUri: fileUri.fsPath,
         sourceTarget: data.configurationTarget,
+        targetScope: targetScope as ConfigurationTarget,
         timestamp: Date.now(),
       };
 

src/internal/providers/webview-provider.spec.ts

@@ -714,5 +714,88 @@ describe("webview-provider", () => {
         );
       });
     });
+
+    describe("confirmImport", () => {
+      it("should reject import when scope changed between preview and confirm", async () => {
+        const mockImportExportManager = {
+          confirmImport: jest.fn(),
+        };
+
+        const preview = {
+          analysis: { added: [], modified: [], shortcutConflicts: [], unchanged: [] },
+          buttons: [{ command: "test", name: "Test" }],
+          fileUri: "/import/config.json",
+          sourceTarget: "global" as const,
+          targetScope: "global" as const,
+          timestamp: Date.now(),
+        };
+
+        const message = {
+          data: { preview, strategy: "merge" },
+          requestId: "confirm-import-request",
+          type: "confirmImport" as const,
+        };
+
+        (mockConfigManager.getCurrentConfigurationTarget as jest.Mock).mockReturnValue("local");
+
+        await handleWebviewMessage(
+          message,
+          mockWebview,
+          mockConfigReader,
+          mockConfigManager,
+          mockImportExportManager as never
+        );
+
+        expect(mockImportExportManager.confirmImport).not.toHaveBeenCalled();
+        expect(mockWebview.postMessage).toHaveBeenCalledWith({
+          error: expect.stringContaining("scope"),
+          requestId: "confirm-import-request",
+          type: "error",
+        });
+      });
+
+      it("should proceed with import when scope matches between preview and confirm", async () => {
+        const mockImportExportManager = {
+          confirmImport: jest.fn().mockResolvedValue({
+            backupPath: "/backup/path",
+            conflictsResolved: 0,
+            importedCount: 1,
+            success: true,
+          }),
+        };
+
+        const preview = {
+          analysis: { added: [], modified: [], shortcutConflicts: [], unchanged: [] },
+          buttons: [{ command: "test", name: "Test" }],
+          fileUri: "/import/config.json",
+          sourceTarget: "global" as const,
+          targetScope: "local" as const,
+          timestamp: Date.now(),
+        };
+
+        const message = {
+          data: { preview, strategy: "merge" },
+          requestId: "confirm-import-request",
+          type: "confirmImport" as const,
+        };
+
+        (mockConfigManager.getCurrentConfigurationTarget as jest.Mock).mockReturnValue("local");
+
+        await handleWebviewMessage(
+          message,
+          mockWebview,
+          mockConfigReader,
+          mockConfigManager,
+          mockImportExportManager as never
+        );
+
+        expect(mockImportExportManager.confirmImport).toHaveBeenCalledWith(preview, "local", "merge");
+        expect(mockWebview.postMessage).toHaveBeenCalledWith({
+          data: expect.objectContaining({ success: true }),
+          requestId: "confirm-import-request",
+          type: "success",
+        });
+      });
+    });
   });
 });

src/internal/providers/webview-provider.ts

@@ -329,7 +329,7 @@ export const handleWebviewMessage = async (
         }
         const { preview, strategy } = message.data;
         const confirmTarget = configManager.getCurrentConfigurationTarget();
-        if (preview.sourceTarget !== confirmTarget) {
+        if (preview.targetScope !== confirmTarget) {
           throw new Error(MESSAGES.ERROR.configScopeChangedSincePreview);
         }
         const confirmResult = await importExportManager.confirmImport(

src/shared/types.ts

@@ -199,6 +199,7 @@ export type ImportPreviewData = {
   buttons: ButtonConfigWithOptionalId[];
   fileUri: string;
   sourceTarget: ConfigurationTarget;
+  targetScope: ConfigurationTarget;
   timestamp: number;
 };
 

src/view/src/mock/vscode-mock.tsx

@@ -187,6 +187,7 @@ class VSCodeMock {
       buttons: MOCK_IMPORT_BUTTONS,
       fileUri: "/mock/import/config.json",
       sourceTarget: this.configurationTarget as ConfigurationTarget,
+      targetScope: this.configurationTarget as ConfigurationTarget,
       timestamp: Date.now(),
     };
   }