dsh-plugin 1.6.9 → 1.6.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin",
-  "version": "1.6.9",
+  "version": "1.6.10",
   "description": "A community plugin marketplace for DeepSeek Harness, built to the official plugin spec — browse, search and install 10000+ human-curated community plugins without leaving the app. · DeepSeek Harness 社区插件市场（遵循官方开发规范）：10000+ 人工精选社区插件，每日更新。",
   "type": "module",
   "main": "lib/index.js",

package/src/client/components/modals/NotificationsModal.tsx

@@ -401,6 +401,12 @@ export function NotificationsModal({ records, tasks, pendingRestarts, t, env, on
                         h('div', { className: styles.failPrepareHint }, t('failTimeoutHint')),
                       ])
                     }
+                    if (kind === 'profileLock') {
+                      // DSH 写 profile 的锁超时（同一 profile 被别的 dsh/安装任务占着）：只给可行动提示，不引导提 Issue
+                      return h('div', null, [
+                        h('div', { className: styles.failPrepareHint }, t('failProfileLockHint')),
+                      ])
+                    }
                     // pnpm allowBuilds 拦截与未知失败：不归到插件作者，改为引导到插件中心仓库排查
                     return h('div', null, [
                       kind === 'pnpmIgnoredBuild'

package/src/client/components/modals/modals.tsx

@@ -522,6 +522,11 @@ export function ErrorModal({ message, repo, kind, command, attempts, t, env, onC
                 // 安装命令超时被强杀（日志里 pnpm 可能已 Done）：可能其实已装成功 —— 给可行动提示，不引导提 Issue
                 h('div', { className: styles.failPrepareHint }, t('failTimeoutHint')),
               ])
+              : failureKind === 'profileLock'
+              ? h('div', null, [
+                // DSH 写 profile 的锁超时（同一 profile 被别的 dsh/安装任务占着）：给可行动提示，不引导提 Issue
+                h('div', { className: styles.failPrepareHint }, t('failProfileLockHint')),
+              ])
               : h('div', null, [
                 // pnpm allowBuilds 拦截与未知失败：不归到插件作者，改为引导到插件中心仓库排查
                 failureKind === 'pnpmIgnoredBuild'

package/src/client/locales.ts

@@ -324,6 +324,7 @@ export const zh = {
   failHubStateHint: '插件列表状态已过期或与本地不一致：该插件可能已经装过了（无需重复安装，要升级请点「更新」），也可能已不在已安装列表中，或已在队列中。这不是插件本身的问题 —— 请刷新页面后重试。',
   // 安装命令超时被强杀：可能其实已装成功（安装器超时后会先核对已安装列表），给可行动提示，不引导提 Issue
   failTimeoutHint: '安装耗时超过本地上限、已被中断 —— 但很可能其实已经装上了（安装器在超时后会先核对本地已安装列表）。请刷新页面确认该插件是否已装上；若确实没装上，可在终端手动执行一次安装命令查看完整输出。这不是插件本身的问题。',
+  failProfileLockHint: 'DSH 在写入插件清单时等不到文件锁、超时中止 —— 通常是同时有另一个 DSH 进程或安装任务在写同一个 profile（也可能是上一次的进程没退干净留下的锁）。请先关掉其他 dsh 窗口或正在跑的命令，再重试一次；若反复出现，重启一次 DSH。这不是插件本身的问题，也不需要重复安装。',
   // prepare 构建脚本实际执行失败（git 分发缺子模块/构建产物）：插件打包分发问题，应提 Issue
   failPrepareHint: '该插件安装时的构建脚本执行失败（git 分发常缺失子模块或构建产物），属插件打包分发问题。请向作者仓库提交 Issue 反馈。',
   // 「插件打包问题」分支的次要入口：该判据由插件中心自己的预检/装后校验产出（不是 pnpm 原文），
@@ -734,6 +735,7 @@ export const en = {
   failHubStateHint: 'The plugin list is out of date or out of sync: this plugin may already be installed (no need to reinstall — use "Update" to upgrade), or may no longer be in the installed list, or may already be queued. This is not a plugin problem — refresh the page and retry.',
   // The install command hit the local time limit and was killed: it may well have installed successfully (the installer re-checks the installed list after a timeout) — actionable hint, no issue prompt
   failTimeoutHint: 'The install exceeded the local time limit and was interrupted — but it may well have completed already (the installer re-checks your installed list after a timeout). Refresh the page to see whether the plugin is installed; if it is not, run the install command in a terminal to see the full output. This is not a plugin problem.',
+  failProfileLockHint: 'DSH timed out waiting for the file lock while writing the plugin list — usually because another DSH process or install task is writing the same profile (sometimes a previous run left the lock behind). Close other dsh windows or running commands, then retry; if it keeps happening, restart DSH once. This is not a plugin problem, and the plugin does not need to be reinstalled.',
   // prepare script actually failed (git tarball misses submodules/build output): a packaging issue of the plugin itself — file an issue
   failPrepareHint: 'This plugin failed while running its build scripts during install (git tarballs often miss submodules or build output). This is a packaging issue of the plugin itself — please report it to the author repository.',
   // Secondary entry on the "plugin packaging" branch: that verdict comes from the hub's own

package/src/client/logic/failures.ts

@@ -151,7 +151,7 @@ export function removeNotification(id: number): NotificationRecord[] {
   return next
 }
 
-export type FailureKind = 'npmTooOld' | 'dshMissing' | 'gitMissing' | 'pnpmMissing' | 'npmMissing' | 'pnpmStore' | 'pnpmWorkspace' | 'originRejected' | 'pnpmPolicy' | 'pnpmUnusedPatch' | 'pnpmMissingDep' | 'registryVersionStale' | 'pnpmLinkedDirMissing' | 'fileLocked' | 'accessDenied' | 'fsUnavailable' | 'pnpmIgnoredBuild' | 'pluginPrepare' | 'network' | 'hubState' | 'timeout' | 'hub'
+export type FailureKind = 'npmTooOld' | 'dshMissing' | 'gitMissing' | 'pnpmMissing' | 'npmMissing' | 'pnpmStore' | 'pnpmWorkspace' | 'originRejected' | 'pnpmPolicy' | 'pnpmUnusedPatch' | 'pnpmMissingDep' | 'registryVersionStale' | 'pnpmLinkedDirMissing' | 'fileLocked' | 'accessDenied' | 'fsUnavailable' | 'pnpmIgnoredBuild' | 'pluginPrepare' | 'network' | 'hubState' | 'timeout' | 'profileLock' | 'hub'
 
 /** Match the pnpm error code, not a generic mention of checksum or integrity. */
 function missingTarballIntegrity(message: string): boolean {
@@ -248,6 +248,10 @@ export function classifyFailure(message: string): FailureKind {
   // 「其实已经装上了」——摆放位置在一切错误码分支之后，日志里真有 pnpm 报错时仍以真实报错为准。
   // 单独归类，给「刷新确认是否已安装」这类可行动提示，不引导提 Issue。
   if (/^\[timed out\]$/m.test(message)) return 'timeout'
+  // DSH 自身的 profile 写锁超时（atomic-write 等不到 package.json.lock）：同一 profile 上还有另一个
+  // dsh 进程或安装任务在写，锁一直没释放。既不是插件问题、也不是用户环境坏了 —— 把并发收掉重试即可。
+  // 摆放位置同样在一切错误码分支之后：日志里真有 pnpm 报错时仍以真实报错为准。
+  if (/atomic-write: timed out waiting for the writer lock|timed out waiting for the writer lock/i.test(message)) return 'profileLock'
   // 其余未知失败：引导到插件中心仓库排查
   return 'hub'
 }

package/src/client/logic/urls.ts

@@ -65,6 +65,7 @@ function reasonTitleOf(kind: FailureKind): string {
     case 'network': return 'network failure on the user side'
     case 'hubState': return 'stale install state in the plugin hub'
     case 'timeout': return 'install timed out'
+    case 'profileLock': return 'DSH profile is locked by another process'
     case 'hub': return 'install failed (cause unclassified)'
     default: return 'plugin install failed'
   }