@whyshu/argent 0.1.10 → 0.1.11

package/bin/argent.mjs

@@ -223,7 +223,7 @@ async function updateCommand(sub) {
   }
   const current = launcherVersion()
   let remote
-  try { remote = await checkForUpdate({ target: opts.target, registry: opts.registry }) }
+  try { remote = await checkForUpdate({ target: opts.target, registry: opts.registry, dshHome: opts.dshHome, profile: opts.profile }) }
   catch (e) { console.error(`❌ 检查更新失败：${e.message}`); process.exit(2) }
   if (!remote.ok) {
     if (JSON_OUT) console.log(JSON.stringify(remote, null, 2)); else console.error(`❌ ${remote.message}`)
@@ -237,13 +237,14 @@ async function updateCommand(sub) {
       console.log(`当前启动器: ${current || '(未知)'}`)
       console.log(`npm latest: ${remote.latest}`)
       console.log(remote.updateAvailable ? '→ 有可用更新' : '→ 已是最新')
+      if (remote.pluginUpdates?.length) console.log('插件可更新：' + remote.pluginUpdates.map((x) => `${x.name} ${x.current}→${x.latest}`).join('；'))
       console.log(`runtime: ${remote.runtime || '(未物化)'} @ ${remote.runtimeTarget}`)
       console.log(`来源: ${remote.registry}`)
     }
     return
   }
-  if (compareVersions(targetVersion, current) <= 0 && !has('--force')) {
-    console.log(`已是最新（${current}），无需更新。`)
+  if (!remote.updateAvailable && !has('--force')) {
+    console.log(`已是最新（${current}${remote.pluginUpdates?.length ? '，插件也无更新' : ''}），无需更新。`)
     return
   }
   const npx = process.platform === 'win32' ? 'npx.cmd' : 'npx'
@@ -259,6 +260,13 @@ async function updateCommand(sub) {
     console.error('⛔ 更新会改 runtime / profile 插件，必须显式加 --yes。先看计划：argent update run --dry-run')
     process.exit(2)
   }
+  // 宿主版本不匹配时绝不能先改 profile（新插件可能要求新 dsh；改完再 health 失败会留下半升级）。
+  const dshProbe = probeDshVersion()
+  if (!dshProbe.ok || !versionMatches(dshProbe.version)) {
+    console.error(`⛔ 宿主 dsh 版本不匹配：当前 ${dshProbe.ok ? dshProbe.version : '(未找到)'}，启动器要求 ${DSH_EXACT_VERSION}。`)
+    console.error('   请先按客户机 dsh 升级流程升级宿主，再重跑 update run；本次未改任何文件。')
+    process.exit(2)
+  }
   const stamp = new Date().toISOString().replace(/[:.]/g, '-')
   const profileDir = join(opts.dshHome, 'profiles', opts.profile)
   const backupDir = join(opts.dshHome, 'argent', 'backup', `update-${stamp}`)

package/lib/index.mjs

@@ -403,18 +403,45 @@ export function readRuntimeVersion(target = join(homedir(), '.argent-dsh')) {
   } catch { return '' }
 }
 
+/** 读 profile 当前插件版本（用于判断“runtime 已是最新、但插件还是旧版”）。 */
+export function readProfilePluginVersions({ dshHome = dshHomeOf(), profile = PROFILE_NAME } = {}) {
+  try {
+    const pkg = JSON.parse(readFileSync(join(profileDir(dshHome, profile), 'package.json'), 'utf8'))
+    const deps = pkg && typeof pkg.dependencies === 'object' ? pkg.dependencies : {}
+    const out = {}
+    for (const [name, ver] of Object.entries(deps)) {
+      if (!name.startsWith('@whyshu/argent-')) continue
+      const v = String(ver || '')
+      out[name] = v.startsWith('file:') ? '' : v
+    }
+    return out
+  } catch { return {} }
+}
+
 /** 检查更新（只读；不下载、不安装）。 */
 export async function checkForUpdate({
-  launcherLib, target = join(homedir(), '.argent-dsh'), registry = process.env.ARGENT_NPM_REGISTRY || DEFAULT_NPM_REGISTRY,
+  launcherLib, dshHome = dshHomeOf(), profile = PROFILE_NAME,
+  target = join(homedir(), '.argent-dsh'), registry = process.env.ARGENT_NPM_REGISTRY || DEFAULT_NPM_REGISTRY,
   fetchImpl = globalThis.fetch,
 } = {}) {
   const current = launcherVersion(launcherLib)
   const remote = await latestLauncherVersion({ registry, fetchImpl })
   const runtime = readRuntimeVersion(target)
-  if (!remote.ok) return { ok: false, code: remote.code, message: remote.message, current, runtime, registry }
-  const updateAvailable = current ? compareVersions(remote.version, current) > 0 : true
+  const installedPlugins = readProfilePluginVersions({ dshHome, profile })
+  if (!remote.ok) return { ok: false, code: remote.code, message: remote.message, current, runtime, installedPlugins, registry }
+  const pluginUpdates = []
+  for (const [name, want] of Object.entries(PUBLISHED_BUNDLE_VERSIONS)) {
+    const have = installedPlugins[name]
+    // 本地 file: 装配（开发机）不算可更新客户机；只比较明确版本号。
+    if (!have || !want) continue
+    if (compareVersions(want, have) > 0) pluginUpdates.push({ name, current: have, latest: want })
+  }
+  const launcherUpdate = current ? compareVersions(remote.version, current) > 0 : true
   return {
-    ok: true, current, latest: remote.version, updateAvailable, registry: remote.registry,
-    integrity: remote.integrity, tarball: remote.tarball, runtime, runtimeTarget: target,
+    ok: true, current, latest: remote.version,
+    updateAvailable: Boolean(launcherUpdate || pluginUpdates.length),
+    launcherUpdate, pluginUpdates, installedPlugins,
+    registry: remote.registry, integrity: remote.integrity, tarball: remote.tarball,
+    runtime, runtimeTarget: target,
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whyshu/argent",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "description": "Argent 启动器：一条命令启动「打包好的 dsh + Argent 插件/角色预设」，并管理本机 runner 常驻。",
   "type": "module",
   "bin": {