mdk-skills 2.3.26 → 2.3.28

package/scripts/web-ui/src/views/SceneSwitch.vue

@@ -70,6 +70,25 @@
                 <n-tag v-if="profile.id === activeId" type="success" size="small">
                   当前场景
                 </n-tag>
+                <n-popover
+                  v-if="failedProfiles[profile.id]"
+                  trigger="hover"
+                  placement="top"
+                >
+                  <template #trigger>
+                    <n-tag type="warning" size="small" style="cursor:pointer">
+                      ⚠ 未就绪
+                    </n-tag>
+                  </template>
+                  <div style="font-size:13px">
+                    <div v-if="failedProfiles[profile.id]?.failedDelete?.length">
+                      删除失败：{{ failedProfiles[profile.id].failedDelete.length }} 个
+                    </div>
+                    <div v-if="failedProfiles[profile.id]?.failedInstall?.length">
+                      安装失败：{{ failedProfiles[profile.id].failedInstall.length }} 个
+                    </div>
+                  </div>
+                </n-popover>
                 <n-popover
                   v-if="profile.skills !== null"
                   trigger="hover"
@@ -121,12 +140,13 @@
     <!-- 切换确认弹窗 -->
     <ModalComp
       :show="showApplyConfirm"
-      title="确认切换场景"
+      :title="applyState === 'executing' ? '正在切换场景' : applyState === 'failed' ? '切换未完成' : '确认切换场景'"
       width="540px"
       :mask-closable="false"
-      @update:show="(v) => { if (!v) showApplyConfirm = false }"
+      @update:show="(v) => { if (!v && applyState !== 'executing') showApplyConfirm = false }"
     >
-      <div v-if="targetProfile" class="diff-preview">
+      <!-- 状态：diff 预览 -->
+      <div v-if="applyState === 'preview' && targetProfile" class="diff-preview">
         <p class="diff-hint">
           从 <strong>{{ currentProfileName }}</strong> 切换到
           <strong>{{ targetProfile.name }}</strong>
@@ -182,11 +202,71 @@
           </div>
         </div>
       </div>
+
+      <!-- 状态：执行中 -->
+      <div v-if="applyState === 'executing'" class="executing-state">
+        <div class="executing-spinner">
+          <n-spin size="large" />
+        </div>
+        <p class="executing-text">正在切换到「{{ targetProfile?.name }}」...</p>
+        <p class="executing-hint">处理中，请稍候</p>
+      </div>
+
+      <!-- 状态：失败详情 -->
+      <div v-if="applyState === 'failed'" class="diff-preview">
+        <p class="diff-hint">
+          切换到 <strong>{{ targetProfile?.name }}</strong> 时部分技能未能处理
+        </p>
+        <div v-if="failedDelete.length > 0" class="failure-section">
+          <div class="failure-title removal-failure">
+            <n-icon size="16" color="#d03050"><TrashOutline /></n-icon>
+            <span>删除失败（被程序占用）</span>
+          </div>
+          <div class="failure-list">
+            <div v-for="name in failedDelete" :key="'del-'+name" class="failure-item">
+              <span class="failure-name">{{ name }}</span>
+              <n-button size="tiny" secondary type="warning" @click="retrySingle('delete', name)">
+                重试
+              </n-button>
+            </div>
+          </div>
+        </div>
+        <div v-if="failedInstall.length > 0" class="failure-section">
+          <div class="failure-title install-failure">
+            <n-icon size="16" color="#d03050"><AddOutline /></n-icon>
+            <span>安装失败</span>
+          </div>
+          <div class="failure-list">
+            <div v-for="name in failedInstall" :key="'inst-'+name" class="failure-item">
+              <span class="failure-name">{{ name }}</span>
+              <n-button size="tiny" secondary type="warning" @click="retrySingle('install', name)">
+                重试
+              </n-button>
+            </div>
+          </div>
+        </div>
+        <p class="failure-tip">请关闭相关程序后重试，或打开技能目录手动处理</p>
+      </div>
+
       <template #footer>
