From fd5faf6856d51fd8c6308796527d90703df08dab Mon Sep 17 00:00:00 2001
From: pantao <980141374@qq.com>
Date: Tue, 30 Jun 2026 09:51:21 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat(setting):=20=E6=8F=92=E4=BB=B6?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=8C=87=E4=BB=A4=E5=88=97=E8=A1=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=89=93=E5=BC=80/=E5=9B=BA=E5=AE=9A/=E5=BF=AB?=
 =?UTF-8?q?=E6=8D=B7=E9=94=AE/=E5=88=AB=E5=90=8D/=E7=A6=81=E7=94=A8?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 usePluginCommandActions composable，抽取插件指令操作共享逻辑
  （禁用/启用、固定到搜索框、固定到超级面板、设置全局快捷键、自定义别名、打开指令）
- PluginDetailTabs: 所有指令(含 text 与 match)统一下拉菜单，已安装插件
  支持上述 6 项操作，未安装回退纯展示；修复匹配指令详情弹窗禁用按钮失效
- AllCommandsSetting: 机械替换为 composable，消除约 290 行重复代码，
  并修正系统应用禁用图标(裸字符串 ban/check 改为 i-z-ban/i-z-check)
---
 .../common/PluginDetail/PluginDetailTabs.vue  |  97 +++-
 .../setting/src/composables/index.ts          |   1 +
 .../composables/usePluginCommandActions.ts    | 531 ++++++++++++++++++
 .../AllCommandsSetting/AllCommandsSetting.vue | 443 ++-------------
 4 files changed, 665 insertions(+), 407 deletions(-)
 create mode 100644 internal-plugins/setting/src/composables/usePluginCommandActions.ts

diff --git a/internal-plugins/setting/src/components/common/PluginDetail/PluginDetailTabs.vue b/internal-plugins/setting/src/components/common/PluginDetail/PluginDetailTabs.vue
index 2c87ad5e..ebe231a7 100644
--- a/internal-plugins/setting/src/components/common/PluginDetail/PluginDetailTabs.vue
+++ b/internal-plugins/setting/src/components/common/PluginDetail/PluginDetailTabs.vue
@@ -1,11 +1,7 @@
 <script setup lang="ts">
