@noob-stupid/dsh-plugin-console 0.3.12 → 0.3.13

package/lib/index.js

@@ -3498,6 +3498,59 @@ async function handle(ctx, req, res) {
         `  if ($code -ne 0) { Log ('（停服后）npmmirror 安装失败（exit=' + $code + '），切换 registry.npmjs.org 重试一次'); $code = Install-Framework 'https://registry.npmjs.org' }`,
         `}`,
         `if ($code -ne 0) { Invoke-Rollback } else { Log '框架本体升级完成' }`,
+        // 重新链接框架配套包（事故教训）：pnpm 升级到新版本时 .pnpm 目录重建，
+        // 但顶层 node_modules/@deepseek-ai/* 不会自动切换，仍指向旧版（如 0.1.0-rc.7）——
+        // 导致框架混版本（如 dsh-llm-deepseek 旧版无 vision 模型）、部分功能异常。
+        // 升级成功后：遍历顶层 @deepseek-ai 的 dsh-* 包，读 .pnpm 主目录里的最新版本，
+        // 若与顶层不一致则重建为 Junction（旧版备份 .bak-rc7）。
+        `$relinked = 0`,
+        `function Relink-FrameworkPackages($version) {`,
+        `  # dshDir = .../node_modules/@deepseek-ai/dsh → nodeModules = .../node_modules`,
+        `  $nodeModules = ${ps(dirname(dirname(dshDir)))}`,
+        `  $pnpm = Join-Path $nodeModules '.pnpm'`,
+        `  if (-not (Test-Path $pnpm)) { Log ('重链跳过：.pnpm 目录不存在'); return }`,
+        `  $topPkgs = Get-ChildItem -Path (Join-Path $nodeModules '@deepseek-ai') -Directory | Where-Object { $_.Name -like 'dsh-*' }`,
+        `  # 版本数值比较（修复：字符串比较在版本号位数变化时出错，如 0.1.10 < 0.1.9；PS5.1 兼容，不用三元运算符）`,
+        `  function Compare-Version($a, $b) {`,
+        `    if ($a -eq $b) { return 0 }`,
+        `    $pa = [regex]::Match($a, '^(\d+)\.(\d+)\.(\d+)(?:-(?:[a-z]+\.)?(\d+))?' )`,
+        `    $pb = [regex]::Match($b, '^(\d+)\.(\d+)\.(\d+)(?:-(?:[a-z]+\.)?(\d+))?' )`,
+        `    if (-not $pa.Success -or -not $pb.Success) { return ($a.CompareTo($b)) }`,
+        `    for ($i = 1; $i -le 4; $i++) {`,
+        `      if ($pa.Groups[$i].Success) { $va = [int]$pa.Groups[$i].Value } else { $va = 2147483647 }`,
+        `      if ($pb.Groups[$i].Success) { $vb = [int]$pb.Groups[$i].Value } else { $vb = 2147483647 }`,
+        `      if ($va -ne $vb) { if ($va -lt $vb) { return -1 } else { return 1 } }`,
+        `    }`,
+        `    return 0`,
+        `  }`,
+        `  foreach ($top in $topPkgs) {`,
+        `    $name = $top.Name`,
+        `    $topPkgJson = Join-Path $top.FullName 'package.json'`,
+        `    if (-not (Test-Path $topPkgJson)) { continue }`,
+        `    try { $topVer = (Get-Content $topPkgJson -Raw | ConvertFrom-Json).version } catch { continue }`,
+        `    # 找 .pnpm 里该包的所有主目录（@deepseek-ai+dsh-<name>@<ver>_<hash> 或 @deepseek-ai+dsh-<name>@<ver>-rc.x_<hash>）`,
+        `    $cands = Get-ChildItem -Path $pnpm -Directory -ErrorAction SilentlyContinue | Where-Object { $_.Name -match ('^@deepseek-ai\\\\+dsh-' + [regex]::Escape($name.Substring(4)) + '@') }`,
+        `    $best = $nil; $bestVer = ''`,
+        `    foreach ($c in $cands) {`,
+        `      $inner = Join-Path $c.FullName ('node_modules\\@deepseek-ai\\' + $name)`,
+        `      $pj = Join-Path $inner 'package.json'`,
+        `      if (-not (Test-Path $pj)) { continue }`,
+        `      try { $v = (Get-Content $pj -Raw | ConvertFrom-Json).version } catch { continue }`,
+        `      if ($best -eq $nil -or (Compare-Version $v $bestVer) -gt 0) { $bestVer = $v; $best = $inner }`,
+        `    }`,
+        `    if ($best -eq $nil) { continue }`,
+        `    if ($bestVer -eq $topVer) { continue }`,
+        `    try {`,
+        `      $bak = $top.FullName + '.bak-' + $topVer`,
+        `      if (Test-Path $bak) { Remove-Item $bak -Recurse -Force -ErrorAction SilentlyContinue }`,
+        `      Rename-Item -LiteralPath $top.FullName -NewName ($name + '.bak-' + $topVer) -Force`,
+        `      cmd /c mklink /J "${top.FullName}" "${best}" 2>$null | Out-Null`,
+        `      if (Test-Path (Join-Path $top.FullName 'package.json')) { $script:relinked++; Log ('重链 ' + $name + ': ' + $topVer + ' -> ' + $bestVer) } else { Log ('重链失败：' + $name) }`,
+        `    } catch { Log ('重链异常：' + $name + ' ' + $_.Exception.Message) }`,
+        `  }`,
+        `}`,
+        `Relink-FrameworkPackages '${target}'`,
+        `Log ('重链框架配套包完成（' + $script:relinked + ' 个）')`,
         pkgArgs.length > 0 ? `SetState 'pkg' '更新官方配套包…'\n  Log '更新官方配套包…'\n  Set-Location -Path ${ps(profileDir2)}\n  if (Test-Path ${ps(corepackJs)}) {\n    $pp = Start-Process -FilePath ${ps(nodePath)} -ArgumentList @(${ps(corepackJs)}, 'pnpm', 'update', ${pkgArgs.join(', ')}, '--no-optional', '--registry', 'https://registry.npmmirror.com') -PassThru -WindowStyle Hidden\n    if (-not $pp.WaitForExit(300000)) { Stop-Process -Id $pp.Id -Force -ErrorAction SilentlyContinue; Log '官方配套包更新超时（5 分钟），已跳过' } else { try { Log ('官方配套包更新结束（exit=' + $pp.ExitCode + '）') } catch { Log '官方配套包更新结束（退出码读取失败）' } }\n  }` : '',
         "SetState 'relaunching' '升级完成，重启 DSH 服务生效…'",
         "Log '重启 DSH 服务生效…'",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name":  "@noob-stupid/dsh-plugin-console",
-    "version":  "0.3.12",
+    "version":  "0.3.13",
     "description":  "DSH plugin management panel \u0026 marketplace: one-click enable/disable, multi-source market (GitHub/Gitee/custom), static-index market (500+ plugins / 300 skills), skills, suites, and one-click framework upgrade.",
     "repository":  {
                        "type":  "git",