appmenus: remove leftover .menu file on VM removal

xdg-desktop-menu uninstall does not reliably clean up
~/.config/menus/applications-merged/user-qubes-vm-directory*.menu:
errors are silently suppressed and accumulated install calls can leave
residual entries that prevent full removal.

Add _remove_menu_files() to explicitly unlink the known .menu paths
(current escaped format and old dash-separated format) after
appmenus_remove() runs, ensuring no stale .menu file is left behind.

Closes QubesOS/qubes-issues#9668

Author: Jayant-kernel

qubesappmenus/__init__.py

@@ -501,11 +501,37 @@ def appmenus_remove(self, vm, refresh_cache=True):
                     refresh_cache)
             shutil.rmtree(appmenus_dir)
 
+        self._remove_menu_files(vm)
+
         if refresh_cache:
             if 'KDE_SESSION_UID' in os.environ:
                 subprocess.call(['kbuildsycoca' +
                                  os.environ.get('KDE_SESSION_VERSION', '4')])
 
+    @staticmethod
+    def _remove_menu_files(vm):
+        """Remove leftover .menu files from ~/.config/menus/applications-merged/.
+
+        xdg-desktop-menu uninstall may not clean these up reliably (errors are
+        suppressed, and accumulated installs can leave residual entries).
+        Explicitly remove the known .menu file paths for this VM.
+        """
+        menus_dir = os.path.join(xdg.BaseDirectory.xdg_config_home,
+                                 'menus', 'applications-merged')
+        if not os.path.isdir(menus_dir):
+            return
+        vm_name = str(vm)
+        escaped = vm_name_escape(vm_name)
+        for prefix in ('qubes-vm-directory', 'qubes-dispvm-directory'):
+            # current format (escaped VM name)
+            with contextlib.suppress(FileNotFoundError):
+                os.unlink(os.path.join(menus_dir,
+                                       'user-' + prefix + escaped + '.menu'))
+            # old format (raw dash-separated name, pre-escaping era)
+            with contextlib.suppress(FileNotFoundError):
+                os.unlink(os.path.join(menus_dir,
+                                       'user-' + prefix + '-' + vm_name + '.menu'))
+
     def appicons_create(self, vm, srcdirs=(), force=False):
         """Create/update applications icons"""
         if not srcdirs:

qubesappmenus/tests.py

@@ -727,6 +727,50 @@ def test_131_set_get_default_whitelist(self, mock_subprocess):
         self.assertEqual(whitelist, self.ext.get_default_whitelist(tpl))
 
 
+    @unittest.mock.patch('subprocess.check_call')
+    def test_140_remove_appvm_cleans_menu_file(self, mock_subprocess):
+        tpl = TestVM('test-inst-tpl',
+            klass='TemplateVM',
+            virt_mode='pvh',
+            updateable=True,
+            provides_network=False,
+            label=self.app.labels[1])
+        self.ext.appmenus_init(tpl)
+        appvm = TestVM('test-inst-app',
+            klass='AppVM',
+            template=tpl,
+            virt_mode='pvh',
+            updateable=False,
+            provides_network=False,
+            label=self.app.labels[1])
+        self.ext.appmenus_init(appvm)
+        self.ext.appmenus_create(appvm, refresh_cache=False)
+
+        # Simulate leftover .menu files left by xdg-desktop-menu install
+        config_dir = tempfile.mkdtemp()
+        try:
+            menus_dir = os.path.join(config_dir, 'menus', 'applications-merged')
+            os.makedirs(menus_dir)
+            escaped = qubesappmenus.vm_name_escape(appvm.name)
+            menu_file = os.path.join(menus_dir,
+                                     'user-qubes-vm-directory' + escaped + '.menu')
+            old_menu_file = os.path.join(menus_dir,
+                                         'user-qubes-vm-directory-' + appvm.name + '.menu')
+            with open(menu_file, 'w', encoding='utf-8') as f:
+                f.write('<Menu/>\n')
+            with open(old_menu_file, 'w', encoding='utf-8') as f:
+                f.write('<Menu/>\n')
+
+            with unittest.mock.patch('xdg.BaseDirectory.xdg_config_home',
+                                     config_dir):
+                self.ext.appmenus_remove(appvm, refresh_cache=False)
+
+            self.assertPathNotExists(menu_file)
+            self.assertPathNotExists(old_menu_file)
+        finally:
+            shutil.rmtree(config_dir)
+
+
 def list_tests():
     return (TC_00_Appmenus,)