@whyshu/argent 0.1.4 → 0.1.6

package/bin/argent.mjs

@@ -9,13 +9,14 @@
  *
  * 公共参数：--dsh-home <dir>  --profile <name>  --repo <dir>  --json  --dry-run
  */
-import { spawn } from 'node:child_process';
-import { mkdirSync, writeFileSync, rmSync, existsSync, copyFileSync, chmodSync } from 'node:fs';
+import { spawn, spawnSync } from 'node:child_process';
+import { mkdirSync, writeFileSync, rmSync, existsSync, copyFileSync, chmodSync, readFileSync } from 'node:fs';
 import { join, dirname } from 'node:path';
 import { homedir } from 'node:os';
 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,
 } from '../lib/index.mjs';
 
 const argv = process.argv.slice(2);
@@ -26,9 +27,9 @@ const DRY_RUN = has('--dry-run');
 
 const command = (() => {
   const positional = argv.filter((a) => !a.startsWith('--') && !['-h'].includes(a));
-  const i = argv.findIndex((a) => a === 'web' || a === 'health' || a === 'setup' || a === 'pair' || a === 'login' || a === 'service');
+  const i = argv.findIndex((a) => a === 'web' || a === 'health' || a === 'setup' || a === 'pair' || a === 'login' || a === 'service' || a === 'runtime');
   if (i < 0) return '';
-  if (argv[i] === 'service') return `service ${argv[i + 1] || ''}`.trim();
+  if (argv[i] === 'service' || argv[i] === 'runtime') return `${argv[i]} ${argv[i + 1] || ''}`.trim();
   return argv[i];
 })();
 
@@ -37,6 +38,7 @@ const opts = {
   profile: val('--profile', PROFILE_NAME),
   repo: repoRoot({ repo: val('--repo') }),
   port: Number(val('--port', '3080')) || 3080,
+  target: val('--target', join(homedir(), '.argent-dsh')),
   extraBundles: (() => { const raw = val('--bundles', '').split(',').map((x) => x.trim()).filter(Boolean); return raw.flatMap((x) => (x === 'prod' ? PROD_BUNDLES : [x])); })(),
 };
 
@@ -45,6 +47,24 @@ function print(obj) {
   else for (const [k, v] of Object.entries(obj)) console.log(`${k}: ${typeof v === 'object' ? JSON.stringify(v) : v}`);
 }
 
+function ensureBundleDeps() {
+  const dir = join(opts.dshHome, 'profiles', opts.profile);
+  let pkg;
+  try { pkg = JSON.parse(readFileSync(join(dir, 'package.json'), 'utf8')); } catch { return; }
+  for (const [name, version] of Object.entries(pkg.dependencies || {})) {
+    const depDir = join(dir, 'node_modules', ...name.split('/'));
+    if (existsSync(depDir)) continue;
+    console.error(`→ 补装缺失 bundle ${name}@${version} …`);
+    const r = spawnSync('dsh', ['plugin', '--profile', opts.profile, 'add', `${name}@${version}`], {
+      cwd: dir, stdio: 'inherit', env: { ...process.env, DSH_HOME: opts.dshHome },
+    });
+    if (r.status !== 0) {
+      console.error(`❌ 补装失败：${name}（exit ${r.status}）`);
+      process.exit(2);
+    }
+  }
+}
+
 function ensureProfile({ install = true } = {}) {
   const built = buildProfile({ dshHome: opts.dshHome, profile: opts.profile, repo: opts.repo, extraBundles: opts.extraBundles });
   if (!built.ok) {
@@ -61,6 +81,7 @@ function ensureProfile({ install = true } = {}) {
     }
     console.error('✅ profile 依赖装配完成');
   }
+  if (install && !has('--no-install')) ensureBundleDeps();
   return built;
 }
 
@@ -160,6 +181,23 @@ function setupCommand() {
   print({ ok: true, profile: built.dir, bundles: built.bundles.join(', '), plugins: built.plugins.join(', '), preset: built.preset, depsInstalled: depsInstalled(opts.dshHome, opts.profile) });
 }
 
