✨ Enhanced Diff Management with decorators

shared/src/types/actions.ts

@@ -7,8 +7,6 @@ export const GET_SOLUTION = "GET_SOLUTION";
 export const GET_SUCCESS_RATE = "GET_SUCCESS_RATE";
 export const OPEN_FILE = "OPEN_FILE";
 export const VIEW_FIX = "VIEW_FIX";
-export const APPLY_FILE = "APPLY_FILE";
-export const DISCARD_FILE = "DISCARD_FILE";
 export const WEBVIEW_READY = "WEBVIEW_READY";
 export const GET_SOLUTION_WITH_KONVEYOR_CONTEXT = "GET_SOLUTION_WITH_KONVEYOR_CONTEXT";
 export const CONFIGURE_LABEL_SELECTOR = "CONFIGURE_LABEL_SELECTOR";
@@ -36,8 +34,6 @@ export type WebviewActionType =
   | typeof GET_SUCCESS_RATE
   | typeof OPEN_FILE
   | typeof VIEW_FIX
-  | typeof APPLY_FILE
-  | typeof DISCARD_FILE
   | typeof WEBVIEW_READY
   | typeof GET_SOLUTION_WITH_KONVEYOR_CONTEXT
   | typeof CONFIGURE_LABEL_SELECTOR

shared/src/types/types.ts

@@ -180,6 +180,7 @@ export interface ExtensionData {
   activeProfileId: string | null;
   solutionServerEnabled: boolean;
   isAgentMode: boolean;
+  activeDecorators?: Record<string, string>;
 }
 
 export type ConfigErrorType =

tests/e2e/pages/vscode.page.ts

@@ -147,7 +147,14 @@ export class VSCode extends BasePage {
   }
 
   public async openAnalysisView(): Promise<void> {
-    await this.openLeftBarElement(LeftBarItems.Konveyor);
+    // Try using command palette first - this works reliably when extension is hidden due to too many extensions
+    try {
+      await this.executeQuickCommand('Konveyor: Open Konveyor Analysis View');
+      return;
+    } catch (error) {
+      // Fallback to activity bar approach
+      await this.openLeftBarElement(LeftBarItems.Konveyor);
+    }
 
     await this.window.getByText('Konveyor Issues').dblclick();
 

vscode/package.json

@@ -181,11 +181,6 @@
         "title": "Load analysis results",
         "category": "Konveyor"
       },
-      {
-        "command": "konveyor.loadSolution",
-        "title": "Load solution",
-        "category": "Konveyor"
-      },
       {
         "command": "konveyor.applyAll",
         "title": "Apply All",
@@ -270,6 +265,12 @@
         "title": "Configure Solution Server Credentials",
         "category": "Konveyor",
         "icon": "$(key)"
+      },
+      {
+        "command": "konveyor.showDiffActions",
+        "title": "Show Diff Actions",
+        "category": "Konveyor",
+        "icon": "$(diff)"
       }
     ],
     "submenus": [
@@ -292,10 +293,6 @@
         {
           "id": "konveyor.issueView",
           "name": "Konveyor Issues"
-        },
-        {
-          "id": "konveyor.diffView",
-          "name": "Konveyor Resolutions"
         }
       ]
     },
@@ -315,16 +312,6 @@
           "command": "konveyor.expandAllIssues",
           "group": "navigation@3",
           "when": "view == konveyor.issueView"
-        },
-        {
-          "command": "konveyor.applyAll",
-          "group": "navigation@1",
-          "when": "view == konveyor.diffView"
-        },
-        {
-          "command": "konveyor.discardAll",
-          "group": "navigation@2",
-          "when": "view == konveyor.diffView"
         }
       ],
       "view/item/context": [
@@ -347,60 +334,6 @@
           "command": "konveyor.openAnalysisDetails",
           "group": "inline@1",
           "when": "view == konveyor.issueView && viewItem == incident-type-item"
-        },
-        {
-          "command": "konveyor.applyFile",
-          "group": "inline",
-          "when": "view == konveyor.diffView && viewItem == file-item"
-        },
-        {
-          "command": "konveyor.discardFile",
-          "group": "inline",
-          "when": "view == konveyor.diffView && viewItem == file-item"
-        },
-        {
-          "command": "konveyor.applyFile",
-          "group": "1@1",
-          "when": "view == konveyor.diffView && viewItem == file-item"
-        },
-        {
-          "command": "konveyor.discardFile",
-          "group": "1@2",
-          "when": "view == konveyor.diffView && viewItem == file-item"
-        },
-        {
-          "command": "konveyor.copyDiff",
-          "group": "2@1",
-          "when": "view == konveyor.diffView && viewItem == file-item"
-        },
-        {
-          "command": "konveyor.copyPath",
-          "group": "2@2",
-          "when": "view == konveyor.diffView && viewItem == file-item"
-        }
-      ],
-      "diffEditor/gutter/selection": [
-        {
-          "command": "konveyor.diffView.applySelectionInline",
-          "group": "primary",
-          "when": "diffEditorInlineMode && ((diffEditorModifiedUri =~ /^konveyorMemFs\\:.*$/ && diffEditorOriginalWritable) || (diffEditorOriginalUri =~ /^konveyorMemFs\\:.*$/ && diffEditorModifiedWritable))"
-        },
-        {
-          "command": "konveyor.diffView.applySelection",
-          "group": "primary",
-          "when": "!diffEditorInlineMode && ((diffEditorModifiedUri =~ /^konveyorMemFs\\:.*$/ && diffEditorOriginalWritable) || (diffEditorOriginalUri =~ /^konveyorMemFs\\:.*$/ && diffEditorModifiedWritable))"
-        }
-      ],
-      "diffEditor/gutter/hunk": [
-        {
-          "command": "konveyor.diffView.applyBlockInline",
-          "group": "primary",
-          "when": "diffEditorInlineMode && ((diffEditorModifiedUri =~ /^konveyorMemFs\\:.*$/ && diffEditorOriginalWritable) || (diffEditorOriginalUri =~ /^konveyorMemFs\\:.*$/ && diffEditorModifiedWritable))"
-        },
-        {
-          "command": "konveyor.diffView.applyBlock",
-          "group": "primary",
-          "when": "!diffEditorInlineMode && ((diffEditorModifiedUri =~ /^konveyorMemFs\\:.*$/ && diffEditorOriginalWritable) || (diffEditorOriginalUri =~ /^konveyorMemFs\\:.*$/ && diffEditorModifiedWritable))"
         }
       ],
       "explorer/context": [
@@ -419,10 +352,6 @@
           "command": "konveyor.loadRuleSets",
           "when": "never"
         },
-        {
-          "command": "konveyor.loadSolution",
-          "when": "never"
-        },
         {
           "command": "konveyor.applyFile",
           "when": "never"
@@ -547,6 +476,13 @@
           "scope": "window",
           "order": 10
         },
+        "konveyor.diff.autoAcceptOnSave": {
+          "type": "boolean",
+          "default": true,
+          "description": "Automatically apply diff changes when saving files.",
+          "scope": "window",
+          "order": 11
+        },
         "konveyor.kai.agentMode": {
           "type": "boolean",
           "default": false,
@@ -675,16 +611,7 @@
         }
       }
     },
-    "keybindings": [
-      {
-        "command": "konveyor.diffView.next",
-        "key": "f4"
-      },
-      {
-        "command": "konveyor.diffView.prev",
-        "key": "shift+f4"
-      }
-    ]
+    "keybindings": []
   },
   "includedAssetPaths": {
     "kai": "../downloaded_assets/kai",