-        <n-button @click="showApplyConfirm = false">取消</n-button>
-        <n-button type="primary" :loading="confirmLoading" @click="onConfirmApply">
-          确认切换
-        </n-button>
+        <template v-if="applyState === 'preview'">
+          <n-button @click="showApplyConfirm = false">取消</n-button>
+          <n-button type="primary" :loading="confirmLoading" @click="onConfirmApply">
+            确认切换
+          </n-button>
+        </template>
+        <template v-if="applyState === 'failed'">
+          <n-button size="small" @click="openSkillsDestFolder">📂 打开技能目录</n-button>
+          <n-button size="small" @click="onAbandon">放弃</n-button>
+          <n-button
+            size="small"
+            type="primary"
+            :loading="confirmLoading"
+            @click="retryAll"
+          >
+            重试所有失败项
+          </n-button>
+        </template>
       </template>
     </ModalComp>
 
@@ -382,6 +462,9 @@ import {
   deleteProfile,
   installSkills,
   getSkillsReadme,
+  retryDelete,
+  retryInstall,
+  openSkillsDest,
 } from "../api/skills";
 import { recordUsage } from "../utils/usage";
 
@@ -428,6 +511,12 @@ const showApplyConfirm = ref(false);
 const confirmLoading = ref(false);
 const targetProfile = ref(null);
 const diffResult = ref({ added: [], removed: [], kept: [] });
