@noob-stupid/dsh-plugin-console 0.5.94 → 0.5.97

package/lib/server/routes/compat.js

@@ -39,6 +39,17 @@ import { preflightRoots } from './framework-preflight.js'
 
 const PREFLIGHT_TIMEOUT_ENV = 'DSH_AUTO_PREFLIGHT_TIMEOUT_MS'
 /** 自动预检的预算：到点降级成「未完成，可手动重跑」，状态查询照常返回（env 可调）。 */
+/**
+ * 安全启动的命令行兜底：拼成**可直接复制运行**的绝对路径命令。
+ * 现场问题（2026-10-29）：原先给的是相对路径 `node scripts/safe-boot.mjs --list`，
+ * 只有先 cd 到插件安装目录才成立 —— 而那是 node_modules 里的深层哈希目录，
+ * 服务起不来、界面打不开的时候，用户根本无从找到它。救火命令必须是能直接粘的。
+ */
+function safeBootCommand(args = []) {
+  const script = join(pluginRoot(), 'scripts', 'safe-boot.mjs')
+  return ['node', JSON.stringify(script), ...args].join(' ')
+}
+
 function preflightTimeoutMs() {
   const raw = Number(process.env[PREFLIGHT_TIMEOUT_ENV])
   return Number.isFinite(raw) && raw > 0 ? raw : DEFAULT_TIMEOUT_MS
@@ -218,7 +229,7 @@ function autoDisableNotice(entry = lastAutoDisable, { enabled = null } = {}) {
   if (entry === null || entry === undefined) return null
   if (on !== true && entry.code === 'auto-disabled') return null
   const added = Array.isArray(entry.disabled) ? entry.disabled : []
-  const restore = 'node scripts/safe-boot.mjs --restore-last-good'
+  const restore = safeBootCommand(['--restore-last-good'])
   if (added.length > 0) {
     return {
       at: entry.at ?? null,
@@ -318,7 +329,7 @@ async function routeCompatStatusGet(req, res, rc) {
       onEvidence: readCompatGate().autoDisableOnEvidence === true,
       switch: { file: 'compat-gate.json', key: 'autoDisableOnEvidence', route: '/plugin-console/compat-ack', body: { autoDisableOnEvidence: false } },
       notice: autoDisableNotice(),
-      restore: { route: { path: '/plugin-console/safe-boot', body: { action: 'restore-last-good' } }, command: 'node scripts/safe-boot.mjs --restore-last-good' },
+      restore: { route: { path: '/plugin-console/safe-boot', body: { action: 'restore-last-good' } }, command: safeBootCommand(['--restore-last-good']) },
       logHint: '记录落在 dshHome()/plugin-console/auto-disable.log（追加式 JSONL）',
     },
     // D2 加法字段：安全启动材料（last-known-good 快照 + 恢复入口提示）
@@ -326,7 +337,7 @@ async function routeCompatStatusGet(req, res, rc) {
       snapshot: { written: snapshot.written === true, reason: snapshot.reason ?? null, id: snapshot.snapshot?.id ?? null, at: snapshot.snapshot?.at ?? null, sha256: snapshot.snapshot?.patchSha256 ?? null },
       snapshots: listSnapshots().slice(0, 5),
       lastGoodId: readSafeBootState().lastGoodId,
-      command: { list: 'node scripts/safe-boot.mjs --list', restore: 'node scripts/safe-boot.mjs --restore-last-good', disable: 'node scripts/safe-boot.mjs --disable-suspects' },
+      command: { list: safeBootCommand(['--list']), restore: safeBootCommand(['--restore-last-good']), disable: safeBootCommand(['--disable-suspects']) },
       route: { action: 'restore-last-good | disable-suspects | list | mark-good', path: '/plugin-console/safe-boot' },
     },
   })

package/lib/server/routes/framework-upgrade.js

@@ -11,7 +11,9 @@ import { pathToFileURL } from 'node:url'
 import { createRequire } from 'node:module'
 import { readCompatMode, writeCompatMode } from '../domain/compat-state.js'
 import { FRAMEWORK_BACKUP_ROOT, backupProfileSnapshot, checkpointFrameworkTree, platformUpgradeRefusal, preflightDisableIncompatible, relaunchPrelude, resolveDshBin, resolveFrameworkRootNodeModules, resolveFrameworkUpgradePlan, shellHostedRefusal } from '../domain/framework.js'
+import { relaunchLauncherSource, relaunchVerdictBlock, relaunchVerdictHelperSource } from '../domain/framework-relaunch.js'
 import { fwIntegrityCheck } from '../infra/fw-integrity-check.js'
+import { repairStaleRenameResidue } from '../domain/framework-stale-repair.js'
 import { CORE_PATCH_ROW_IDS } from '../domain/patch.js'
 import { migrateAgentConfigsForUpgrade } from '../domain/presets.js'
 import { planQuarantine } from '../domain/quarantine.js'
@@ -191,6 +193,7 @@ async function routeFrameworkUpgrade(req, res, rc) {
         sendError(res, 500, `无法定位框架安装根（期望含 .pnpm 与 @deepseek-ai/dsh 的顶层 node_modules，实际：${fwRoot ?? '未找到'}）——已取消升级，请修复框架安装后重试`)
         return
       }
+    steps.push(...repairStaleRenameResidue({ fwRoot }).steps) // 修上次失败的 .stale-* 改名残留（只 rename / 跳过已存在 / 幂等）
       // 框架全树 checkpoint（可靠回滚点）：升级前镜像全部 @deepseek-ai 版本包（自包内容）+ 顶层 scope + lock
       let fwCheckpoint = null
       try {
@@ -213,6 +216,7 @@ async function routeFrameworkUpgrade(req, res, rc) {
       const qHelperPath = join(dshHome(), 'plugin-console', 'fw-analyze-boot.mjs')
       const qCandidatesPath = join(dshHome(), 'plugin-console', 'fw-quarantine-candidates.json')
       const qRecordPath = join(dshHome(), 'plugin-console', 'fw-quarantine.json')
+      const rvHelperPath = join(dshHome(), 'plugin-console', 'fw-relaunch-verdict.mjs'), rlPath = join(dshHome(), 'plugin-console', 'fw-launch.mjs') // 判定器转发脚本 + node 服务拉起器（逻辑都在 domain/framework-relaunch.js）
       let thirdPartyRows = []
       try {
         thirdPartyRows = listEntries(ctx)
@@ -236,6 +240,7 @@ async function routeFrameworkUpgrade(req, res, rc) {
           '',
         ].join('\n')
         writeFileSync(qHelperPath, helperSource, 'utf8')
+        const rUrl = pathToFileURL(join(pluginRoot(), 'lib', 'server', 'domain', 'framework-relaunch.js')).href; writeFileSync(rvHelperPath, relaunchVerdictHelperSource({ libUrl: rUrl }), 'utf8'); writeFileSync(rlPath, relaunchLauncherSource(), 'utf8') // 判定器转发脚本 + node 拉起器（逻辑仍在插件内）
         const candidateSnapshot = listEntries(ctx)
           .filter((e) => typeof e.rowId === 'string' && e.rowId !== '')
           .map((e) => ({ rowId: e.rowId, moduleName: e.moduleName, toggleable: e.toggleable === true, enabled: e.enabled === true }))
@@ -252,8 +257,10 @@ async function routeFrameworkUpgrade(req, res, rc) {
         return j.replace(/`/gu, '``').replace(/\$/gu, '`$')
       }
       const patchFilePath = join(profileDir, 'cordis.patch.yml')
-      // 拉起服务的 PowerShell 片段（隔离重试用；与升级/回滚路径共用 relaunchPrelude 里的同一份实现）
-      const launchSnippet = (tag) => `if (-not $ok -and -not $started) { if (Invoke-DshRelaunch '${tag}') { $started = $true } }; Beat`
+      // 拉起片段（隔离重试用；与升级/回滚共用 relaunchPrelude 里的同一份实现）。
+      // 2026-10-28：成功只认端口监听 → Note-Relaunch 置位后**立刻**收尾（以前只记"别再拉起"，
+      // 循环又空转约 95 秒，最后把已起来的服务判死并回滚 —— 缺陷 ②）。
+      const launchSnippet = (tag) => `if (-not $ok -and -not $started) { $started = Note-Relaunch (Invoke-DshRelaunch '${tag}'); if ($script:relaunchListening) { $ok = $true; break } }; Beat`
       const lines = [
         `$state = ${ps(stateFile)}`,
         `$log = ${ps(logFile)}`,
@@ -265,7 +272,7 @@ async function routeFrameworkUpgrade(req, res, rc) {
         "  try { if ($s -eq 'failed') { Set-Content -Path $state -Value ($s + '|' + $m + '|stage=' + [string]$script:stage) -Encoding UTF8; return } } catch {}",
         "  try { if ($s -ne 'done' -and $s -ne 'idle') { $script:stage = $s }; Set-Content -Path $state -Value ($s + '|' + $m) -Encoding UTF8; Beat } catch {}",
         "}",
-        relaunchPrelude({ nodePath, pluginDir: pluginRoot(), fwRoot, target, ps }),
+        relaunchPrelude({ nodePath, pluginDir: pluginRoot(), fwRoot, target, ps, port }),
         // 全局异常兜底（事故教训）：脚本任何未捕获异常都会无声死亡、状态永远卡住、服务没人拉起。
         // trap 捕获后：写 failed 状态 + 日志 + 尝试拉起服务 + 自删任务 + 退出
         "trap {",
@@ -392,7 +399,7 @@ async function routeFrameworkUpgrade(req, res, rc) {
         `    SetState 'failed' ('回滚过程异常，框架可能处于混合状态：' + $_.Exception.Message)`,
         `  }`,
         `}`,
-        `$script:rolledBack = $false`,
+        `$script:rolledBack = $false; $script:structureOk = $false; $script:topLevelOk = $false; $script:keptReady = $false; $script:relaunchListening = $false`,
         `$code = Install-Framework 'https://registry.npmmirror.com'`,
         `if ($code -ne 0) { Log ('npmmirror 安装失败（exit=' + $code + '），切换 registry.npmjs.org 重试一次'); $code = Install-Framework 'https://registry.npmjs.org' }`,
         `if ($code -ne 0) {`,
@@ -421,9 +428,9 @@ async function routeFrameworkUpgrade(req, res, rc) {
         `      if ($code -ne 0) { $code = Install-Framework 'https://registry.npmjs.org' }`,
         `      $vv = ''`,
         `      try { $vv = (Get-Content (Join-Path $visible 'package.json') -Raw | ConvertFrom-Json).version } catch {}`,
-        `      if ($vv -eq '${target}') { Log '顶层可见版本已修正为 ${target}' } else { Log ('顶层可见版本仍为 ' + $vv + '（拉起不受影响：Node 按链接真实路径解析依赖）') }`,
+        `      if ($vv -eq '${target}') { $script:topLevelOk = $true; Log '顶层可见版本已修正为 ${target}' } else { Log ('顶层可见版本仍为 ' + $vv + '（拉起不受影响：Node 按链接真实路径解析依赖）') }`,
         `    } else { Log ('顶层可见版本异常（' + $vv + '）且非实体目录，跳过改名（LinkType=' + $item.LinkType + '）') }`,
-        `  } else { Log '顶层可见版本校验通过' }`,
+        `  } else { $script:topLevelOk = $true; Log '顶层可见版本校验通过' }`,
         `}`,
         // 回滚后跳过重链/依赖修复/版本对齐（它们按新树预期运行，会对已恢复的旧树造成二次破坏）
         `if (-not $script:rolledBack) {`,
@@ -564,7 +571,7 @@ async function routeFrameworkUpgrade(req, res, rc) {
         '$started = $false',
         `for ($i = 0; $i -lt 20; $i++) {`,
         `  try { $c = Get-NetTCPConnection -LocalPort ${port} -State Listen -ErrorAction SilentlyContinue; if ($c.Count -gt 0) { $ok = $true; break } } catch {}`,
-        `  if (-not $ok -and -not $started) { if (Invoke-DshRelaunch '升级后') { $started = $true } }; Beat`,
+        `  if (-not $ok -and -not $started) { $started = Note-Relaunch (Invoke-DshRelaunch '升级后'); if ($script:relaunchListening) { $ok = $true; break } }; Beat`,
         '  Start-Sleep -Seconds 5',
         '}',
         // ── 启动失败隔离（用户硬要求）：新框架起不来时先隔离肇事者再重试，不直接回滚 ──
@@ -620,19 +627,13 @@ async function routeFrameworkUpgrade(req, res, rc) {
         `    Log ('第 ' + $q + ' 轮隔离后仍失败')`,
         `  }`,
         `}`,
-        // 隔离也救不回才回滚（2026-09-04 教训：自动全树回滚并再拉起一次）
+        // 隔离也救不回：**先判定该怎么办**（2026-10-28 用户定案：自动回滚只留给"框架树确认损坏"，
+        // 其余一律 ready + 手动命令，回滚交人工）。判定 = domain/framework-relaunch.js#judgeRelaunchFailure。
         `if (-not $ok -and -not $script:rolledBack) {`,
-        `  Log '服务拉起失败，尝试自动回滚到升级前版本…'`,
-        `  Invoke-Rollback`,
-        `  $ok = $false`,
-        `  $started = $false`,
-        `  for ($i = 0; $i -lt 20; $i++) {`,
-        `    try { $c = Get-NetTCPConnection -LocalPort ${port} -State Listen -ErrorAction SilentlyContinue; if ($c.Count -gt 0) { $ok = $true; break } } catch {}`,
-        `    if (-not $ok -and -not $started) { if (Invoke-DshRelaunch '回滚后') { $started = $true } }; Beat`,
-        `    Start-Sleep -Seconds 5`,
-        `  }`,
+        relaunchVerdictBlock({ ps, nodePath, helperPath: rvHelperPath, port }),
         `}`,
-        `if ($ok) { if ($script:rolledBack) { SetState 'failed' '升级失败，已自动回滚到升级前版本（服务已恢复）' ; Log '升级失败已自动回滚，服务已恢复' } else { SetState 'done' '升级完成，服务已监听 ${port}' ; Log '服务已监听 ${port}，升级完成' } } else { SetState 'failed' '拉起失败且自动回滚未生效：请手动运行 node ${binPath} web' ; Log '拉起失败且自动回滚未生效：请手动运行 node ${binPath} web（参考本日志排查）' }`,
+        // keptReady 时上面已写过 ready 终态，这里不再覆盖成 failed（否则又变成"整列红叉"）
+        `if ($ok) { if ($script:rolledBack) { SetState 'failed' '升级失败，已自动回滚到升级前版本（服务已恢复）' ; Log '升级失败已自动回滚，服务已恢复' } else { SetState 'done' '升级完成，服务已监听 ${port}' ; Log '服务已监听 ${port}，升级完成' } } elseif (-not $script:keptReady) { SetState 'failed' '拉起失败且自动回滚未生效：请手动运行 node ${binPath} web' ; Log '拉起失败且自动回滚未生效：请手动运行 node ${binPath} web（参考本日志排查）' }`,
         `schtasks /delete /f /tn ${taskName} 2>$null`,
       ].filter((l) => l !== '').join('\r\n')
       // 初始状态（备份完成、脚本即将执行）
@@ -695,4 +696,4 @@ async function routeFrameworkUpgrade(req, res, rc) {
     return
 }
 
-export { routeFrameworkUpgrade }
+export { routeFrameworkUpgrade }

package/lib/server/routes/framework.js

@@ -9,6 +9,7 @@ import { tmpdir } from 'node:os'
 import { createRequire } from 'node:module'
 import { readCompatGate, writeCompatGate } from '../domain/compat.js'
 import { cleanupStaleFwTasks, currentFrameworkVersion, detectHostShape, pickFrameworkTarget, platformUpgradeRefusal, relaunchPrelude, resolveDshBin, shellHostedRefusal } from '../domain/framework.js'
+import { relaunchLauncherSource } from '../domain/framework-relaunch.js'
 import { restartPathDecision } from '../domain/restart.js'
 // 0.5.84 加法（用户第 5 项）：独立实例的 detached 重拉 —— 计划在 domain/restart-launcher.js，
 // 进程原语仍走 infra/egress.js 的可注入出口（单测能证明"一次真进程都没起"）。
@@ -113,7 +114,9 @@ async function routeFrameworkUpgradeStatusGet(req, res, rc) {
         // = 0xC000013A），终态没写成 → 界面永远卡在「回滚中…」并每 3 秒轮询。心跳 + 现实核对
         // 能把它纠正回来：脚本不再心跳（>90 秒没动静）时，用「已装版本 vs 回滚记录的 from/to」
         // 判断真实结果；同时清掉残留的 DSH-FW-* 计划任务。
-        const terminal = status.status === 'idle' || status.status === 'done' || status.status === 'failed'
+        // 2026-10-28 加法：`ready` = 框架本体已就位、只有自动拉起失败（**不回滚**，回滚交人工）。
+        // 它是**终态**（下面两处 terminal 判定都得认它，否则自愈会改写成 done、15 分钟残留清理会抹成 idle）。
+        const terminal = status.status === 'idle' || status.status === 'done' || status.status === 'failed' || status.status === 'ready'
         if (!terminal) {
           let hbAge = null
           try { hbAge = Date.now() - statSync(`${f}.hb`).mtimeMs } catch { hbAge = null }
@@ -152,11 +155,13 @@ async function routeFrameworkUpgradeStatusGet(req, res, rc) {
         // 视为上次升级的残留——升级脚本要么成功（done）要么失败（failed），服务重启后不可能还在
         // 中途；任务调度失败/脚本空跑时状态会永远停在 starting，重启后不应再自动恢复进度条。
         // （升级进行中页面断连后用户手动重启服务属边缘情况：<15 分钟不受影响，进度仍可恢复）
-        if (status.status !== 'idle' && status.status !== 'done' && status.status !== 'failed'
+        if (status.status !== 'idle' && status.status !== 'done' && status.status !== 'failed' && status.status !== 'ready'
           && Date.now() - at > 15 * 60 * 1000) {
           try { writeFileSync(f, 'idle|', 'utf8') } catch {}
           status = { status: 'idle', message: null, at: Date.now() }
         }
+        // ready → 对客户端表现成 done + keptFrame/relaunchFailed 标记（不改 UI：done 是终态、message 原样显示）
+        if (status.status === 'ready') status = { ...status, status: 'done', keptFrame: true, relaunchFailed: true }
       }
     } catch {}
     sendJson(res, 200, { ok: true, ...status })
@@ -414,6 +419,7 @@ async function routeFrameworkRollback(req, res, rc) {
     const logFile = join(dshHome(), 'plugin-console', 'fw-upgrade.log')
     const stateFile = join(dshHome(), 'plugin-console', 'fw-upgrade-state.txt')
     const ps = (s) => JSON.stringify(s).replace(/\\\\/gu, '\\')
+    try { writeFileSync(join(dshHome(), 'plugin-console', 'fw-launch.mjs'), relaunchLauncherSource(), 'utf8') } catch {} // 2026-10-28：回滚后的拉起也走 node 拉起器（与升级脚本共用同一份生成物）
     const lines = [
       `$state = ${ps(stateFile)}`,
       `$log = ${ps(logFile)}`,
@@ -422,7 +428,7 @@ async function routeFrameworkRollback(req, res, rc) {
       "  try { if ($s -eq 'failed') { Set-Content -Path $state -Value ($s + '|' + $m + '|stage=' + [string]$script:stage) -Encoding UTF8; return } } catch {}",
       "  try { if ($s -ne 'done' -and $s -ne 'idle') { $script:stage = $s }; Set-Content -Path $state -Value ($s + '|' + $m) -Encoding UTF8; Beat } catch {}",
       "}",
-      relaunchPrelude({ nodePath, pluginDir: pluginRoot(), fwRoot: rec.fwRoot, target: rec.from ?? '', ps }),
+      relaunchPrelude({ nodePath, pluginDir: pluginRoot(), fwRoot: rec.fwRoot, target: rec.from ?? '', ps, port }),
       "trap {",
       "  try { SetState 'failed' ('回滚脚本异常终止：' + $_.Exception.Message) } catch {}",
       `  schtasks /delete /f /tn ${taskName} 2>$null`,
@@ -449,10 +455,10 @@ async function routeFrameworkRollback(req, res, rc) {
       `$started = $false`,
       `for ($i = 0; $i -lt 20; $i++) {`,
       `  try { $c = Get-NetTCPConnection -LocalPort ${port} -State Listen -ErrorAction SilentlyContinue; if ($c.Count -gt 0) { $ok = $true; break } } catch {}`,
-      `  if (-not $ok -and -not $started) { if (Invoke-DshRelaunch '回滚后') { $started = $true } }; Beat`,
+      `  if (-not $ok -and -not $started) { $started = Note-Relaunch (Invoke-DshRelaunch '回滚后'); if ($script:relaunchListening) { $ok = $true; break } }; Beat`,
       `  Start-Sleep -Seconds 5`,
       `}`,
-      `if ($ok) { SetState 'done' ('已回滚到升级前版本 ${rec.from ?? '?'}，服务正常') ; Log '回滚完成，服务已恢复' } else { SetState 'failed' '回滚后服务拉起失败：请手动运行 node ${resolveDshBin() ?? '<bin>'} web' ; Log '回滚后拉起失败' }`,
+      `if ($ok) { SetState 'done' ('已回滚到升级前版本 ${rec.from ?? '?'}，服务正常') ; Log '回滚完成，服务已恢复' } else { SetState 'failed' ('回滚后服务拉起失败：' + [string]$script:relaunchReason + '；请手动运行 node ${resolveDshBin() ?? '<bin>'} web --no-open') ; Log ('回滚后拉起失败：' + [string]$script:relaunchReason) }`,
       `schtasks /delete /f /tn ${taskName} 2>$null`,
     ].filter((l) => l !== '').join('\r\n')
     try { writeFileSync(stateFile, 'rollback|回滚脚本已启动…', 'utf8') } catch {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@noob-stupid/dsh-plugin-console",
-  "version": "0.5.94",
+  "version": "0.5.97",
   "description": "DSH 框架升级安全与插件升级门控：一键升级、失败自动回滚、升级后回滚上版、旧插件不适配自动禁用；内置多源插件市场为发现层，插件源全部可自定义，可指向公司内网私有源 / 私有索引 / 本地 Git 仓库，纯内网离线可用 | Framework upgrade safety & plugin version gating for DSH, with a customizable multi-source plugin market: point every source at internal mirrors or a local file:// repo for intranet-only, offline installs.",
   "repository": {
     "type": "git",