-import {
-  CommandTag,
-  FeatureCard,
-  MatchCommandDetailDialog,
-  TagDropdown,
-  useMatchCommandDetail
-} from '@/components'
+import { computed, onMounted, watch } from 'vue'
+import { CommandTag, FeatureCard, MatchCommandDetailDialog, TagDropdown } from '@/components'
+import { usePluginCommandActions } from '@/composables'
 import type { DocItem, PluginItem, TabId, TabItem } from './types'
 
 const props = defineProps<{
@@ -33,14 +29,46 @@ const emit = defineEmits<{
   (e: 'clear-all-data'): void
 }>()
 
+// 插件指令操作（打开 / 固定 / 快捷键 / 别名 / 禁用）+ 匹配指令详情弹窗。
+// 仅对已安装（有 path）的插件生效；未安装的市场插件不渲染操作菜单。
 const {
-  selectedMatchCommand,
+  loadAll,
+  isCommandDisabled,
+  getMenuItems,
+  handleMenuSelect,
+  handleMatchMenuSelect,
   openMatchCommandDetail,
   closeMatchCommandDetail,
+  selectedMatchCommand,
+  selectedMatchCommandDisabled,
+  toggleSelectedMatchCommandDisabled,
   cmdKey,
   normalizeCommand,
   isMatchCommand
-} = useMatchCommandDetail()
+} = usePluginCommandActions({
+  getPluginName: () => props.plugin.name,
+  getPluginPath: () => props.plugin.path,
+  getPluginTitle: () => props.plugin.title || props.plugin.name
+})
+
+const pluginName = computed(() => props.plugin.name || '')
+const hasCommandActions = computed(() => Boolean(props.plugin.path))
+
+// 首次挂载 + 切换插件（组件实例被复用、onMounted 不再触发）时重新加载指令操作数据
+onMounted(() => {
+  if (hasCommandActions.value) {
+    void loadAll()
+  }
+})
+
+watch(
+  () => props.plugin.path,
+  (newPath, oldPath) => {
+    if (newPath && newPath !== oldPath) {
+      void loadAll()
+    }
+  }
+)
 
 function formatJsonData(data: any): string {
   if (!data) return ''
@@ -103,13 +131,53 @@ function formatDate(dateStr?: string): string {
         <div v-if="plugin.features && plugin.features.length > 0" class="feature-list">
           <FeatureCard v-for="feature in plugin.features" :key="feature.code" :feature="feature">
             <template v-for="cmd in feature.cmds" :key="cmdKey(cmd)">
+              <!-- 已安装：全部指令支持操作菜单 -->
+              <TagDropdown
+                v-if="hasCommandActions && isMatchCommand(cmd)"
+                :menu-items="
+                  getMenuItems(
+                    isCommandDisabled(pluginName, feature.code, cmdKey(cmd), cmd.type || 'text'),
+                    cmd.type,
+                    pluginName,
+                    feature.code,
+                    cmdKey(cmd)
+                  )
+                "
+                @select="(key) => handleMatchMenuSelect(key, feature, cmd)"
+              >
+                <CommandTag
+                  :command="normalizeCommand(cmd)"
+                  :disabled="
+                    isCommandDisabled(pluginName, feature.code, cmdKey(cmd), cmd.type || 'text')
+                  "
+                  show-arrow
+                />
+              </TagDropdown>
               <TagDropdown
-                v-if="isMatchCommand(cmd)"
-                :menu-items="[{ key: 'detail', label: '查看详情', icon: 'i-z-info' }]"
-                @select="openMatchCommandDetail(feature, cmd)"
+                v-else-if="hasCommandActions"
+                :menu-items="
+                  getMenuItems(
+                    isCommandDisabled(pluginName, feature.code, cmdKey(cmd), cmd.type || 'text'),
+                    cmd.type || 'text',
+                    pluginName,
+                    feature.code,
+                    cmdKey(cmd)
+                  )
+                "
+                @select="
+                  (key) =>
+                    handleMenuSelect(key, pluginName, feature.code, cmdKey(cmd), cmd.type || 'text')
+                "
               >
-                <CommandTag :command="normalizeCommand(cmd)" show-arrow />
+                <CommandTag
+                  :command="normalizeCommand(cmd)"
+                  :disabled="
+                    isCommandDisabled(pluginName, feature.code, cmdKey(cmd), cmd.type || 'text')
+                  "
+                  show-arrow
+                />
               </TagDropdown>
+              <!-- 未安装：纯展示 -->
               <CommandTag v-else :command="normalizeCommand(cmd)" />
             </template>
           </FeatureCard>
@@ -210,7 +278,10 @@ function formatDate(dateStr?: string): string {
     <MatchCommandDetailDialog
       :visible="!!selectedMatchCommand"
       :command="selectedMatchCommand?.command"
+      :disabled="selectedMatchCommandDisabled"
+      show-toggle-disabled
       @close="closeMatchCommandDetail"
+      @toggle-disabled="toggleSelectedMatchCommandDisabled"
     />
   </div>
 </template>
diff --git a/internal-plugins/setting/src/composables/index.ts b/internal-plugins/setting/src/composables/index.ts
index 086d3988..92e21954 100644
--- a/internal-plugins/setting/src/composables/index.ts
+++ b/internal-plugins/setting/src/composables/index.ts
@@ -2,3 +2,4 @@ export * from './useColorScheme'
 export * from './useHistoryState'
 export * from './useZtoolsSubInput'
 export * from './useJumpFunction'
+export * from './usePluginCommandActions'
diff --git a/internal-plugins/setting/src/composables/usePluginCommandActions.ts b/internal-plugins/setting/src/composables/usePluginCommandActions.ts
new file mode 100644
index 00000000..c0f29210
--- /dev/null
+++ b/internal-plugins/setting/src/composables/usePluginCommandActions.ts
@@ -0,0 +1,531 @@
+import { ref } from 'vue'
+import {
+  useMatchCommandDetail,
+  type SelectedMatchCommand
+} from '@/components/common/MatchCommandDetailDialog/MatchCommandDetailDialog'
+import type { TagDropdownMenuItem } from '@/components'
+import {
+  jumpFunctionShortcutsSetting,
+  type ShortcutsSettingAliasDraftTarget
+} from '@/views/ShortcutsSetting/ShortcutsSetting'
+import { getCommandId as _getCommandId } from '@shared/commandShared'
+
+export type CommandCmdType = 'text' | 'regex' | 'over' | 'img' | 'files' | 'window'
+
+type MatchCmd = {
+  type: string
+  match: string | Record<string, any>
+  exclude?: string
+  minLength?: number
+  maxLength?: number
+  fileType?: 'file' | 'directory'
+  extensions?: string[]
+  [key: string]: any
+}
+
+export interface CommandActionCommand {
+  name: string
+  path?: string
+  icon?: string
+  type: string
+  subType?: string
+  featureCode?: string
+  pluginName?: string
+  pluginTitle?: string
+  pluginExplain?: string
+  cmdType?: CommandCmdType
+  matchCmd?: MatchCmd
+}
+
+export interface UsePluginCommandActionsOptions {
+  /** 当前插件的有效名称（开发版含 __dev 后缀），用于 commandId */
+  getPluginName: () => string | undefined
+  /** 当前插件的安装路径，用于匹配 canonical command */
+  getPluginPath: () => string | undefined
+  /** 当前插件的展示标题，用于别名草稿与快捷键 payload */
+  getPluginTitle: () => string | undefined
+}
+
+// 禁用指令 / 搜索固定 持久化 key
+const DISABLED_COMMANDS_KEY = 'disable-commands'
+const SEARCH_PINNED_KEY = 'pinned-commands'
+
+/**
+ * 插件指令操作逻辑（禁用 / 固定到搜索 / 固定到超级面板 / 全局快捷键 / 自定义别名 / 打开）
+ *
+ * 同时服务「插件详情页」与「全部指令页」，逻辑保持一致。
+ * 数据源通过 options 注入（插件名 / 路径 / 标题），内部自行加载
+ * 禁用列表、超级面板固定、搜索固定以及 canonical commands 快照。
+ */
+// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
+export function usePluginCommandActions(options: UsePluginCommandActionsOptions) {
+  const { getPluginName, getPluginPath, getPluginTitle } = options
+
+  // 禁用指令列表
+  const disabledCommands = ref<string[]>([])
+
+  // 超级面板固定列表
+  const superPanelPinned = ref<any[]>([])
+
+  // 搜索窗口固定列表
+  const searchPinned = ref<any[]>([])
+
+  // 当前插件对应的 canonical commands 快照（含 text 与 match），用于补齐 icon/path 等运行时字段
+  const pluginCommands = ref<CommandActionCommand[]>([])
+
+  // ============ commandId ============
+
+  function getPluginCommandId(
+    pluginName: string,
+    featureCode: string,
+    cmdName: string,
+    cmdType: CommandCmdType
+  ): string {
+    return _getCommandId({
+      type: 'plugin',
+      pluginName,
+      featureCode,
+      name: cmdName,
+      cmdType
+    })
+  }
+
+  // ============ 禁用指令 ============
+
+  function isCommandDisabled(
+    pluginName: string,
+    featureCode: string,
+    cmdName: string,
+    cmdType: CommandCmdType
+  ): boolean {
+    const id = getPluginCommandId(pluginName, featureCode, cmdName, cmdType)
+    return disabledCommands.value.includes(id)
+  }
+
+  async function toggleCommandDisabled(
+    pluginName: string,
+    featureCode: string,
+    cmdName: string,
+    cmdType: CommandCmdType
+  ): Promise<void> {
+    const id = getPluginCommandId(pluginName, featureCode, cmdName, cmdType)
+    const index = disabledCommands.value.indexOf(id)
+
+    if (index === -1) {
+      disabledCommands.value.push(id)
+    } else {
+      disabledCommands.value.splice(index, 1)
+    }
+
+    await saveDisabledCommands()
+  }
+
+  async function saveDisabledCommands(): Promise<void> {
+    try {
+      const plainArray = [...disabledCommands.value]
+      await window.ztools.internal.dbPut(DISABLED_COMMANDS_KEY, plainArray)
+      await window.ztools.internal.notifyDisabledCommandsChanged()
+    } catch (error) {
+      console.error('保存禁用指令列表失败:', error)
+    }
+  }
+
+  async function loadDisabledCommands(): Promise<void> {
+    try {
+      const data = await window.ztools.internal.dbGet(DISABLED_COMMANDS_KEY)
+      if (data && Array.isArray(data)) {
+        disabledCommands.value = data
+      }
+    } catch (error) {
+      console.error('加载禁用指令列表失败:', error)
+    }
+  }
+
+  // ============ 超级面板固定 ============
+
+  async function loadSuperPanelPinned(): Promise<void> {
+    try {
+      superPanelPinned.value = await window.ztools.internal.getSuperPanelPinned()
+    } catch (error) {
+      console.error('加载超级面板固定列表失败:', error)
+    }
+  }
+
+  function isPinnedToSuperPanel(pluginName: string, featureCode: string, cmdName: string): boolean {
+    return superPanelPinned.value.some(
+      (item) =>
+        item.name === cmdName && item.featureCode === featureCode && item.pluginName === pluginName
+    )
+  }
+
+  async function toggleSuperPanelPin(
+    pluginName: string,
+    featureCode: string,
+    cmdName: string
+  ): Promise<void> {
+    const isPinned = isPinnedToSuperPanel(pluginName, featureCode, cmdName)
+
+    if (isPinned) {
+      const item = superPanelPinned.value.find(
+        (i) => i.name === cmdName && i.featureCode === featureCode && i.pluginName === pluginName
+      )
+      if (item) {
+        await window.ztools.internal.unpinSuperPanelCommand(item.path, item.featureCode)
+      }
+    } else {
+      const command = findPluginCommand(featureCode, cmdName)
+
+      if (command) {
+        await window.ztools.internal.pinToSuperPanel({
+          name: command.name,
+          path: command.path || '',
+          icon: command.icon || '',
+          type: command.type,
+          featureCode: command.featureCode || '',
+          pluginName,
+          pluginExplain: command.pluginExplain || '',
+          cmdType: command.cmdType || 'text'
+        })
+      }
+    }
+
+    await loadSuperPanelPinned()
+  }
+
+  // ============ 搜索框固定 ============
+
+  async function loadSearchPinned(): Promise<void> {
+    try {
+      const data = await window.ztools.internal.dbGet(SEARCH_PINNED_KEY)
+      if (data && Array.isArray(data)) {
+        searchPinned.value = data
+      }
+    } catch (error) {
+      console.error('加载搜索固定列表失败:', error)
+    }
+  }
+
+  function isPinnedToSearch(pluginPath: string | undefined, featureCode: string): boolean {
+    return searchPinned.value.some(
+      (item) => item.path === pluginPath && item.featureCode === featureCode
+    )
+  }
+
+  async function toggleSearchPin(
+    pluginName: string,
+    pluginPath: string | undefined,
+    featureCode: string,
+    cmdName: string
+  ): Promise<void> {
+    const pinned = isPinnedToSearch(pluginPath, featureCode)
+
+    if (pinned) {
+      await window.ztools.internal.unpinApp(pluginPath || '', featureCode, cmdName)
+    } else {
+      const command = findPluginCommand(featureCode, cmdName)
+
+      if (command) {
+        await window.ztools.internal.pinApp(JSON.parse(JSON.stringify(command)))
+      }
+    }
+
+    await loadSearchPinned()
+  }
+
+  // ============ canonical commands ============
+
+  /** 在 pluginCommands 中按 featureCode + cmdName 定位指令 */
+  function findPluginCommand(
+    featureCode: string,
+    cmdName: string
+  ): CommandActionCommand | undefined {
+    return pluginCommands.value.find((c) => c.featureCode === featureCode && c.name === cmdName)
+  }
+
+  async function loadPluginCommands(): Promise<void> {
+    const pluginPath = getPluginPath()
+    if (!pluginPath) return
+
+    try {
+      const result = await window.ztools.internal.getCommands()
+      const all: CommandActionCommand[] = [
+        ...(result.commands || []),
+        ...(result.regexCommands || [])
+      ]
+      pluginCommands.value = all.filter((c) => c.path === pluginPath && c.type === 'plugin')
+    } catch (error) {
+      console.error('加载插件指令数据失败:', error)
+    }
+  }
+
+  // ============ 打开指令 ============
+
+  async function openCommand(featureCode: string, cmdName: string): Promise<void> {
+    try {
+      const command = findPluginCommand(featureCode, cmdName)
+
+      if (!command) {
+        console.error('未找到指令:', { featureCode, cmdName })
+        return
+      }
+
+      await window.ztools.internal.launch({
+        path: command.path || '',
+        type: command.type,
+        featureCode: command.featureCode,
+        name: command.name,
+        param: {
+          payload: ''
+        }
+      })
+    } catch (error) {
+      console.error('打开指令失败:', error)
+    }
+  }
+
+  // ============ 自定义别名 ============
+
+  function buildPluginAliasDraftTarget(
+    pluginName: string,
+    featureCode: string,
+    cmdName: string,
+    cmdType: 'text' | 'window'
+  ): ShortcutsSettingAliasDraftTarget {
+    const pluginTitle = getPluginTitle() || pluginName
+    const commandIcon = findPluginCommand(featureCode, cmdName)?.icon
+
+    return {
+      commandId: getPluginCommandId(pluginName, featureCode, cmdName, cmdType),
+      type: 'plugin',
+      path: getPluginPath(),
+      groupKey: pluginName,
+      groupTitle: pluginTitle,
+      featureCode,
+      subtitle: featureCode,
+      pluginName,
+      pluginTitle,
+      cmdName,
+      cmdType,
+      icon: commandIcon
+    }
+  }
+
+  function openAliasShortcut(
+    pluginName: string,
+    featureCode: string,
+    cmdName: string,
+    cmdType: 'text' | 'window'
+  ): void {
+    jumpFunctionShortcutsSetting({
+      tab: 'alias',
+      draftTarget: buildPluginAliasDraftTarget(pluginName, featureCode, cmdName, cmdType)
+    })
+  }
+
+  function isAliasableCmdType(cmdType?: string): cmdType is 'text' | 'window' {
+    return cmdType === 'text' || cmdType === 'window'
+  }
+
+  // ============ 菜单项 ============
+
+  function getMenuItems(
+    isDisabled: boolean,
+    cmdType?: string,
+    pluginName?: string,
+    featureCode?: string,
+    cmdName?: string
+  ): TagDropdownMenuItem[] {
+    const items: TagDropdownMenuItem[] = []
+
+    const canAddAlias = isAliasableCmdType(cmdType) && pluginName && featureCode && cmdName
+
+    if (cmdType && cmdType !== 'text') {
+      items.push({
+        key: 'detail',
+        label: '查看详情',
+        icon: 'i-z-info'
+      })
+    }
+
+    if (cmdType === 'text') {
+      items.push({
+        key: 'open',
+        label: '打开指令',
+        icon: 'i-z-play'
+      })
+
+      if (pluginName && featureCode && cmdName) {
+        const pinned = isPinnedToSuperPanel(pluginName, featureCode, cmdName)
+        items.push({
+          key: 'pin-super-panel',
+          label: pinned ? '取消固定超级面板' : '固定到超级面板',
+          icon: 'i-z-pin'
+        })
+
+        const searchPinnedState = isPinnedToSearch(getPluginPath(), featureCode)
+        items.push({
+          key: 'pin-search',
+          label: searchPinnedState ? '取消固定搜索' : '固定到搜索',
+          icon: 'i-z-pin'
+        })
+
+        items.push({
+          key: 'set-global-shortcut',
+          label: '设置全局快捷键',
+          icon: 'i-z-keyboard'
+        })
+      }
+    }
+
+    if (canAddAlias) {
+      items.push({
+        key: 'custom-alias',
+        label: '自定义别名',
+        icon: 'i-z-alias'
+      })
+    }
+
+    items.push({
+      key: 'toggle',
+      label: isDisabled ? '启用指令' : '禁用指令',
+      icon: isDisabled ? 'i-z-check' : 'i-z-ban',
+      danger: !isDisabled
+    })
+
+    return items
+  }
+
+  async function handleMenuSelect(
+    key: string,
+    pluginName: string,
+    featureCode: string,
+    cmdName: string,
+    cmdType: CommandCmdType
+  ): Promise<void> {
+    if (key === 'toggle') {
+      await toggleCommandDisabled(pluginName, featureCode, cmdName, cmdType)
+    } else if (key === 'open') {
+      await openCommand(featureCode, cmdName)
+    } else if (key === 'pin-super-panel') {
+      await toggleSuperPanelPin(pluginName, featureCode, cmdName)
+    } else if (key === 'pin-search') {
+      await toggleSearchPin(pluginName, getPluginPath(), featureCode, cmdName)
+    } else if (key === 'set-global-shortcut') {
+      const pluginTitle = getPluginTitle() || pluginName
+      jumpFunctionShortcutsSetting({
+        payload: `${pluginTitle}/${cmdName}`
+      })
+    } else if (key === 'custom-alias') {
+      if (!isAliasableCmdType(cmdType)) return
+      openAliasShortcut(pluginName, featureCode, cmdName, cmdType)
+    }
+  }
+
+  async function handleMatchMenuSelect(
+    key: string,
+    feature: { code?: string },
+    cmd: { name?: string; label?: string; text?: string; type?: string }
+  ): Promise<void> {
+    if (key === 'detail') {
+      openMatchCommandDetail(feature as any, cmd as any)
+      return
+    }
+
+    const pluginName = getPluginName() || ''
+    // 匹配指令的 name 在不同来源下字段不一致：
+    // - 全部指令页：来自 canonical regexCommand.name（已规范化）
+    // - 插件详情页：来自 plugin.json 原始对象，仅有 label
+    // 这里统一回退 label/text/name，与 commandId 计算规则保持一致。
+    const cmdName = cmd.label || cmd.text || cmd.name || ''
+    await handleMenuSelect(
+      key,
+      pluginName,
+      feature.code || '',
+      cmdName,
+      (cmd.type || 'text') as CommandCmdType
+    )
+  }
+
+  // ============ 匹配指令详情弹窗（集成禁用钩子） ============
+
+  const {
+    selectedMatchCommand,
+    selectedMatchCommandDisabled,
+    openMatchCommandDetail,
+    closeMatchCommandDetail,
+    toggleSelectedMatchCommandDisabled,
+    cmdKey,
+    normalizeCommand,
+    isMatchCommand
+  } = useMatchCommandDetail({
+    getPluginName: () => getPluginName() || '',
+    isDisabled: (detail: SelectedMatchCommand) =>
+      isCommandDisabled(
+        detail.pluginName || getPluginName() || '',
+        detail.feature.code || '',
+        detail.command.label || detail.command.name || '',
+        (detail.command.type || 'text') as CommandCmdType
+      ),
+    toggleDisabled: (detail: SelectedMatchCommand) =>
+      toggleCommandDisabled(
+        detail.pluginName || getPluginName() || '',
+        detail.feature.code || '',
+        detail.command.label || detail.command.name || '',
+        (detail.command.type || 'text') as CommandCmdType
+      )
+  })
+
+  // ============ 初始化 ============
+
+  /** 并行加载禁用 / 超级面板 / 搜索固定 + canonical commands */
+  async function loadAll(): Promise<void> {
+    await Promise.all([
+      loadDisabledCommands(),
+      loadSuperPanelPinned(),
+      loadSearchPinned(),
+      loadPluginCommands()
+    ])
+  }
+
+  return {
+    // 状态
+    disabledCommands,
+    superPanelPinned,
+    searchPinned,
+    pluginCommands,
+    // 加载
+    loadAll,
+    loadDisabledCommands,
+    loadSuperPanelPinned,
+    loadSearchPinned,
+    loadPluginCommands,
+    saveDisabledCommands,
+    // commandId
+    getPluginCommandId,
+    // 判断
+    isCommandDisabled,
+    isPinnedToSuperPanel,
+    isPinnedToSearch,
+    // 切换
+    toggleCommandDisabled,
+    toggleSuperPanelPin,
+    toggleSearchPin,
+    // 操作
+    openCommand,
+    openAliasShortcut,
+    // 菜单
+    getMenuItems,
+    handleMenuSelect,
+    handleMatchMenuSelect,
+    // 匹配指令详情
+    selectedMatchCommand,
+    selectedMatchCommandDisabled,
+    openMatchCommandDetail,
+    closeMatchCommandDetail,
+    toggleSelectedMatchCommandDisabled,
+    // 匹配指令工具
+    cmdKey,
+    normalizeCommand,
+    isMatchCommand
+  }
+}
diff --git a/internal-plugins/setting/src/views/AllCommandsSetting/AllCommandsSetting.vue b/internal-plugins/setting/src/views/AllCommandsSetting/AllCommandsSetting.vue
index b5970ec1..6fedf351 100644
--- a/internal-plugins/setting/src/views/AllCommandsSetting/AllCommandsSetting.vue
+++ b/internal-plugins/setting/src/views/AllCommandsSetting/AllCommandsSetting.vue
@@ -8,11 +8,10 @@ import {
   FeatureCard,
   TagDropdown,
   CommandCard,
-  MatchCommandDetailDialog,
-  useMatchCommandDetail
+  MatchCommandDetailDialog
 } from '@/components'
 import type { TagDropdownMenuItem } from '@/components'
-import { useZtoolsSubInput } from '@/composables'
+import { usePluginCommandActions, useZtoolsSubInput } from '@/composables'
 import {
   jumpFunctionShortcutsSetting,
   type ShortcutsSettingAliasDraftTarget
@@ -89,42 +88,8 @@ const regexCommands = ref<Command[]>([])
 const plugins = ref<any[]>([])
 const selectedSource = ref<Source | null>(null)
 const activeTab = ref<'text' | 'match'>('text')
-const {
-  selectedMatchCommand,
-  selectedMatchCommandDisabled,
-  openMatchCommandDetail,
-  closeMatchCommandDetail,
-  toggleSelectedMatchCommandDisabled
-} = useMatchCommandDetail({
-  getPluginName: () => getCurrentSource()?.name || '',
-  isDisabled: (detail) =>
-    isCommandDisabled(
-      detail.pluginName || '',
-      detail.feature.code || '',
-      detail.command.label || detail.command.name || '',
-      (detail.command.type || '') as CommandCmdType
-    ),
-  toggleDisabled: (detail) =>
-    toggleCommandDisabled(
-      detail.pluginName || '',
-      detail.feature.code || '',
-      detail.command.label || detail.command.name || '',
-      (detail.command.type || '') as CommandCmdType
-    )
-})
-
-// 禁用指令列表
-const disabledCommands = ref<string[]>([])
-const DISABLED_COMMANDS_KEY = 'disable-commands'
-
-// 超级面板固定列表
-const superPanelPinned = ref<any[]>([])
-
-// 搜索窗口固定列表
-const searchPinned = ref<any[]>([])
-const SEARCH_PINNED_KEY = 'pinned-commands'
 
-// 生成指令唯一标识
+// 生成指令唯一标识（direct/app 用）
 function getCommandId(
   command: Pick<Command, 'name' | 'path' | 'type' | 'subType' | 'featureCode' | 'cmdType'> & {
     pluginName?: string
@@ -141,54 +106,6 @@ function getCommandId(
   })
 }
 
-function getPluginCommandId(
-  pluginName: string,
-  featureCode: string,
-  cmdName: string,
-  cmdType: CommandCmdType
-): string {
-  return getCommandId({
-    type: 'plugin',
-    pluginName,
-    featureCode,
-    name: cmdName,
-    cmdType: cmdType
-  })
-}
-
-function buildPluginAliasDraftTarget(
-  pluginName: string,
-  featureCode: string,
-  cmdName: string,
-  cmdType: 'text' | 'window'
-): ShortcutsSettingAliasDraftTarget {
-  const source = getCurrentSource()
-  const pluginTitle = source?.title || pluginName
-  const sourceCommands = cmdType === 'window' ? regexCommands.value : commands.value
-  const commandIcon = sourceCommands.find(
-    (command) =>
-      command.path === source?.path &&
-      command.featureCode === featureCode &&
-      command.name === cmdName &&
-      command.cmdType === cmdType
-  )?.icon
-
-  return {
-    commandId: getPluginCommandId(pluginName, featureCode, cmdName, cmdType),
-    type: 'plugin',
-    path: source?.path,
-    groupKey: pluginName,
-    groupTitle: pluginTitle,
-    featureCode,
-    subtitle: featureCode,
-    pluginName,
-    pluginTitle,
-    cmdName,
-    cmdType,
-    icon: commandIcon || source?.logo
-  }
-}
-
 function isDirectAppCommand(cmd: Command): boolean {
   return cmd.type === 'direct' && cmd.subType === 'app'
 }
@@ -211,40 +128,12 @@ function buildAppAliasDraftTarget(cmd: Command): ShortcutsSettingAliasDraftTarge
   }
 }
 
-function isCommandDisabled(
-  pluginName: string,
-  featureCode: string,
-  cmdName: string,
-  cmdType: CommandCmdType
-): boolean {
-  const id = getPluginCommandId(pluginName, featureCode, cmdName, cmdType)
-  return disabledCommands.value.includes(id)
-}
-
 function isDirectAppCommandDisabled(cmd: Command): boolean {
   const nextId = getCommandId(cmd)
   const legacyId = getLegacyDirectAppCommandId(cmd.name, cmd.cmdType || 'text')
   return disabledCommands.value.includes(nextId) || disabledCommands.value.includes(legacyId)
 }
 
-async function toggleCommandDisabled(
-  pluginName: string,
-  featureCode: string,
-  cmdName: string,
-  cmdType: CommandCmdType
-): Promise<void> {
-  const id = getPluginCommandId(pluginName, featureCode, cmdName, cmdType)
-  const index = disabledCommands.value.indexOf(id)
-
-  if (index === -1) {
-    disabledCommands.value.push(id)
-  } else {
-    disabledCommands.value.splice(index, 1)
-  }
-
-  await saveDisabledCommands()
-}
-
 async function toggleDirectAppCommandDisabled(cmd: Command): Promise<void> {
   const nextId = getCommandId(cmd)
   const legacyId = getLegacyDirectAppCommandId(cmd.name, cmd.cmdType || 'text')
@@ -261,85 +150,12 @@ async function toggleDirectAppCommandDisabled(cmd: Command): Promise<void> {
   await saveDisabledCommands()
 }
 
-async function saveDisabledCommands(): Promise<void> {
-  try {
-    const plainArray = [...disabledCommands.value]
-    await window.ztools.internal.dbPut(DISABLED_COMMANDS_KEY, plainArray)
-    await window.ztools.internal.notifyDisabledCommandsChanged()
-  } catch (error) {
-    console.error('保存禁用指令列表失败:', error)
-  }
-}
-
-async function loadDisabledCommands(): Promise<void> {
-  try {
-    const data = await window.ztools.internal.dbGet(DISABLED_COMMANDS_KEY)
-    if (data && Array.isArray(data)) {
-      disabledCommands.value = data
-    }
-  } catch (error) {
-    console.error('加载禁用指令列表失败:', error)
-  }
-}
-
-async function loadSuperPanelPinned(): Promise<void> {
-  try {
-    superPanelPinned.value = await window.ztools.internal.getSuperPanelPinned()
-  } catch (error) {
-    console.error('加载超级面板固定列表失败:', error)
-  }
-}
-
-function isPinnedToSuperPanel(pluginName: string, featureCode: string, cmdName: string): boolean {
-  return superPanelPinned.value.some(
-    (item) =>
-      item.name === cmdName && item.featureCode === featureCode && item.pluginName === pluginName
-  )
-}
-
 function isAppPinnedToSuperPanel(cmd: Command): boolean {
   return superPanelPinned.value.some(
     (item) => item.path === cmd.path && item.name === cmd.name && item.type === 'direct'
   )
 }
 
-async function toggleSuperPanelPin(
-  pluginName: string,
-  featureCode: string,
-  cmdName: string
-): Promise<void> {
-  const isPinned = isPinnedToSuperPanel(pluginName, featureCode, cmdName)
-
-  if (isPinned) {
-    const item = superPanelPinned.value.find(
-      (i) => i.name === cmdName && i.featureCode === featureCode && i.pluginName === pluginName
-    )
-    if (item) {
-      await window.ztools.internal.unpinSuperPanelCommand(item.path, item.featureCode)
-    }
-  } else {
-    const command = commands.value.find(
-      (c) =>
-        c.path === getCurrentSource()?.path && c.featureCode === featureCode && c.name === cmdName
-    )
-
-    if (command) {
-      await window.ztools.internal.pinToSuperPanel({
-        name: command.name,
-        path: command.path || '',
-        icon: command.icon || '',
-        type: command.type,
-        featureCode: command.featureCode || '',
-        pluginName,
-        pluginExplain: command.pluginExplain || '',
-        cmdType: command.cmdType || 'text'
-      })
-    }
-  }
-
-  await loadSuperPanelPinned()
-}
-
 async function toggleAppSuperPanelPin(cmd: Command): Promise<void> {
   const isPinned = isAppPinnedToSuperPanel(cmd)
 
@@ -361,50 +177,10 @@ async function toggleAppSuperPanelPin(cmd: Command): Promise<void> {
   await loadSuperPanelPinned()
 }
 
-async function loadSearchPinned(): Promise<void> {
-  try {
-    const data = await window.ztools.internal.dbGet(SEARCH_PINNED_KEY)
-    if (data && Array.isArray(data)) {
-      searchPinned.value = data
-    }
-  } catch (error) {
-    console.error('加载搜索固定列表失败:', error)
-  }
-}
-
-function isPinnedToSearch(featureCode: string): boolean {
-  return searchPinned.value.some(
-    (item) => item.path === getCurrentSource()?.path && item.featureCode === featureCode
-  )
-}
-
 function isAppPinnedToSearch(cmd: Command): boolean {
   return searchPinned.value.some((item) => item.path === cmd.path && item.name === cmd.name)
 }
 
-async function toggleSearchPin(
-  pluginName: string,
-  featureCode: string,
-  cmdName: string
-): Promise<void> {
-  const pinned = isPinnedToSearch(featureCode)
-
-  if (pinned) {
-    await window.ztools.internal.unpinApp(getCurrentSource()?.path || '', featureCode, cmdName)
-  } else {
-    const command = commands.value.find(
-      (c) =>
-        c.path === getCurrentSource()?.path && c.featureCode === featureCode && c.name === cmdName
-    )
-
-    if (command) {
-      await window.ztools.internal.pinApp(JSON.parse(JSON.stringify(command)))
-    }
-  }
-
-  await loadSearchPinned()
-}
-
 async function toggleAppSearchPin(cmd: Command): Promise<void> {
   const pinned = isAppPinnedToSearch(cmd)
 
@@ -452,13 +228,22 @@ function getAppMenuItems(cmd: Command): TagDropdownMenuItem[] {
   items.push({
     key: 'toggle',
     label: disabled ? '启用指令' : '禁用指令',
-    icon: disabled ? 'check' : 'ban',
+    icon: disabled ? 'i-z-check' : 'i-z-ban',
     danger: !disabled
   })
 
   return items
 }
 
+function openAppAliasShortcut(cmd: Command): void {
+  if (!isDirectAppCommand(cmd)) return
+
+  jumpFunctionShortcutsSetting({
+    tab: 'alias',
+    draftTarget: buildAppAliasDraftTarget(cmd)
+  })
+}
+
 async function handleAppMenuSelect(key: string, cmd: Command): Promise<void> {
   if (key === 'open') {
     try {
@@ -483,169 +268,6 @@ async function handleAppMenuSelect(key: string, cmd: Command): Promise<void> {
   }
 }
 
-function isAliasableCmdType(cmdType?: string): cmdType is 'text' | 'window' {
-  return cmdType === 'text' || cmdType === 'window'
-}
-
-function getMenuItems(
-  isDisabled: boolean,
-  cmdType?: string,
-  pluginName?: string,
-  featureCode?: string,
-  cmdName?: string
-): TagDropdownMenuItem[] {
-  const items: TagDropdownMenuItem[] = []
-
-  const canAddAlias = isAliasableCmdType(cmdType) && pluginName && featureCode && cmdName
-
-  if (cmdType && cmdType !== 'text') {
-    items.push({
-      key: 'detail',
-      label: '查看详情',
-      icon: 'i-z-info'
-    })
-  }
-
-  if (cmdType === 'text') {
-    items.push({
-      key: 'open',
-      label: '打开指令',
-      icon: 'i-z-play'
-    })
-
-    if (pluginName && featureCode && cmdName) {
-      const pinned = isPinnedToSuperPanel(pluginName, featureCode, cmdName)
-      items.push({
-        key: 'pin-super-panel',
-        label: pinned ? '取消固定超级面板' : '固定到超级面板',
-        icon: 'i-z-pin'
-      })
-
-      const searchPinnedState = isPinnedToSearch(featureCode)
-      items.push({
-        key: 'pin-search',
-        label: searchPinnedState ? '取消固定搜索' : '固定到搜索',
-        icon: 'i-z-pin'
-      })
-
-      items.push({
-        key: 'set-global-shortcut',
-        label: '设置全局快捷键',
-        icon: 'i-z-keyboard'
-      })
-    }
-  }
-
-  if (canAddAlias) {
-    items.push({
-      key: 'custom-alias',
-      label: '自定义别名',
-      icon: 'i-z-alias'
-    })
-  }
-
-  items.push({
-    key: 'toggle',
-    label: isDisabled ? '启用指令' : '禁用指令',
-    icon: isDisabled ? 'i-z-check' : 'i-z-ban',
-    danger: !isDisabled
-  })
-
-  return items
-}
-
-function openAliasShortcut(
-  pluginName: string,
-  featureCode: string,
-  cmdName: string,
-  cmdType: 'text' | 'window'
-): void {
-  jumpFunctionShortcutsSetting({
-    tab: 'alias',
-    draftTarget: buildPluginAliasDraftTarget(pluginName, featureCode, cmdName, cmdType)
-  })
-}
-
-function openAppAliasShortcut(cmd: Command): void {
-  if (!isDirectAppCommand(cmd)) return
-
-  jumpFunctionShortcutsSetting({
-    tab: 'alias',
-    draftTarget: buildAppAliasDraftTarget(cmd)
-  })
-}
-
-async function handleMenuSelect(
-  key: string,
-  pluginName: string,
-  featureCode: string,
-  cmdName: string,
-  cmdType: CommandCmdType
-): Promise<void> {
-  if (key === 'toggle') {
-    toggleCommandDisabled(pluginName, featureCode, cmdName, cmdType)
-  } else if (key === 'open') {
-    await openCommand(pluginName, featureCode, cmdName, cmdType)
-  } else if (key === 'pin-super-panel') {
-    await toggleSuperPanelPin(pluginName, featureCode, cmdName)
-  } else if (key === 'pin-search') {
-    await toggleSearchPin(pluginName, featureCode, cmdName)
-  } else if (key === 'set-global-shortcut') {
-    const pluginTitle = getCurrentSource()?.title || pluginName
-    jumpFunctionShortcutsSetting({
-      payload: `${pluginTitle}/${cmdName}`
-    })
-  } else if (key === 'custom-alias') {
-    if (!isAliasableCmdType(cmdType)) return
-    openAliasShortcut(pluginName, featureCode, cmdName, cmdType)
-  }
-}
-
-async function handleMatchMenuSelect(key: string, feature: any, cmd: any): Promise<void> {
-  if (key === 'detail') {
-    openMatchCommandDetail(feature, cmd)
-    return
-  }
-
-  await handleMenuSelect(key, getCurrentSource()?.name || '', feature.code, cmd.name, cmd.type)
-}
-
-async function openCommand(
-  pluginName: string,
-  featureCode: string,
-  cmdName: string,
-  cmdType: string
-): Promise<void> {
-  try {
-    const command = commands.value.find(
-      (c) =>
-        c.path === getCurrentSource()?.path &&
-        c.featureCode === featureCode &&
-        c.name === cmdName &&
-        c.cmdType === cmdType
-    )
-
-    if (!command) {
-      console.error('未找到指令:', { pluginName, featureCode, cmdName, cmdType })
-      return
-    }
-
-    console.log('打开指令:', command)
-
-    await window.ztools.internal.launch({
-      path: command.path || '',
-      type: command.type,
-      featureCode: command.featureCode,
-      name: command.name,
-      param: {
-        payload: ''
-      }
-    })
-  } catch (error) {
-    console.error('打开指令失败:', error)
-  }
-}
-
 // 内置插件名称列表（与主进程保持一致）
 const INTERNAL_PLUGIN_NAMES = ['setting', 'system']
 
@@ -785,6 +407,35 @@ function getCurrentSource(): Source | null {
   return activeSource.value || selectedSource.value
 }
 
+// 插件指令操作（共享逻辑）+ 与 direct/app 共享的禁用/固定状态
+const {
+  // 共享状态（direct/app 复用同一份）
+  disabledCommands,
+  superPanelPinned,
+  searchPinned,
+  saveDisabledCommands,
+  loadSuperPanelPinned,
+  loadSearchPinned,
+  // 加载
+  loadAll,
+  loadPluginCommands,
+  // 插件指令
+  isCommandDisabled,
+  getMenuItems,
+  handleMenuSelect,
+  handleMatchMenuSelect,
+  // 匹配指令详情
+  selectedMatchCommand,
+  selectedMatchCommandDisabled,
+  openMatchCommandDetail,
+  closeMatchCommandDetail,
+  toggleSelectedMatchCommandDisabled
+} = usePluginCommandActions({
+  getPluginName: () => getCurrentSource()?.name,
+  getPluginPath: () => getCurrentSource()?.path,
+  getPluginTitle: () => getCurrentSource()?.title || getCurrentSource()?.name
+})
+
 // 当前选中来源的指令（系统应用/设置/本地启动）
 const systemCommands = computed(() => {
   if (!activeSource.value) return []
@@ -937,15 +588,19 @@ async function loadCommands(): Promise<void> {
 function selectSource(source: Source): void {
   selectedSource.value = source
   activeTab.value = 'text'
+  // 切换来源后刷新当前插件的指令快照（供打开/固定/别名取 icon 等运行时字段）
+  if (source.path) {
+    void loadPluginCommands()
+  }
 }
 
 // 初始化
 onMounted(async () => {
   loading.value = true
   try {
-    // 并行加载禁用指令和超级面板固定列表（互不依赖）
-    await Promise.all([loadDisabledCommands(), loadSuperPanelPinned(), loadSearchPinned()])
-    // 加载指令数据（内含 plugins，无需再单独请求）
+    // 并行加载禁用指令、超级面板固定、搜索固定，以及插件指令快照
+    await loadAll()
+    // 加载指令数据（内含 plugins，用于列表展示与搜索过滤）
     await loadCommands()
     // 默认选中系统应用
     if (appCount.value > 0) {

From bea704397ae06fc5b110f38a54477ec305f3adc9 Mon Sep 17 00:00:00 2001
From: pantao <980141374@qq.com>
Date: Tue, 30 Jun 2026 10:12:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?refactor(setting):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=8C=87=E4=BB=A4=E6=93=8D=E4=BD=9C=20composable=20=E5=B9=B6?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=96=E6=B6=88=E5=9B=BA=E5=AE=9A=E5=A4=B1?=
 =?UTF-8?q?=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

采纳代码审查意见:
- loadPluginCommands: 切换到非插件来源时清空 pluginCommands 缓存，避免残留
- AllCommandsSetting: selectSource 无条件调用 loadPluginCommands 以配合上述清空
- handleMatchMenuSelect / MatchDetail 钩子统一使用 cmdKey 提取指令名，消除重复 fallback
- 调整 useMatchCommandDetail 调用顺序至菜单处理之前，使 cmdKey 等先定义后引用

修复取消固定到搜索框失效:
主进程 filterOutCommand 对插件类型按 pluginName 匹配存储项（而非指令名），
此前 toggleSearchPin 调用 unpinApp 传入指令名(cmdName)，与存储项 pluginName
永不相等导致过滤不掉。对齐主窗口搜索框行为，改为传入 pluginName。
---
 .../composables/usePluginCommandActions.ts    | 73 ++++++++++---------
 .../AllCommandsSetting/AllCommandsSetting.vue |  7 +-
 2 files changed, 43 insertions(+), 37 deletions(-)

diff --git a/internal-plugins/setting/src/composables/usePluginCommandActions.ts b/internal-plugins/setting/src/composables/usePluginCommandActions.ts
index c0f29210..6c69e017 100644
--- a/internal-plugins/setting/src/composables/usePluginCommandActions.ts
+++ b/internal-plugins/setting/src/composables/usePluginCommandActions.ts
@@ -220,7 +220,9 @@ export function usePluginCommandActions(options: UsePluginCommandActionsOptions)
     const pinned = isPinnedToSearch(pluginPath, featureCode)
 
     if (pinned) {
-      await window.ztools.internal.unpinApp(pluginPath || '', featureCode, cmdName)
+      // 注意：主进程 filterOutCommand 对插件类型按 pluginName 匹配（而非指令名），
+      // 因此取消固定时必须传 pluginName，否则无法命中存储项导致取消失败。
+      await window.ztools.internal.unpinApp(pluginPath || '', featureCode, pluginName)
     } else {
       const command = findPluginCommand(featureCode, cmdName)
 
@@ -244,7 +246,11 @@ export function usePluginCommandActions(options: UsePluginCommandActionsOptions)
 
   async function loadPluginCommands(): Promise<void> {
     const pluginPath = getPluginPath()
-    if (!pluginPath) return
+    // 切换到非插件来源（如系统应用）时清空缓存，避免残留上一个插件的指令数据
+    if (!pluginPath) {
+      pluginCommands.value = []
+      return
+    }
 
     try {
       const result = await window.ztools.internal.getCommands()
@@ -395,6 +401,36 @@ export function usePluginCommandActions(options: UsePluginCommandActionsOptions)
     return items
   }
 
+  // ============ 匹配指令详情弹窗（集成禁用钩子） ============
+  // 放在菜单处理之前，确保 cmdKey / openMatchCommandDetail 等先定义后被引用。
+
+  const {
+    selectedMatchCommand,
+    selectedMatchCommandDisabled,
+    openMatchCommandDetail,
+    closeMatchCommandDetail,
+    toggleSelectedMatchCommandDisabled,
+    cmdKey,
+    normalizeCommand,
+    isMatchCommand
+  } = useMatchCommandDetail({
+    getPluginName: () => getPluginName() || '',
+    isDisabled: (detail: SelectedMatchCommand) =>
+      isCommandDisabled(
+        detail.pluginName || getPluginName() || '',
+        detail.feature.code || '',
+        cmdKey(detail.command),
+        (detail.command.type || 'text') as CommandCmdType
+      ),
+    toggleDisabled: (detail: SelectedMatchCommand) =>
+      toggleCommandDisabled(
+        detail.pluginName || getPluginName() || '',
+        detail.feature.code || '',
+        cmdKey(detail.command),
+        (detail.command.type || 'text') as CommandCmdType
+      )
+  })
+
   async function handleMenuSelect(
     key: string,
     pluginName: string,
@@ -435,8 +471,8 @@ export function usePluginCommandActions(options: UsePluginCommandActionsOptions)
     // 匹配指令的 name 在不同来源下字段不一致：
     // - 全部指令页：来自 canonical regexCommand.name（已规范化）
     // - 插件详情页：来自 plugin.json 原始对象，仅有 label
-    // 这里统一回退 label/text/name，与 commandId 计算规则保持一致。
-    const cmdName = cmd.label || cmd.text || cmd.name || ''
+    // 这里统一使用 cmdKey，与 commandId 计算规则保持一致。
+    const cmdName = cmdKey(cmd)
     await handleMenuSelect(
       key,
       pluginName,
@@ -446,35 +482,6 @@ export function usePluginCommandActions(options: UsePluginCommandActionsOptions)
     )
   }
 
-  // ============ 匹配指令详情弹窗（集成禁用钩子） ============
-
-  const {
-    selectedMatchCommand,
-    selectedMatchCommandDisabled,
-    openMatchCommandDetail,
-    closeMatchCommandDetail,
-    toggleSelectedMatchCommandDisabled,
-    cmdKey,
-    normalizeCommand,
-    isMatchCommand
-  } = useMatchCommandDetail({
-    getPluginName: () => getPluginName() || '',
-    isDisabled: (detail: SelectedMatchCommand) =>
-      isCommandDisabled(
-        detail.pluginName || getPluginName() || '',
-        detail.feature.code || '',
-        detail.command.label || detail.command.name || '',
-        (detail.command.type || 'text') as CommandCmdType
-      ),
-    toggleDisabled: (detail: SelectedMatchCommand) =>
-      toggleCommandDisabled(
-        detail.pluginName || getPluginName() || '',
-        detail.feature.code || '',
-        detail.command.label || detail.command.name || '',
-        (detail.command.type || 'text') as CommandCmdType
-      )
-  })
-
   // ============ 初始化 ============
 
   /** 并行加载禁用 / 超级面板 / 搜索固定 + canonical commands */
diff --git a/internal-plugins/setting/src/views/AllCommandsSetting/AllCommandsSetting.vue b/internal-plugins/setting/src/views/AllCommandsSetting/AllCommandsSetting.vue
index 6fedf351..5dbc9b22 100644
--- a/internal-plugins/setting/src/views/AllCommandsSetting/AllCommandsSetting.vue
+++ b/internal-plugins/setting/src/views/AllCommandsSetting/AllCommandsSetting.vue
@@ -588,10 +588,9 @@ async function loadCommands(): Promise<void> {
 function selectSource(source: Source): void {
   selectedSource.value = source
   activeTab.value = 'text'
-  // 切换来源后刷新当前插件的指令快照（供打开/固定/别名取 icon 等运行时字段）
-  if (source.path) {
-    void loadPluginCommands()
-  }
+  // 切换来源后刷新指令快照：插件来源加载其 canonical 指令（供打开/固定/别名取 icon 等运行时字段），
+  // 非插件来源（如系统应用）则清空缓存，避免残留上一个插件的数据。
+  void loadPluginCommands()
 }
 
 // 初始化