dsh-plugin 1.0.0 → 1.1.1

package/src/server/services/task-queue.ts

@@ -36,20 +36,25 @@ export interface ActiveTaskInfo {
   status: 'pending' | 'running'
   progress: number
   lines: string[]
+  /** 尝试过的安装方式（npm 反查 + 实际执行命令）：失败时前端 issue 预填需要 */
+  attempts: string[]
 }
 
 /** All non-terminal tasks in queue order (running first, then pending). Lets the client resume a queue after a page reload. */
 export function activeTask(): ActiveTaskInfo[] {
   const found: ActiveTaskInfo[] = []
+  // 展示目标用 displayTarget（owner/repo）：安装 target 可能被服务端切成 npm 包名
+  // （npm 反查命中），队列恢复/待重启展示对用户保持仓库名无感知
+  const show = (task: InstallTask): string => task.displayTarget ?? task.target
   for (const item of queue) {
     const task = item.task
     if (task.status === 'pending') {
-      found.push({ id: task.id, target: task.target, action: task.action, status: 'pending', progress: task.progress, lines: task.lines.slice(0, MAX_TASK_LINES) })
+      found.push({ id: task.id, target: show(task), action: task.action, status: 'pending', progress: task.progress, lines: task.lines.slice(0, MAX_TASK_LINES), attempts: task.attempts })
     }
   }
   tasks.forEach((task) => {
     if (task.status === 'running') {
-      found.unshift({ id: task.id, target: task.target, action: task.action, status: 'running', progress: task.progress, lines: task.lines.slice(0, MAX_TASK_LINES) })
+      found.unshift({ id: task.id, target: show(task), action: task.action, status: 'running', progress: task.progress, lines: task.lines.slice(0, MAX_TASK_LINES), attempts: task.attempts })
     }
   })
   return found
@@ -162,8 +167,10 @@ export function startPluginMutation(options: {
   displayTarget?: string
   /** 运行中 loader：卸载成功后主动移除条目、立即生效（缺失时卸载仍需重启清理） */
   uninstallLoader?: LoaderHandle
+  /** 入队前已尝试的安装方式（npm registry 反查等）：失败提 Issue 时如实展示；实际执行的命令由 spawn 时追加 */
+  attempts?: string[]
 }): InstallTask {
-  const task: InstallTask = { id: nextTaskId, target: options.target, action: options.action, status: 'pending', timedOut: false, exitCode: null, progress: 0, lines: [] }
+  const task: InstallTask = { id: nextTaskId, target: options.target, displayTarget: options.displayTarget, action: options.action, status: 'pending', timedOut: false, exitCode: null, progress: 0, lines: [], attempts: options.attempts ?? [], needsRestart: false }
   nextTaskId = nextTaskId >= Number.MAX_SAFE_INTEGER ? 1 : nextTaskId + 1
   tasks.set(task.id, task)
   if (tasks.size > MAX_TASKS) {
@@ -216,6 +223,12 @@ function spawnMutation(options: {
   const { action, profile, target, timeoutMs = 5 * 60 * 1000, env, task, displayTarget, uninstallLoader } = options
   const invocation = cliInvocation()
   const args = [...invocation.prefixArgs, 'plugin', '--profile', profile, action, target]
+  // 记录实际执行的命令（npm 通道显示包名，git 通道显示 github: 源）：失败提 Issue 时
+  // 「已尝试的安装方式」如实展示完整命令链，作者一眼看清我们跑过什么
+  const executed = `dsh plugin --profile ${profile} ${action} ${target}`
+  if (task && !task.attempts.includes(executed)) {
+    task.attempts.push(executed)
+  }
   return new Promise((resolvePromise) => {
     let stdout = ''
     let stderr = ''
@@ -332,14 +345,19 @@ function spawnMutation(options: {
             if (task.status === 'done') {
               task.progress = 100
               if (action === 'remove' && uninstallLoader) {
-                // 卸载成功 → 主动从运行中 loader 移除该包条目，立即生效、无需重启；
-                // 移除失败（或从未加载过但 loader 不可用）才登记「待重启清理」兜底
+                // 卸载成功 → 主动从运行中 loader 停用该包条目；
+                // 仅当宿主从未加载过它（磁盘已干净）才判「无需重启」；
+                // 只要曾在 loader 中存活（停用过 live entry）就仍要求重启——
+                // 带 UI 的插件（侧边栏面板等宿主启动时渲染的槽位）disable 后不会
+                // 主动消失，重启才能立即摘除面板
                 const removed = await removeLoadedEntry(uninstallLoader, target)
+                task.needsRestart = !removed
                 if (removed) clearPendingRestart(displayTarget ?? target)
                 else addPendingRestart(displayTarget ?? target, 'uninstall')
               } else {
                 // 安装成功（或卸载但无 loader 引用）→ 登记待重启：
                 // 插件要宿主重启才会挂载/卸载干净，重启前一直提醒；展示目标用 displayTarget（owner/repo）
+                task.needsRestart = true
                 addPendingRestart(displayTarget ?? target, action === 'add' ? 'install' : 'uninstall')
               }
             }
@@ -393,12 +411,24 @@ export function verifyInstalledEntry(profile: string, target: string): { name: s
   }
 }
 
+/** 从 pnpm `Ignored build scripts:` 提示行解析被拦截的构建脚本 key（name@version，逗号分隔）。 */
+function ignoredBuildKeys(output: string): string[] {
+  const m = /Ignored build scripts:\s*(.+)/i.exec(output)
+  if (m === null) return []
+  return m[1]
+    .split(',')
+    .map((s) => s.trim())
+    .filter((s) => s !== '')
+}
+
 /**
- * Run a plugin mutation with one recovery path: when `add` fails because a
- * git-hosted package's `prepare` script is blocked by pnpm's allowBuilds
- * gate (`ERR_PNPM_GIT_DEP_PREPARE_NOT_ALLOWED`), read the exact allowlist
- * key pnpm printed, write it into the profile's pnpm-workspace.yaml, and
- * retry once. Other failures fall through to the single-spawn result.
+ * Run a plugin mutation with one recovery path: when `add` fails because
+ * pnpm's allowBuilds gate blocks a build script — either the git-hosted
+ * package's own `prepare` (`ERR_PNPM_GIT_DEP_PREPARE_NOT_ALLOWED`, key from
+ * the printed key@url hint) or a dependency's native build
+ * (`ERR_PNPM_IGNORED_BUILDS`, key = the listed name@version) — write the
+ * exact keys into the profile's pnpm-workspace.yaml and retry once.
+ * Other failures fall through to the single-spawn result.
  */
 export async function runPluginMutation(options: {
   action: 'add' | 'remove'
@@ -415,6 +445,7 @@ export async function runPluginMutation(options: {
   const result = await spawnMutation(options)
   if (options.action === 'add' && result.exitCode !== 0 && !result.timedOut) {
     const output = `${result.stderr}\n${result.stdout}`
+    // git 源：pnpm 打印的 key@url 提示
     if (output.includes('ERR_PNPM_GIT_DEP_PREPARE_NOT_ALLOWED')) {
       const key = parseAllowBuildsKey(output)
       if (key !== null) {
@@ -429,6 +460,22 @@ export async function runPluginMutation(options: {
         return spawnMutation(options)
       }
     }
+    // 依赖原生模块/构建脚本被 pnpm v11 拦截（ERR_PNPM_IGNORED_BUILDS）：git 与 npm 源都会出现。
+    // allowBuilds 的 key 是输出里列出的 name@version（如 node-pty@1.1.0），逐个放行后重试一次；
+    // 输出解析不到时回退用目标名（插件自身构建脚本被拦的 npm 场景）。
+    if (output.includes('ERR_PNPM_IGNORED_BUILDS')) {
+      const keys = ignoredBuildKeys(output)
+      if (keys.length === 0 && !options.target.startsWith('github:')) keys.push(options.target)
+      if (keys.length > 0) {
+        if (options.task) {
+          options.task.status = 'running'
+          options.task.exitCode = null
+          pushLine(options.task, `[allow build] ${keys.join(', ')}`)
+        }
+        for (const key of keys) addAllowBuildsKey(options.profile, key)
+        return spawnMutation(options)
+      }
+    }
   }
   // pnpm 安装本身成功，但目标包入口文件缺失（git 分发缺构建产物）→ 判为失败：
   // 撤销刚登记的待重启，避免用户重启时宿主加载残缺包直接崩溃