@whyshu/argent 0.1.22 → 0.1.24

package/bin/argent.mjs

@@ -18,7 +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,
+  PUBLISHED_BUNDLE_VERSIONS, resolveDshBin, updateProfilePluginVersions, writeEngineContract,
 } from '../lib/index.mjs';
 
 const argv = process.argv.slice(2);
@@ -218,6 +218,19 @@ function runCli(bin, args, { cwd = '', env = {} } = {}) {
 
 function inherit_stdout() { return !JSON_OUT }
 
+
+/** desktop profile 的依赖安装器：ARGENT_PNPM → 宿主自带 pnpm → PATH 上的 pnpm */
+function resolvePnpm() {
+  const cands = [
+    process.env.ARGENT_PNPM,
+    '/Applications/DeepSeek Harness.app/Contents/Resources/runtime/primary-runtime/dependencies/pnpm/bin/pnpm.mjs',
+  ].filter(Boolean)
+  for (const c of cands) { if (existsSync(c)) return { cmd: process.execPath, args: [c] } }
+  const which = spawnSync('pnpm', ['--version'], { encoding: 'utf8' })
+  if (which.status === 0) return { cmd: 'pnpm', args: [] }
+  return null
+}
+
 async function updateCommand(sub) {
   if (sub !== 'check' && sub !== 'run') {
     console.error('用法：argent update check|run [--to <version>] [--yes] [--registry <url>] [--dsh-home <dir>] [--target <dir>] [--json] [--dry-run]');
@@ -252,7 +265,7 @@ async function updateCommand(sub) {
   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 healthArgs = [...common, 'health', '--dsh-home', opts.dshHome, '--json', '--dsh-bin', opts.dshBin]
+  const healthArgs = [...common, 'health', '--dsh-home', opts.dshHome, '--profile', opts.profile, '--json', '--dsh-bin', opts.dshBin]
   if (DRY_RUN) {
     print({ ok: true, dryRun: true, current, targetVersion, dshBin: opts.dshBin, commands: [
       [npx, ...installArgs].join(' '),
@@ -277,17 +290,32 @@ async function updateCommand(sub) {
   const profileDir = join(opts.dshHome, 'profiles', opts.profile)
   const backupDir = join(opts.dshHome, 'argent', 'backup', `update-${stamp}`)
   mkdirSync(backupDir, { recursive: true })
-  for (const f of ['package.json', 'cordis.patch.yml', 'pnpm-lock.yaml', 'pnpm-workspace.yaml']) {
+  for (const f of ['package.json', 'cordis.patch.yml', 'pnpm-lock.yaml', 'pnpm-workspace.yaml', 'argent.json']) {
     const src = join(profileDir, f)
     if (existsSync(src)) { mkdirSync(dirname(join(backupDir, f)), { recursive: true }); cpSync(src, join(backupDir, f)) }
   }
   const env = { NPM_CONFIG_REGISTRY: opts.registry }
+  let eng = null
   try {
     runCli(npx, installArgs, { 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 })
+    // 方案 C · P3：runtime 换完必须重写契约文件（否则壳仍按旧 engineDir/版本读）
+    eng = writeEngineContract(profileDir, { repo: opts.repo, target: opts.target })
+    // ⚠️ dsh CLI **拒绝管理 desktop profile**（"managed exclusively by the Electron application"）
+    // ⇒ desktop 必须由宿主自己的 pnpm 装依赖（2026-11-02 实测：`dsh plugin --profile desktop install` 直接 exit 1）。
+    if (opts.profile === 'desktop') {
+      const ws = join(profileDir, 'pnpm-workspace.yaml')
+      if (!existsSync(ws)) {
+        writeFileSync(ws, 'packages:\n  - .\nnodeLinker: hoisted\nautoInstallPeers: false\nallowBuilds:\n  protobufjs: true\n')
+      }
+      const pnpm = resolvePnpm()
+      if (!pnpm) throw new Error('desktop profile 需要 pnpm：设置 ARGENT_PNPM，或确保 PATH 上有 pnpm')
+      runCli(pnpm.cmd, pnpm.args.concat(['install', '--reporter=append-only']), { cwd: profileDir, env })
+    } else {
+      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}`)
@@ -295,7 +323,11 @@ async function updateCommand(sub) {
     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 或现有重启脚本）' })
+  print({
+    ok: true, from: current, to: targetVersion, runtimeTarget: opts.target, profile: profileDir, backupDir,
+    contract: { engineDir: eng.engineDir, engineVersion: eng.engineVersion, contract: eng.contract, source: eng.source },
+    restartRequired: true, next: '空闲窗口重启 dsh web（service install/launchd 或现有重启脚本）',
+  })
 }
 
 function serviceCommand(sub) {

package/lib/index.mjs

@@ -31,6 +31,11 @@ export const PROD_BUNDLES = [
 ];
 export const RUNNER_LABEL = 'com.whyshu.argent-runner';
 
+/** 启动器自身版本（写进 argent.json 的 writtenBy，便于事后追溯是谁写的契约） */
+export const LAUNCHER_VERSION = (() => {
+  try { return JSON.parse(readFileSync(join(dirname(fileURLToPath(import.meta.url)), '..', 'package.json'), 'utf8')).version } catch { return '' }
+})();
+
 /** 仓库根：launcher/lib → ../../（本地联调）；发布包内由 ARGENT_REPO 覆盖 */
 export function repoRoot({ repo } = {}) {
   if (repo) return resolve(repo);
@@ -73,6 +78,8 @@ export function pluginDirs({ repo = repoRoot() } = {}) {
 
 /** 已发布插件的版本（发布模式装配 profile 用；与 npm 上实际可见版本对齐） */
 export const PUBLISHED_BUNDLE_VERSIONS = {
+  // ⚠️ 每个包**只允许出现一次**（2026-11-02 修：argent-desktop 曾同时写 0.2.2/0.2.3，
+  //    后者静默覆盖前者 ⇒ 改上面那行的人会以为生效了）
   '@whyshu/argent-presets': '0.1.2',
   '@whyshu/argent-core': '0.1.6',
   '@whyshu/argent-dsh': '0.1.10',
@@ -80,10 +87,9 @@ export const PUBLISHED_BUNDLE_VERSIONS = {
   '@whyshu/argent-gateway': '0.2.3',
   '@whyshu/argent-flow': '0.1.1',
   '@whyshu/argent-ml': '0.1.1',
-  '@whyshu/argent-desktop': '0.2.2',
   '@michengai/dsh-im-connect': '1.0.2',
   '@linxin666/dsh-client-ui-task-board': '0.4.7',
-  '@whyshu/argent-desktop': '0.2.3',
+  '@whyshu/argent-desktop': '0.2.4',
 };
 
 
@@ -125,6 +131,57 @@ export function engineRoot({ env = process.env, launcherLib = dirname(fileURLToP
   return '';
 }
 
+/**
+ * 引擎定位（方案 C 契约的**写入侧**）。
+ *
+ * 判据与 engineRoot 一致但不猜：`<dir>/VERSION` + `<dir>/core/lib/argent-datadir.mjs`。
+ * 优先级：本地仓库（开发联调）→ npm 包 `engine/` → 已物化 runtime（~/.argent-dsh）。
+ * 找不到就返回 ok:false —— 由调用方决定写空值还是报错，⛔ 不要在这里编一个路径。
+ */
+export function engineInfo({ repo = repoRoot(), target = process.env.ARGENT_RUNTIME_TARGET, env = process.env } = {}) {
+  const valid = (d) => Boolean(d) && existsSync(join(d, 'VERSION')) && existsSync(join(d, 'core', 'lib', 'argent-datadir.mjs'));
+  const cands = [];
+  // ① 显式 runtime 目标（update run --target）：客户机上**唯一稳定**的引擎位置
+  if (valid(target)) cands.push({ dir: target, source: 'target' });
+  // ② 本地仓库（开发联调）：必须真的是 git 检出，⛔ 不要把 npx 缓存里的包当"仓库"
+  if (valid(repo) && existsSync(join(repo, '.git'))) cands.push({ dir: repo, source: 'repo' });
+  // ③ 已物化 runtime（默认 ~/.argent-dsh）
+  const runtime = join(homedir(), '.argent-dsh');
+  if (valid(runtime)) cands.push({ dir: runtime, source: 'runtime' });
+  // ④ 最后才是 npm 包（npx 缓存路径，随时会被清 —— 只作兜底）
+  const pkg = engineRoot({ env });
+  if (valid(pkg)) cands.push({ dir: pkg, source: 'package' });
+  for (const c of cands) {
+    let version = '';
+    try { version = readFileSync(join(c.dir, 'VERSION'), 'utf8').trim(); } catch { /* 保留空串 */ }
+    return { ok: true, dir: c.dir, source: c.source, version };
+  }
+  return { ok: false, dir: '', source: 'none', version: '' };
+}
+
+/** 读引擎契约版本（唯一真源 = `<engine>/core/lib/contract.mjs`；读不到返回 null，⛔ 不猜） */
+export function engineContract(dir) {
+  try {
+    const m = readFileSync(join(dir, 'core', 'lib', 'contract.mjs'), 'utf8').match(/export const CONTRACT\s*=\s*(\d+)/);
+    return m ? Number(m[1]) : null;
+  } catch { return null; }
+}
+
+/** 写 `<profile>/argent.json`：宿主壳只读这个文件，不再猜引擎在哪（方案 C · P1） */
+export function writeEngineContract(dir, { repo = repoRoot(), target = process.env.ARGENT_RUNTIME_TARGET, env = process.env } = {}) {
+  const info = engineInfo({ repo, target, env });
+  const payload = {
+    engineDir: info.ok ? info.dir : '',
+    engineVersion: info.ok ? info.version : '',
+    contract: info.ok ? engineContract(info.dir) : null,
+    source: info.source,
+    writtenBy: LAUNCHER_VERSION ? `@whyshu/argent@${LAUNCHER_VERSION}` : '@whyshu/argent',
+    writtenAt: new Date().toISOString(),
+  };
+  writeFileSync(join(dir, 'argent.json'), JSON.stringify(payload, null, 2) + '\n');
+  return payload;
+}
+
 function walkFiles(dir, base = dir) {
   const out = [];
   for (const e of readdirSync(dir)) {
@@ -205,6 +262,8 @@ export function buildProfile({ dshHome = dshHomeOf(), profile = PROFILE_NAME, re
     dsh: { profile: { bundles } },
   };
   writeFileSync(join(dir, 'package.json'), JSON.stringify(pkg, null, 2) + '\n');
+  // 方案 C · P1：把"引擎在哪、什么版本、契约几"写成机器可读的契约文件（宿主壳只读它）
+  const engine = writeEngineContract(dir, { repo });
   const patchLines = [
     '# @whyshu/argent 生成（幂等；手工改动会在此文件重生成时被覆盖）',
     '- id: agent-preset-registry',
@@ -218,7 +277,7 @@ export function buildProfile({ dshHome = dshHomeOf(), profile = PROFILE_NAME, re
   writeFileSync(join(dir, 'cordis.patch.yml'), patch);
   // pnpm 配置必须与现有 web profile 同口径：否则 pnpm 会尝试从 registry 自动装 peer（含未发布版本）⇒ 安装失败
   writeFileSync(join(dir, 'pnpm-workspace.yaml'), 'packages:\n  - .\nnodeLinker: hoisted\nautoInstallPeers: false\nallowBuilds:\n  protobufjs: true\n');
-  return { ok: true, dir, plugins: Object.keys(plugins), bundles: [...bundles], preset: DEFAULT_PRESET };
+  return { ok: true, dir, plugins: Object.keys(plugins), bundles: [...bundles], preset: DEFAULT_PRESET, engine };
 }
 
 export function depsInstalled(dshHome = dshHomeOf(), profile = PROFILE_NAME) {
@@ -316,6 +375,36 @@ export function buildLaunchdPlist({ dshHome = dshHomeOf(), repo = repoRoot(), no
 }
 
 /** 状态自检（不启动任何东西；JSON 友好） */
+/**
+ * 两构件对齐检查（方案 C · P3）：`<profile>/argent.json` ⇄ 实际引擎 ⇄ 插件声明。
+ * ⛔ 只报告，不修；`problems` 为空才算对齐。
+ */
+export function contractStatus({ dshHome = dshHomeOf(), profile = PROFILE_NAME, repo = repoRoot() } = {}) {
+  const dir = profileDir(dshHome, profile);
+  const file = join(dir, 'argent.json');
+  let contract = null;
+  try { contract = JSON.parse(readFileSync(file, 'utf8')); } catch { /* 缺文件/坏 JSON 都算未建立 */ }
+  const info = engineInfo({ repo });
+  const expected = info.ok ? engineContract(info.dir) : null;
+  let plugin = null;
+  try {
+    const pkg = JSON.parse(readFileSync(join(dir, 'node_modules', '@whyshu', 'argent-desktop', 'package.json'), 'utf8'));
+    plugin = { version: pkg.version || '', requires: pkg.argentEngine || '', contract: pkg.argentContract ?? null };
+  } catch { /* 未装插件（web profile）属正常 */ }
+  const problems = [];
+  if (!contract) problems.push(`缺少 ${file}（运行 argent setup 生成）`);
+  else {
+    if (contract.contract == null) problems.push('argent.json 缺 contract');
+    else if (expected !== null && contract.contract !== expected) problems.push(`契约不符：argent.json=${contract.contract}，引擎=${expected}`);
+    if (!contract.engineDir) problems.push('argent.json 未指向 engineDir');
+    else if (info.ok && contract.engineVersion !== info.version) problems.push(`引擎版本漂移：argent.json=${contract.engineVersion}，实际=${info.version}`);
+  }
+  if (plugin && plugin.contract != null && expected !== null && plugin.contract !== expected) {
+    problems.push(`插件要求契约 ${plugin.contract}，引擎提供 ${expected}`);
+  }
+  return { ok: problems.length === 0, file, contract, engine: info, plugin, expectedContract: expected, problems };
+}
+
 export function health({ dshHome = dshHomeOf(), profile = PROFILE_NAME, repo = repoRoot(), dshBin = 'dsh', port = 3080 } = {}) {
   const version = probeDshVersion({ dshBin });
   const dir = profileDir(dshHome, profile);
@@ -330,6 +419,7 @@ export function health({ dshHome = dshHomeOf(), profile = PROFILE_NAME, repo = r
     profile: { dir, packageJson: existsSync(profilePackage), patch: existsSync(profilePatch) },
     runner: { configPath: runnerCfg, configPresent: existsSync(runnerCfg), mode: runnerCfgMode },
     webUrl: `http://127.0.0.1:${port}`,
+    contract: contractStatus({ dshHome, profile, repo }),
     repo,
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whyshu/argent",
-  "version": "0.1.22",
+  "version": "0.1.24",
   "description": "Argent 启动器：一条命令启动「打包好的 dsh + Argent 插件/角色预设」，并管理本机 runner 常驻。",
   "type": "module",
   "bin": {
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@deepseek-ai/dsh": "0.2.1-rc.2",
-    "@whyshu/argent-engine": "0.8.0-rc.8"
+    "@whyshu/argent-engine": "0.8.0-rc.9"
   },
   "files": [
     "bin/",