@whyshu/argent 0.1.10 → 0.1.12

package/README.md

@@ -47,9 +47,12 @@ npx -y @whyshu/argent@latest update check --registry https://registry.npmmirror.
 1. 读取 npm `@whyshu/argent` 的 `latest` 版本；
 2. 备份 profile 的 `package.json` / patch / lock；
 3. 用目标版本启动器执行 `runtime install`；
-4. 执行 `setup --force-install` 更新 profile 插件；
-5. 执行 `health --json` 验收；
-6. 返回 `restartRequired: true`，由空闲窗口重启宿主。
+4. **原地更新现有 profile 的插件版本**（不重建 profile、不丢 bundles）；
+5. 用客户机**真实 dsh** 执行 `dsh plugin --profile argent install`；
+6. 用真实 dsh 执行 `health --json` 验收；
+7. 返回 `restartRequired: true`，由空闲窗口重启宿主。
+
+⛔ dsh 版本不等于启动器 exact pin 时，`update run` 会在改任何文件前停止；先升级宿主。
 
 失败不会静默：保留更新前 profile 清单备份，并打印分步重试命令。当前不做自动重启。
 

package/bin/argent.mjs

@@ -18,6 +18,7 @@ import {
   DSH_EXACT_VERSION, PROFILE_NAME, PROD_BUNDLES, buildLaunchdPlist, buildProfile, dshHomeOf, runnerScriptPath,
   depsInstalled, health, installDeps, loginWithPhone, pairRunner, probeDshVersion, readAuthToken, repoRoot, runnerConfigPath, sendLoginCode, versionMatches,
   engineRoot, materializeRuntime, checkForUpdate, compareVersions, launcherVersion,
+  PUBLISHED_BUNDLE_VERSIONS, resolveDshBin, updateProfilePluginVersions,
 } from '../lib/index.mjs';
 
 const argv = process.argv.slice(2);
@@ -42,6 +43,7 @@ const opts = {
   target: val('--target', join(homedir(), '.argent-dsh')),
   skillsTarget: has('--no-skills') ? '' : val('--skills-target', join(dshHomeOf(val('--dsh-home')), 'skills')),
   registry: val('--registry', process.env.ARGENT_NPM_REGISTRY || 'https://registry.npmjs.org'),
+  dshBin: val('--dsh-bin', resolveDshBin()),
   extraBundles: (() => { const raw = val('--bundles', '').split(',').map((x) => x.trim()).filter(Boolean); return raw.flatMap((x) => (x === 'prod' ? PROD_BUNDLES : [x])); })(),
 };
 