+function runtimeCommand(sub) {
+  const engine = engineRoot();
+  if (!engine) { console.error('❌ 未找到 @whyshu/argent-engine；请用新版启动器（npm 依赖应随包安装）'); process.exit(2); }
+  const version = readFileSync(join(engine, 'VERSION'), 'utf8').trim();
+  if (sub === 'status' || sub === '') {
+    let current = null;
+    try { current = JSON.parse(readFileSync(join(opts.target, 'RUNTIME_VERSION.json'), 'utf8')); } catch { current = null; }
+    print({ ok: true, engine, engineVersion: version, target: opts.target, current: current ? current.version : null, installed: Boolean(current) });
+    return;
+  }
+  if (sub !== 'install') { console.error('用法：argent runtime install|status [--target <dir>] [--dry-run]'); process.exit(2); }
+  if (DRY_RUN) { print({ ok: true, dryRun: true, engine, version, target: opts.target, action: 'materialize runtime files' }); return; }
+  const r = materializeRuntime({ target: opts.target, engine });
+  if (!r.ok) { console.error(`❌ runtime 安装失败：${r.message}`); process.exit(2); }
+  print({ ok: true, package: '@whyshu/argent-engine', version: r.version, files: r.files, target: r.target, backupDir: r.backupDir });
+}
+
 function serviceCommand(sub) {
   const bundled = runnerScriptPath({ repo: opts.repo });
   // 固定 runner 路径：复制进 DSH_HOME，避免 launchd 指向 npx 临时缓存（缓存清理后失效）
@@ -199,13 +237,14 @@ function serviceCommand(sub) {
 
 const main = async () => {
   if (!command || has('-h') || has('--help')) {
-    console.log('用法：argent <web|health|setup|login|pair|service install|service uninstall> [--dsh-home <dir>] [--json] [--dry-run]');
+    console.log('用法：argent <web|health|setup|login|pair|runtime install|runtime status|service install|service uninstall> [--dsh-home <dir>] [--json] [--dry-run]');
     process.exit(command ? 0 : 2);
   }
   if (command === 'health') return healthCommand();
   if (command === 'setup') return setupCommand();
   if (command === 'pair') return pairCommand();
   if (command === 'login') return loginCommand();
+  if (command === 'runtime install' || command === 'runtime status') return runtimeCommand(command.split(' ')[1]);
   if (command === 'service install' || command === 'service uninstall') return serviceCommand(command.split(' ')[1]);
   return webCommand();
 };

package/lib/index.mjs

@@ -8,7 +8,7 @@
  *   · 状态自检（版本/profile/runner 配置/端口）。
  * ⛔ 不读写任何凭据内容（runner.json 由首跑引导写，权限 600）。
  */
-import { existsSync, mkdirSync, readFileSync, writeFileSync, statSync } from 'node:fs';
+import { existsSync, mkdirSync, readFileSync, writeFileSync, statSync, cpSync, readdirSync } from 'node:fs';
 import { spawnSync } from 'node:child_process';
 import { homedir, hostname as osHostname } from 'node:os';
 import { dirname, join, resolve } from 'node:path';
@@ -83,6 +83,63 @@ export const PUBLISHED_BUNDLE_VERSIONS = {
   '@linxin666/dsh-client-ui-task-board': '0.4.7',
 };
 
+
+/** 发布模式随启动器安装的 runtime（@whyshu/argent-engine）根目录；本地联调回退 dist。 */
+export function engineRoot({ env = process.env, launcherLib = dirname(fileURLToPath(import.meta.url)) } = {}) {
+  const candidates = [];
+  if (env.ARGENT_ENGINE_ROOT) candidates.push(resolve(env.ARGENT_ENGINE_ROOT));
+  // npx/global 安装：node_modules/@whyshu/argent-engine/engine
+  candidates.push(resolve(launcherLib, '..', '..', '..', '@whyshu', 'argent-engine', 'engine'));
+  candidates.push(resolve(launcherLib, '..', '..', 'node_modules', '@whyshu', 'argent-engine', 'engine'));
+  // 本地仓库联调：dist/argent-engine/engine
+  candidates.push(resolve(launcherLib, '..', '..', 'dist', 'argent-engine', 'engine'));
+  for (const c of candidates) {
+    if (existsSync(join(c, 'scripts')) && existsSync(join(c, 'VERSION'))) return c;
+  }
+  return '';
+}
+
+function walkFiles(dir, base = dir) {
+  const out = [];
+  for (const e of readdirSync(dir)) {
+    const p = join(dir, e);
+    const rel = p.slice(base.length + 1).split('\\').join('/');
+    const st = statSync(p);
+    if (st.isDirectory()) out.push(...walkFiles(p, base));
+    else out.push(rel);
+  }
+  return out;
+}
+
+/**
+ * 把 npm runtime 包物化到客户机既有资产目录（默认 ~/.argent-dsh）。
+ * 只覆盖 engine 包内的文件；客户配置/凭据/.git 不动；被覆盖文件先备份。
+ */
+export function materializeRuntime({ target = join(homedir(), '.argent-dsh'), engine = engineRoot(), now = new Date() } = {}) {
+  if (!engine) return { ok: false, code: 'engine_missing', message: '未找到 @whyshu/argent-engine（启动器依赖未安装）' };
+  if (!existsSync(target)) mkdirSync(target, { recursive: true });
+  const version = readFileSync(join(engine, 'VERSION'), 'utf8').trim();
+  const stamp = now.toISOString().replace(/[:.]/g, '-');
+  const backupDir = join(target, '.runtime-backup', stamp);
+  const files = walkFiles(engine);
+  let copied = 0;
+  for (const rel of files) {
+    const src = join(engine, rel);
+    const dst = join(target, rel);
+    if (existsSync(dst)) {
+      const b = join(backupDir, rel);
+      mkdirSync(dirname(b), { recursive: true });
+      cpSync(dst, b);
+    }
+    mkdirSync(dirname(dst), { recursive: true });
+    cpSync(src, dst);
+    copied += 1;
+  }
+  mkdirSync(join(target, '.runtime-backup'), { recursive: true });
+  writeFileSync(join(target, 'RUNTIME_VERSION.json'), JSON.stringify({ package: '@whyshu/argent-engine', version, installedAt: now.toISOString(), files: copied, backupDir }, null, 2) + '\n');
+  return { ok: true, version, files: copied, target, backupDir };
+}
+
 export function profileDir(dshHome, profile = PROFILE_NAME) {
   return join(dshHome, 'profiles', profile);
 }
@@ -112,13 +169,16 @@ export function buildProfile({ dshHome = dshHomeOf(), profile = PROFILE_NAME, re
     dsh: { profile: { bundles } },
   };
   writeFileSync(join(dir, 'package.json'), JSON.stringify(pkg, null, 2) + '\n');
-  const patch = [
+  const patchLines = [
     '# @whyshu/argent 生成（幂等；手工改动会在此文件重生成时被覆盖）',
     '- id: agent-preset-registry',
     '  config:',
     `    default: ${DEFAULT_PRESET}`,
-    '',
-  ].join('\n');
+  ];
+  if (bundles.includes('@linxin666/dsh-client-ui-task-board')) {
+    patchLines.push('- insert:', '    - id: ui-task-board', "      name: '@linxin666/dsh-client-ui-task-board'");
+  }
+  const patch = patchLines.join('\n') + '\n';
   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');

package/package.json

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