+// 弹窗状态：preview → executing → failed
+const applyState = ref("preview");
+const failedDelete = ref([]);
+const failedInstall = ref([]);
+// 卡片角标：记录每个场景的失败历史
+const failedProfiles = ref({});
 const currentProfileName = computed(() => {
   if (!activeId.value) return "无";
   const p = profiles.value.find((p) => p.id === activeId.value);
@@ -603,7 +692,11 @@ async function onApplyCustom() {
   try {
     const res = await installSkills(customSelected.value);
     if (res.ok) {
-      message.success(`已安装 ${customSelected.value.length} 个技能`);
+      if (res.locked?.length) {
+        message.warning(`已安装 ${customSelected.value.length - res.locked.length} 个技能，${res.locked.length} 个被占用`);
+      } else {
+        message.success(`已安装 ${customSelected.value.length} 个技能`);
+      }
       activeId.value = "custom";
       showCustom.value = false;
       customSelected.value.forEach(recordUsage);
@@ -677,32 +770,130 @@ function calcDiff(profile) {
 function onApply(profile) {
   targetProfile.value = profile;
   diffResult.value = calcDiff(profile);
+  failedDelete.value = [];
+  failedInstall.value = [];
+  applyState.value = "preview";
   showApplyConfirm.value = true;
 }
 
 async function onConfirmApply() {
   if (!targetProfile.value) return;
+  applyState.value = "executing";
   confirmLoading.value = true;
   applying.value = targetProfile.value.id;
   try {
     const res = await applyProfile(targetProfile.value.id);
     if (res.ok) {
       activeId.value = targetProfile.value.id;
-      message.success(`已切换到「${targetProfile.value.name}」`);
+      failedDelete.value = res.failedDelete || [];
+      failedInstall.value = res.failedInstall || [];
+      const hasFailed = failedDelete.value.length > 0 || failedInstall.value.length > 0;
+
+      if (hasFailed) {
+        applyState.value = "failed";
+        // 记录失败信息到卡片角标
+        failedProfiles.value = {
+          ...failedProfiles.value,
+          [targetProfile.value.id]: {
+            failedDelete: [...failedDelete.value],
+            failedInstall: [...failedInstall.value],
+          },
+        };
+      } else {
+        // 全部成功，清理该场景的失败记录
+        const newFailed = { ...failedProfiles.value };
+        delete newFailed[targetProfile.value.id];
+        failedProfiles.value = newFailed;
+        message.success(`已切换到「${targetProfile.value.name}」`);
+        showApplyConfirm.value = false;
+      }
       (targetProfile.value.skills || []).forEach(recordUsage);
-      showApplyConfirm.value = false;
       emit("refresh");
-      // 刷新技能状态，确保下次差异计算基于最新数据
       allSkills.value = await getSkills();
     }
   } catch {
     message.error("切换失败");
+    applyState.value = "preview";
   } finally {
     confirmLoading.value = false;
     applying.value = null;
   }
 }
 
+// 单技能重试
+async function retrySingle(type, name) {
+  const fn = type === "delete" ? retryDelete : retryInstall;
+  const label = type === "delete" ? "删除" : "安装";
+  try {
+    const res = await fn(name);
+    if (res.ok) {
+      message.success(`技能 "${name}" ${label}成功`);
+      if (type === "delete") {
+        failedDelete.value = failedDelete.value.filter((n) => n !== name);
+      } else {
+        failedInstall.value = failedInstall.value.filter((n) => n !== name);
+      }
+      // 更新角标
+      const pid = targetProfile.value?.id;
+      if (pid) {
+        const updated = { ...failedProfiles.value };
+        if (updated[pid]) {
+          updated[pid] = {
+            failedDelete: [...failedDelete.value],
+            failedInstall: [...failedInstall.value],
+          };
+          if (updated[pid].failedDelete.length === 0 && updated[pid].failedInstall.length === 0) {
+            delete updated[pid];
+          }
+          failedProfiles.value = updated;
+        }
+      }
+      // 如果所有失败都解决了，自动关闭弹窗
+      if (failedDelete.value.length === 0 && failedInstall.value.length === 0) {
+        message.success(`已切换到「${targetProfile.value?.name}」`);
+        showApplyConfirm.value = false;
+      }
+    } else if (res.locked) {
+      message.warning(`技能 "${name}" 仍被占用，请关闭相关程序后重试`);
+    } else {
+      message.error(res.error || `${label}失败`);
+    }
+  } catch {
+    message.error(`${label}失败`);
+  }
+}
+
+// 重试所有失败项
+async function retryAll() {
+  // 先重试所有安装失败，再重试所有删除失败
+  for (const name of [...failedInstall.value]) {
+    await retrySingle("install", name);
+    if (showApplyConfirm.value === false) return; // 弹窗已关闭
+  }
+  for (const name of [...failedDelete.value]) {
+    await retrySingle("delete", name);
+    if (showApplyConfirm.value === false) return;
+  }
+}
+
+// 放弃切换
+function onAbandon() {
+  showApplyConfirm.value = false;
+  const pid = targetProfile.value?.id;
+  if (pid && (failedDelete.value.length > 0 || failedInstall.value.length > 0)) {
+    message.warning(
+      `部分技能未就绪：` +
+      (failedDelete.value.length ? `删除失败 ${failedDelete.value.length} 个、` : "") +
+      (failedInstall.value.length ? `安装失败 ${failedInstall.value.length} 个` : "").replace(/、$/, "")
+    );
+  }
+}
+
+// 打开项目技能目录
+function openSkillsDestFolder() {
+  openSkillsDest().catch(() => message.error("打开目录失败"));
+}
+
 onMounted(() => {
   loadData();
   loadSkillsReadme();
@@ -877,6 +1068,62 @@ onMounted(() => {
 .search-input {
   margin-bottom: 8px;
 }
+
+/* 执行中状态 */
+.executing-state {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding: 32px 0;
+  gap: 12px;
+}
+.executing-text {
+  margin: 0;
+  font-size: 15px;
+  font-weight: 600;
+}
+.executing-hint {
+  margin: 0;
+  font-size: 13px;
+  color: #999;
+}
+
+/* 失败区域 */
+.failure-section {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  margin-top: 4px;
+}
+.failure-title {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  font-size: 13px;
+  font-weight: 600;
+}
+.failure-list {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+}
+.failure-item {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 4px 8px;
+  background: #fff1f0;
+  border-radius: 4px;
+  font-size: 13px;
+}
+.failure-name {
+  font-weight: 500;
+}
+.failure-tip {
+  margin: 4px 0 0;
+  font-size: 12px;
+  color: #999;
+}
 </style>
 
 <style>
@@ -910,4 +1157,13 @@ onMounted(() => {
   background: #8a6d00;
   color: #fff;
 }
+[data-theme="dark"] .failure-item {
+  background: rgba(208, 48, 80, 0.15);
+}
+[data-theme="dark"] .executing-hint {
+  color: #6c7086;
+}
+[data-theme="dark"] .failure-tip {
+  color: #6c7086;
+}
 </style>