@@ -131,7 +133,7 @@ async function webCommand() {
 }
 
 async function healthCommand() {
-  const h = health({ dshHome: opts.dshHome, profile: opts.profile, repo: opts.repo, port: opts.port });
+  const h = health({ dshHome: opts.dshHome, profile: opts.profile, repo: opts.repo, port: opts.port, dshBin: opts.dshBin });
   if (JSON_OUT) console.log(JSON.stringify(h, null, 2));
   else {
     console.log(`dsh: ${h.dsh.ok ? h.dsh.version : '(未找到)'} ${h.dsh.matchesExact ? '✅ exact' : `❌ 期望 ${h.expectedDsh}`}`);
@@ -223,7 +225,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,28 +239,40 @@ 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'
   const common = ['--yes', `@whyshu/argent@${targetVersion}`]
   const installArgs = [...common, 'runtime', 'install', '--target', opts.target, '--skills-target', opts.skillsTarget]
-  const setupArgs = [...common, 'setup', '--dsh-home', opts.dshHome, '--force-install']
-  const healthArgs = [...common, 'health', '--dsh-home', opts.dshHome, '--json']
+  const healthArgs = [...common, 'health', '--dsh-home', opts.dshHome, '--json', '--dsh-bin', opts.dshBin]
   if (DRY_RUN) {
-    print({ ok: true, dryRun: true, current, targetVersion, commands: [installArgs, setupArgs, healthArgs].map((args) => [npx, ...args].join(' ')) })
+    print({ ok: true, dryRun: true, current, targetVersion, dshBin: opts.dshBin, commands: [
+      [npx, ...installArgs].join(' '),
+      `update profile plugin versions (${Object.keys(PUBLISHED_BUNDLE_VERSIONS).join(', ')})`,
+      `${opts.dshBin} plugin --profile ${opts.profile} install  # DSH_HOME=${opts.dshHome}`,
+      [npx, ...healthArgs].join(' '),
+    ] })
     return
   }
   if (!has('--yes')) {
     console.error('⛔ 更新会改 runtime / profile 插件，必须显式加 --yes。先看计划：argent update run --dry-run')
     process.exit(2)
   }
+  // 宿主版本不匹配时绝不能先改 profile（新插件可能要求新 dsh；改完再 health 失败会留下半升级）。
+  const dshProbe = probeDshVersion({ dshBin: opts.dshBin })
+  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}`)
@@ -270,12 +284,15 @@ async function updateCommand(sub) {
   const env = { NPM_CONFIG_REGISTRY: opts.registry }
   try {
     runCli(npx, installArgs, { env })
-    runCli(npx, setupArgs, { env })
+    // 不调用 setup：setup 会重建 profile，可能丢掉客户现有 bundles/依赖结构（2026-10-22 实测）。
+    const prof = updateProfilePluginVersions({ dshHome: opts.dshHome, profile: opts.profile, versions: PUBLISHED_BUNDLE_VERSIONS })
+    if (!prof.ok) throw new Error(`更新 profile 插件版本失败：${prof.message}`)
+    runCli(opts.dshBin, ['plugin', '--profile', opts.profile, 'install'], { env: { ...env, DSH_HOME: opts.dshHome }, cwd: opts.dshHome })
     runCli(npx, healthArgs, { env })
   } catch (e) {
     console.error(`❌ 更新失败：${e.message}`)
     console.error(`   已保留更新前 profile 清单备份：${backupDir}`)
-    console.error('   可分步重试：npx -y @whyshu/argent@' + targetVersion + ' runtime install / setup --force-install；必要时用备份恢复 package.json/patch。')
+    console.error('   可分步重试：npx -y @whyshu/argent@' + targetVersion + ' runtime install，再按 dsh plugin install 重试；必要时用备份恢复 package.json/patch。')
     process.exit(2)
   }
   print({ ok: true, from: current, to: targetVersion, runtimeTarget: opts.target, profile: profileDir, backupDir, restartRequired: true, next: '空闲窗口重启 dsh web（service install/launchd 或现有重启脚本）' })

package/lib/index.mjs

@@ -403,18 +403,83 @@ 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,
+  }
+}
+
+
+/** 解析客户机**真实的** dsh（npx 启动器的依赖里也带一个 dsh，PATH 会被 npx 改写，不能直接用裸 `dsh`）。 */
+export function resolveDshBin({ env = process.env, home = homedir() } = {}) {
+  const explicit = String(env.ARGENT_DSH_BIN || env.DSH_BIN || '').trim()
+  if (explicit && existsSync(explicit)) return explicit
+  const pathEntries = String(env.PATH || '').split(':').filter(Boolean)
+    .filter((p) => !p.includes('_npx') && !p.replace(/\/+$/, '').endsWith('node_modules/.bin'))
+  for (const dir of pathEntries) {
+    const p = join(dir, process.platform === 'win32' ? 'dsh.cmd' : 'dsh')
+    if (existsSync(p)) return p
+  }
+  for (const p of [
+    join(home, '.local', 'node', 'bin', 'dsh'),
+    '/opt/homebrew/bin/dsh',
+    '/usr/local/bin/dsh',
+  ]) if (existsSync(p)) return p
+  return 'dsh'
+}
+
+/** 更新 profile 里已存在的插件版本；不重建 profile、不丢 bundles/依赖结构。 */
+export function updateProfilePluginVersions({
+  dshHome = dshHomeOf(), profile = PROFILE_NAME, versions = PUBLISHED_BUNDLE_VERSIONS,
+} = {}) {
+  const file = join(profileDir(dshHome, profile), 'package.json')
+  let pkg = null
+  try { pkg = JSON.parse(readFileSync(file, 'utf8')) } catch { return { ok: false, code: 'profile_missing', message: `profile 不存在：${file}` } }
+  if (!pkg.dependencies || typeof pkg.dependencies !== 'object') return { ok: false, code: 'profile_shape', message: 'profile package.json 缺 dependencies' }
+  const changed = []
+  for (const [name, want] of Object.entries(versions || {})) {
+    const have = String(pkg.dependencies[name] || '')
+    if (!have || have.startsWith('file:') || have === want) continue
+    pkg.dependencies[name] = want
+    changed.push({ name, from: have, to: want })
   }
+  if (changed.length) writeFileSync(file, JSON.stringify(pkg, null, 2) + '\n')
+  return { ok: true, file, changed }
 }

package/package.json

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