@whyshu/argent 0.1.3 → 0.1.5

package/bin/argent.mjs

@@ -9,12 +9,12 @@
  *
  * 公共参数：--dsh-home <dir>  --profile <name>  --repo <dir>  --json  --dry-run
  */
-import { spawn } from 'node:child_process';
-import { mkdirSync, writeFileSync, rmSync, existsSync } from 'node:fs';
-import { join } from 'node:path';
+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,
+  DSH_EXACT_VERSION, PROFILE_NAME, PROD_BUNDLES, buildLaunchdPlist, buildProfile, dshHomeOf, runnerScriptPath,
   depsInstalled, health, installDeps, loginWithPhone, pairRunner, probeDshVersion, readAuthToken, repoRoot, runnerConfigPath, sendLoginCode, versionMatches,
 } from '../lib/index.mjs';
 
@@ -45,6 +45,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 +79,7 @@ function ensureProfile({ install = true } = {}) {
     }
     console.error('✅ profile 依赖装配完成');
   }
+  if (install && !has('--no-install')) ensureBundleDeps();
   return built;
 }
 
@@ -161,7 +180,16 @@ function setupCommand() {
 }
 
 function serviceCommand(sub) {
-  const plist = buildLaunchdPlist({ dshHome: opts.dshHome, repo: opts.repo });
+  const bundled = runnerScriptPath({ repo: opts.repo });
+  // 固定 runner 路径：复制进 DSH_HOME，避免 launchd 指向 npx 临时缓存（缓存清理后失效）
+  const stableRunner = join(opts.dshHome, 'argent', 'runner', 'argent-runner.mjs');
+  const runnerPath = bundled ? stableRunner : '';
+  const plist = buildLaunchdPlist({ dshHome: opts.dshHome, repo: opts.repo, runnerPath });
+  if (sub === 'install' && bundled && !has('--print-only')) {
+    mkdirSync(dirname(stableRunner), { recursive: true });
+    copyFileSync(bundled, stableRunner);
+    chmodSync(stableRunner, 0o755);
+  }
   const outDir = val('--plist-dir', '');
   const targetDir = outDir || join(homedir(), 'Library', 'LaunchAgents');
   const target = join(targetDir, plist.file);

package/lib/index.mjs

@@ -112,13 +112,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');
@@ -190,8 +193,8 @@ export function runnerScriptPath({ repo = repoRoot() } = {}) {
 }
 
 /** P4 runner 的 launchd plist（macOS）；Linux 可换 systemd unit（TODO 发布前补） */
-export function buildLaunchdPlist({ dshHome = dshHomeOf(), repo = repoRoot(), nodeBin = process.execPath } = {}) {
-  const script = runnerScriptPath({ repo });
+export function buildLaunchdPlist({ dshHome = dshHomeOf(), repo = repoRoot(), nodeBin = process.execPath, runnerPath = '' } = {}) {
+  const script = runnerPath || runnerScriptPath({ repo });
   const logDir = join(dshHome, 'argent', 'runner', 'logs');
   return {
     file: `${RUNNER_LABEL}.plist`,

package/package.json

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