@whyshu/argent 0.1.2 → 0.1.3

package/README.md

@@ -13,6 +13,7 @@ npx -y @whyshu/argent service install   # 生成 launchd（macOS）/ systemd（L
 
 - 启动器 **exact pin** `@deepseek-ai/dsh@0.2.1-rc.2`，避免混合版本事故；
 - profile 由启动器生成：bundles（base/web-app/argent-presets，可用 `--bundles a,b` 追加）+ 用户层 patch（默认角色 preset）；
+- 发布包内置 `runner/argent-runner.mjs`，`service install` 可直接生成 launchd；
 - `setup` 会自动执行 `dsh plugin --profile argent install` 装配依赖（`--no-install` 可跳过）；
 - 两种装配模式：本地仓库（`ARGENT_REPO`/`--repo`，插件用 `file:`）与**发布模式**（无本地 plugins/ 时用启动器 package.json 的 npm 版本）；
 - 首跑写入 `$DSH_HOME/argent/runner.json`（600，含 serverUrl/tenantAppId/runnerToken）；

package/lib/index.mjs

@@ -182,6 +182,9 @@ export function runnerConfigPath(dshHome = dshHomeOf()) {
 }
 
 export function runnerScriptPath({ repo = repoRoot() } = {}) {
+  // 发布包内置 runner（0.1.3 起）；本地仓库联调回退 scripts/argent-runner.mjs
+  const bundled = join(dirname(fileURLToPath(import.meta.url)), '..', 'runner', 'argent-runner.mjs');
+  if (existsSync(bundled)) return bundled;
   const candidate = join(repo, 'scripts', 'argent-runner.mjs');
   return existsSync(candidate) ? candidate : '';
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whyshu/argent",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Argent 启动器：一条命令启动「打包好的 dsh + Argent 插件/角色预设」，并管理本机 runner 常驻。",
   "type": "module",
   "bin": {
@@ -19,6 +19,7 @@
   "files": [
     "bin/",
     "lib/",
+    "runner/",
     "README.md"
   ],
   "license": "MIT",

package/runner/argent-runner.mjs

@@ -0,0 +1,223 @@
+#!/usr/bin/env node
+/**
+ * P4 本机 runner（客户机侧）—— 后台 Pull 派发 + 租约 的执行端。
+ *
+ * 链路：
+ *   ① 用 runner token 向数据中心长轮询领取作业（claim）
+ *   ② 若本机 dsh web 在跑：通过其 task-board HTTP API（同机 loopback，无需 token）
+ *      建卡（pin job.preset）→ 运行 → 轮询直到执行结束
+ *   ③ 把结果 complete 回数据中心（写 Run + 回写卡状态）
+ *   · 执行期间每 30s 发一次心跳续租；租约超时则由服务端回收、别的 runner 可重领
+ *
+ * 用法：
+ *   node scripts/argent-runner.mjs --config ~/.dsh/argent/runner.json          # 常驻循环
+ *   node scripts/argent-runner.mjs --config ... --once                          # 领一个作业就退出（验收/调试）
+ *   node scripts/argent-runner.mjs --health                                     # 只做连通性自检
+ *
+ * 配置文件（600，示例）：
+ * {
+ *   "serverUrl": "https://whyshu.com",
+ *   "tenantAppId": "ly-0001",
+ *   "runnerToken": "eyJ…",
+ *   "dshWebUrl": "http://127.0.0.1:3080",
+ *   "leaseSec": 90,
+ *   "pollWaitMs": 20000,
+ *   "execTimeoutSec": 900
+ * }
+ * ⛔ 不打印 token；⛔ 只允许对 dshWebUrl 的本机地址发请求（校验 host 为 loopback）。
+ */
+import { readFileSync, mkdirSync, appendFileSync } from 'node:fs';
+import { randomUUID } from 'node:crypto';
+import { homedir, hostname } from 'node:os';
+import { join } from 'node:path';
+
+const argv = process.argv.slice(2);
+const has = (f) => argv.includes(f);
+const val = (f, d = '') => { const i = argv.indexOf(f); return i > -1 ? (argv[i + 1] ?? d) : d; };
+
+const CONFIG_PATH = val('--config', join(homedir(), '.dsh', 'argent', 'runner.json'));
+const ONCE = has('--once');
+const HEALTH_ONLY = has('--health');
+const DRY_RUN = has('--dry-run');
+const LOG_DIR = join(homedir(), '.dsh', 'argent', 'runner');
+
+function log(event, extra = {}) {
+  const line = JSON.stringify({ ts: new Date().toISOString(), event, ...extra });
+  console.log(line);
+  try { mkdirSync(LOG_DIR, { recursive: true }); appendFileSync(join(LOG_DIR, 'runner.ndjson'), line + '\n'); } catch { /* 日志失败不影响执行 */ }
+}
+
+function loadConfig() {
+  let cfg = {};
+  try { cfg = JSON.parse(readFileSync(CONFIG_PATH, 'utf8')); } catch (error) {
+    console.error(`❌ 读不到配置 ${CONFIG_PATH}: ${error.message}`);
+    process.exit(2);
+  }
+  const merged = {
+    serverUrl: String(process.env.ARGENT_SERVER_URL || cfg.serverUrl || '').replace(/\/+$/, ''),
+    tenantAppId: String(process.env.ARGENT_TENANT_APP_ID || cfg.tenantAppId || ''),
+    runnerToken: String(process.env.ARGENT_RUNNER_TOKEN || cfg.runnerToken || ''),
+    dshWebUrl: String(process.env.ARGENT_DSH_WEB_URL || cfg.dshWebUrl || 'http://127.0.0.1:3080').replace(/\/+$/, ''),
+    leaseSec: Number(cfg.leaseSec) || 90,
+    pollWaitMs: Number(cfg.pollWaitMs) || 20000,
+    execTimeoutSec: Number(cfg.execTimeoutSec) || 900,
+    runnerId: String(cfg.runnerId || `runner-${hostname().toLowerCase().replace(/[^a-z0-9-]/g, '-')}`),
+  };
+  for (const k of ['serverUrl', 'tenantAppId', 'runnerToken']) {
+    if (!merged[k]) { console.error(`❌ 配置缺少 ${k}（${CONFIG_PATH}）`); process.exit(2); }
+  }
+  const web = new URL(merged.dshWebUrl);
+  if (!['127.0.0.1', 'localhost', '::1'].includes(web.hostname)) {
+    console.error(`❌ dshWebUrl 必须是本机地址（当前 ${web.hostname}）`); process.exit(2);
+  }
+  return merged;
+}
+
+const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
+
+function serverHeaders(cfg) {
+  return { authorization: `Bearer ${cfg.runnerToken}`, 'content-type': 'application/json' };
+}
+
+async function serverCall(cfg, path, { method = 'GET', body } = {}) {
+  const res = await fetch(`${cfg.serverUrl}/api/argent/v1/tenants/${cfg.tenantAppId}${path}`, {
+    method, headers: serverHeaders(cfg), body: body === undefined ? undefined : JSON.stringify(body),
+  });
+  const text = await res.text();
+  let data = null;
+  try { data = JSON.parse(text); } catch { data = text; }
+  if (!res.ok) throw new Error(`${method} ${path} → ${res.status} ${data?.error?.code || ''} ${data?.error?.message || ''}`.trim());
+  return data;
+}
+
+/** task-board 同机 HTTP API（loopback + same-origin marker；不需要 dsh web token） */
+async function tbAction(cfg, action) {
+  const res = await fetch(`${cfg.dshWebUrl}/api/task-board/action`, {
+    method: 'POST',
+    headers: { 'content-type': 'application/json', 'sec-fetch-site': 'same-origin' },
+    body: JSON.stringify({ requestId: randomUUID(), action }),
+  });
+  const text = await res.text();
+  let data = null;
+  try { data = JSON.parse(text); } catch { data = text; }
+  return { status: res.status, data };
+}
+
+async function tbState(cfg) {
+  const res = await fetch(`${cfg.dshWebUrl}/api/task-board/state`, { headers: { 'sec-fetch-site': 'same-origin' } });
+  if (!res.ok) throw new Error(`task-board state → ${res.status}`);
+  return res.json();
+}
+
+/** 执行一个作业：建卡 → 运行 → 等待结算；返回 { outcome, summary, sessionRef } */
+async function executeJob(cfg, job) {
+  const taskId = randomUUID();
+  const create = await tbAction(cfg, {
+    kind: 'create', id: taskId,
+    input: {
+      title: job.title || `后台派发：${job.preset}`,
+      description: String(job.prompt || '').slice(0, 500),
+      prompt: job.prompt,
+      mode: job.preset,
+    },
+  });
+  if (create.status !== 200) {
+    return { outcome: 'failed', summary: `task-board create 失败：HTTP ${create.status} ${JSON.stringify(create.data).slice(0, 300)}` };
+  }
+  log('job.task.created', { jobId: String(job._id), taskId, preset: job.preset });
+
+  const run = await tbAction(cfg, { kind: 'run', taskId });
+  if (run.status !== 200) {
+    return { outcome: 'failed', summary: `task-board run 失败：HTTP ${run.status} ${JSON.stringify(run.data).slice(0, 300)}`, taskId };
+  }
+  log('job.task.running', { jobId: String(job._id), taskId });
+
+  const deadline = Date.now() + cfg.execTimeoutSec * 1000;
+  while (Date.now() < deadline) {
+    await sleep(2000);
+    const state = await tbState(cfg);
+    const task = (state.tasks || []).find((t) => t.id === taskId);
+    if (!task) continue;
+    const execs = task.executions || [];
+    const latest = execs[execs.length - 1];
+    if (latest && latest.endedAt) {
+      const outcome = latest.result === 'succeeded' ? 'succeeded' : 'failed';
+      return { outcome, summary: latest.error ? String(latest.error).slice(0, 500) : '', sessionRef: latest.sessionId || '', taskId };
+    }
+  }
+  return { outcome: 'failed', summary: `执行超时（>${cfg.execTimeoutSec}s）`, taskId };
+}
+
+async function runOnce(cfg) {
+  const claim = await serverCall(cfg, '/jobs/claim', { method: 'POST', body: { runnerId: cfg.runnerId, waitMs: ONCE ? 0 : cfg.pollWaitMs, leaseSec: cfg.leaseSec } });
+  const job = claim?.data?.job;
+  if (!job) return { claimed: false };
+  log('job.claimed', { jobId: String(job._id), preset: job.preset, attempts: job.attempts, runnerId: cfg.runnerId });
+  if (DRY_RUN) { log('job.dry-run', { jobId: String(job._id) }); return { claimed: true, dryRun: true }; }
+
+  // 心跳续租（执行期间每 30s）
+  let heartbeatTimer = null;
+  const startHeartbeat = () => {
+    heartbeatTimer = setInterval(async () => {
+      try {
+        await serverCall(cfg, `/jobs/${job._id}/heartbeat`, { method: 'POST', body: { runnerId: cfg.runnerId, leaseSec: cfg.leaseSec } });
+        log('job.heartbeat', { jobId: String(job._id) });
+      } catch (error) {
+        log('job.heartbeat.error', { jobId: String(job._id), message: error.message });
+      }
+    }, 30_000);
+    if (typeof heartbeatTimer.unref === 'function') heartbeatTimer.unref();
+  };
+
+  startHeartbeat();
+  let result;
+  try {
+    result = await executeJob(cfg, job);
+  } finally {
+    if (heartbeatTimer) clearInterval(heartbeatTimer);
+  }
+
+  try {
+    const done = await serverCall(cfg, `/jobs/${job._id}/complete`, {
+      method: 'POST',
+      body: {
+        runnerId: cfg.runnerId, outcome: result.outcome,
+        summary: result.summary || '', sessionRef: result.sessionRef || '',
+      },
+    });
+    log('job.completed', { jobId: String(job._id), outcome: result.outcome, runId: done?.data?.run?._id || null, taskId: result.taskId || null });
+    return { claimed: true, outcome: result.outcome };
+  } catch (error) {
+    log('job.complete.error', { jobId: String(job._id), message: error.message });
+    return { claimed: true, outcome: result.outcome, completeError: error.message };
+  }
+}
+
+async function health(cfg) {
+  const out = { server: false, dshWeb: false, tenantAppId: cfg.tenantAppId, runnerId: cfg.runnerId };
+  try {
+    const res = await fetch(`${cfg.serverUrl}/api/argent/v1/health`);
+    out.server = res.ok;
+  } catch { /* noop */ }
+  try {
+    const state = await tbState(cfg);
+    out.dshWeb = true;
+    out.boardRevision = state.revision;
+  } catch { /* noop */ }
+  console.log(JSON.stringify(out));
+  return out;
+}
+
+async function main() {
+  const cfg = loadConfig();
+  log('runner.start', { runnerId: cfg.runnerId, tenantAppId: cfg.tenantAppId, server: new URL(cfg.serverUrl).origin, dshWeb: new URL(cfg.dshWebUrl).origin, once: ONCE });
+  if (HEALTH_ONLY) { const h = await health(cfg); process.exit(h.server && h.dshWeb ? 0 : 1); }
+  let stopping = false;
+  process.on('SIGINT', () => { stopping = true; log('runner.stop', {}); process.exit(0); });
+  process.on('SIGTERM', () => { stopping = true; log('runner.stop', {}); process.exit(0); });
+  do {
+    try { await runOnce(cfg); } catch (error) { log('runner.error', { message: error.message }); await sleep(3000); }
+  } while (!ONCE && !stopping);
+}
+
+main().catch((error) => { console.error(`❌ runner 失败: ${error.message}`); process.exit(1); });