@whyshu/argent 0.1.23 → 0.1.25

package/bin/argent.mjs

@@ -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(' '),
@@ -282,14 +295,27 @@ async function updateCommand(sub) {
     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}`)
     // 方案 C · P3：runtime 换完必须重写契约文件（否则壳仍按旧 engineDir/版本读）
-    const eng = writeEngineContract(profileDir, { repo: opts.repo })
-    runCli(opts.dshBin, ['plugin', '--profile', opts.profile, 'install'], { env: { ...env, DSH_HOME: opts.dshHome }, cwd: opts.dshHome })
+    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}`)

package/lib/index.mjs

@@ -138,14 +138,19 @@ export function engineRoot({ env = process.env, launcherLib = dirname(fileURLToP
  * 优先级：本地仓库（开发联调）→ npm 包 `engine/` → 已物化 runtime（~/.argent-dsh）。
  * 找不到就返回 ok:false —— 由调用方决定写空值还是报错，⛔ 不要在这里编一个路径。
  */
-export function engineInfo({ repo = repoRoot(), env = process.env } = {}) {
+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 = [];
-  if (valid(repo)) cands.push({ dir: repo, source: 'repo' });
+  // ① 显式 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' });
-  const runtime = env.ARGENT_RUNTIME_TARGET || join(homedir(), '.argent-dsh');
-  if (valid(runtime)) cands.push({ dir: runtime, source: 'runtime' });
   for (const c of cands) {
     let version = '';
     try { version = readFileSync(join(c.dir, 'VERSION'), 'utf8').trim(); } catch { /* 保留空串 */ }
@@ -163,8 +168,8 @@ export function engineContract(dir) {
 }
 
 /** 写 `<profile>/argent.json`：宿主壳只读这个文件，不再猜引擎在哪（方案 C · P1） */
-export function writeEngineContract(dir, { repo = repoRoot(), env = process.env } = {}) {
-  const info = engineInfo({ repo, env });
+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 : '',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whyshu/argent",
-  "version": "0.1.23",
+  "version": "0.1.25",
   "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.9"
+    "@whyshu/argent-engine": "0.8.0-rc.10"
   },
   "files": [
     "bin/",