@whyshu/argent 0.2.0 → 0.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whyshu/argent",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "type": "module",
   "description": "Argent 单 bundle（dsh web / DSH Desktop 同一插件）：ERP 连接器 + 问述代理 + 登录/续期 + MCP 网关 + 伞伞桌宠（含积分）",
   "main": "src/index.js",
@@ -36,5 +36,8 @@
     "plugin": {
       "displayName": "Argent（ERP + 问述代理 + 伞伞）"
     }
+  },
+  "dependencies": {
+    "@whyshu/argent-engine": "0.8.0-rc.12"
   }
 }

package/src/index.js

@@ -23,6 +23,8 @@ import { startOfficeRuntime } from './office-runtime.js'
 import { registerWhyshuAuth } from './whyshu-auth.mjs'
 import { acquireLease, heartbeatLease, releaseLease, leaseHolder } from './lease.mjs'
 import { resolveAccountToken } from './account-token.mjs'
+import { installMachineSessionReporter } from './machine-session.mjs'
+import { syncRuntimeIfNeeded } from './runtime-sync.mjs'
 
 const PKG_ROOT = dirname(dirname(fileURLToPath(import.meta.url)))
 const PKG_VERSION = (() => {
@@ -133,6 +135,13 @@ export function apply(ctx) {
     console.error('[argent] 登录端点注册失败:', e?.message || e)
   }
 
+  // ②.5 机器任务会话登记（计费互斥甲）：监听 session/title 命中「后台派发：」⇒ 登记 sessionId
+  try {
+    installMachineSessionReporter(ctx, { dataDir })
+  } catch (e) {
+    console.error('[argent] 机器任务会话登记安装失败（不影响其它功能）:', e?.message || e)
+  }
+
   // ③ 账号面板端点（poller/ui 都注册：积分显示与轮询无关）
   try {
     ctx.webServer.register({
@@ -170,6 +179,13 @@ export function apply(ctx) {
 
   // ⑤ 内核解析 → 租约 → MCP 网关 → ERP 连接器（全部在异步块里，串行避免 dataDir 竞态）
   void (async () => {
+    // 运行时跟随插件：插件 pin 的 engine 版本若新于 ~/.argent-dsh，先同步（失败只告警）
+    try {
+      const r = syncRuntimeIfNeeded({ log: (m) => console.log(m) })
+      if (r && r.action !== 'up_to_date' && r.action !== 'installed_newer') console.log('[argent] runtime sync:', JSON.stringify(r))
+    } catch (e) {
+      console.error('[argent] 运行时同步失败（继续启动）:', e?.message || e)
+    }
     try {
       const k = await resolveKernel().catch(() => null)
       if (k?.mod?.resolveDataDir) {

package/src/machine-session.mjs

@@ -0,0 +1,114 @@
+/**
+ * 机器任务会话登记（2026-11-07，计费互斥甲端到端；与 whyshu-svr machine-sessions 配套）
+ *
+ * 链路：argent-runner → dsh /api/task-board → agent → 问述代理。
+ * runner 建卡时把标题设为 `后台派发：<preset>`；dsh 会把标题写入 `session/title` 事件。
+ * 本模块监听会话标题事件，命中机器任务前缀时把 sessionId 登记到服务端（TTL），
+ * 代理侧随后按 `x-deepseek-harness-session-id` 命中注册表 ⇒ 只记 cost_audit（0 积分）。
+ *
+ * 失败策略：任何异常只告警，不影响任务执行/聊天。
+ */
+import { existsSync, readFileSync } from 'node:fs'
+import { homedir } from 'node:os'
+import { join } from 'node:path'
+
+export const DEFAULT_TITLE_PREFIX = '后台派发：'
+
+/** 纯函数：标题是否机器任务（runner 建卡前缀；可被 env 覆盖）。 */
+export function isMachineTaskTitle(title, prefix = DEFAULT_TITLE_PREFIX) {
+  const t = String(title || '').trim()
+  return Boolean(t) && t.startsWith(prefix)
+}
+
+/** 读取本机 agent-report（machineId / machineToken）；读不到返回空。 */
+export function readAgentReport(dataDir) {
+  try {
+    const dir = dataDir || process.env.ARGENT_DATA_DIR || join(homedir(), '.dsh', 'argent')
+    const file = join(dir, 'agent-report.json')
+    if (!existsSync(file)) return {}
+    const raw = JSON.parse(readFileSync(file, 'utf8'))
+    return {
+      machineId: String(raw?.machineId || '').trim(),
+      machineToken: String(raw?.machineToken || '').trim(),
+      tenantAppId: String(raw?.tenantAppId || '').trim(),
+      serverUrl: String(raw?.serverUrl || '').trim(),
+    }
+  } catch {
+    return {}
+  }
+}
+
+/**
+ * 安装会话标题监听：命中机器任务 ⇒ 登记 sessionId（幂等；同会话只登记一次）。
+ * @returns {{stop:()=>void, registered:Set<string>, debug:()=>object}}
+ */
+export function installMachineSessionReporter(ctx, {
+  dataDir = process.env.ARGENT_DATA_DIR || join(homedir(), '.dsh', 'argent'),
+  tenant = process.env.ARGENT_TENANT || 'ly-0001',
+  apiBase = (process.env.ARGENT_API_BASE || 'https://whyshu.com').replace(/\/+$/, ''),
+  prefix = process.env.ARGENT_MACHINE_TITLE_PREFIX || DEFAULT_TITLE_PREFIX,
+  fetchImpl = globalThis.fetch,
+  log = (m) => console.log(`[argent] ${m}`),
+} = {}) {
+  const registered = new Set()
+  const disposers = []
+  const report = readAgentReport(dataDir)
+
+  const debug = () => ({
+    prefix,
+    hasMachineToken: Boolean(report.machineToken),
+    machineId: report.machineId,
+    registered: [...registered],
+  })
+
+  const register = async (sessionId) => {
+    const sid = String(sessionId || '').trim()
+    if (!sid || registered.has(sid)) return
+    registered.add(sid)
+    if (!report.machineToken) {
+      log(`机器任务会话 ${sid} 未登记：缺 agent-report.machineToken`)
+      return
+    }
+    try {
+      const res = await fetchImpl(`${apiBase}/api/argent/v1/tenants/${encodeURIComponent(tenant)}/machine-sessions`, {
+        method: 'POST',
+        headers: { 'content-type': 'application/json', 'x-api-key': report.machineToken },
+        body: JSON.stringify({ sessionId: sid, machineId: report.machineId }),
+        signal: AbortSignal.timeout(5000),
+      })
+      if (!res.ok) {
+        registered.delete(sid)
+        log(`机器任务会话登记失败（HTTP ${res.status}）：${sid}`)
+      } else {
+        log(`机器任务会话已登记：${sid}`)
+      }
+    } catch (e) {
+      registered.delete(sid)
+      log(`机器任务会话登记异常：${String(e?.message || e).slice(0, 120)}`)
+    }
+  }
+
+  const checkEvent = (session, event) => {
+    try {
+      if (!event || event.type !== 'session/title') return
+      const data = event.data || {}
+      if (!isMachineTaskTitle(data.title, prefix)) return
+      void register(session?.id || event.sessionId)
+    } catch { /* best-effort */ }
+  }
+
+  try { disposers.push(ctx.on('session/event', checkEvent)) } catch { /* 宿主无此事件 */ }
+  try {
+    disposers.push(ctx.on('session/created', (session) => {
+      // 少数宿主在 created 时已带标题（兜底；通常标题事件稍后到）
+      const title = session?.header?.title || session?.title
+      if (isMachineTaskTitle(title, prefix)) void register(session?.id)
+    }))
+  } catch { /* 宿主无此事件 */ }
+
+  return {
+    stop: () => { for (const d of disposers) { try { d?.() } catch { /* noop */ } } },
+    registered,
+    debug,
+  }
+}

package/src/office-runtime.js

@@ -414,6 +414,17 @@ export function startOfficeRuntime(ctx, { dataDir } = {}) {
   const CHAT_HEARTBEAT_MS = 30 * 1000
   const TASK_MAX_MS = 45 * 60 * 1000
 
+  // ── 办公室角色（P2 机器对话/新建会话）────────────────────────────────────
+  // 与 `plugins/argent-erp/presets/argent-office.patch.yml` 对齐：
+  //  · ⚠️ **不**把 create_session 的缺省 preset 改成 argent-office —— ERP「AI 团队」是问述内部用的；
+  //  · 只有 ERP **显式**选到 argent-office 时，才把该会话模型钉死为问述代理（走问述积分）。
+  // 均可由 env 覆盖，交给客户机按部署改，不必改代码。
+  const OFFICE_PRESET = process.env.ARGENT_OFFICE_PRESET || 'argent-office'
+  const OFFICE_MODEL = {
+    provider: process.env.ARGENT_OFFICE_MODEL_PROVIDER || 'whyshu',
+    model: process.env.ARGENT_OFFICE_MODEL || 'deepseek-flash',
+  }
+
   ctx.effect(() => {
     const off = ctx.on('session/event', (session, event) => {
       const sid = String(session?.id || '')
@@ -864,9 +875,20 @@ export function startOfficeRuntime(ctx, { dataDir } = {}) {
       try {
         const sc = ctx.get('sessionController') || ctx.sessionController
         if (!sc || typeof sc.create !== 'function') throw new Error('sessionController.create 不可用（该 dsh 版本不支持）')
-        const created = await sc.create({ agentPreset: String(command.preset || '') || undefined })
+        // ⚠️ ERP「AI 团队」是问述内部用的，不要把它缺省接管成六禾园办公室角色；
+        // 缺省仍是宿主默认（standard），只有 ERP 显式指定 preset 时才按指定来。
+        const preset = String(command.preset || '') || undefined
+        const created = await sc.create({ agentPreset: preset })
         resultSessionId = String(created?.sessionId || '')
         if (!resultSessionId) throw new Error('create 未返回 sessionId')
+        // 办公室角色：把模型钉成问述代理（失败不致命，会话照常可用）
+        if (preset === OFFICE_PRESET && typeof sc.selectModel === 'function') {
+          try {
+            await sc.selectModel({ sessionId: resultSessionId, ...OFFICE_MODEL })
+          } catch (e) {
+            log('warn', `会话模型钉选失败（不影响新建）：${trunc(e?.message || e, 160)}`)
+          }
+        }
       } catch (e) {
         status = 'failed'
         error = trunc(e?.message || e, 300)

package/src/runtime-sync.mjs

@@ -0,0 +1,113 @@
+/**
+ * 运行时跟随插件（2026-11-07）：插件启动时把依赖的 @whyshu/argent-engine 同步到 ~/.argent-dsh。
+ *
+ * 目标：以后 UI 升级 @whyshu/argent 插件，pnpm 会同时装上插件 pin 的 engine 依赖；
+ * 插件启动时把 engine 文件刷到运行时目录 ⇒ 不再需要启动器/单独 runtime install。
+ *
+ * 安全边界：
+ *  · 只写引擎文件（scripts/core/verticals/configs/agents/skills/tools/agentic + VERSION）；
+ *    ⛔ 不动 venv、数据、台账、agent-report、license；
+ *  · 只在 bundled 版本比已装新（或未装）时同步；已装更新则跳过（防降级）；
+ *  · 覆盖前备份差异文件到 <target>/.runtime-backup/<ts>/；失败只告警不阻断插件启动。
+ */
+import { createRequire } from 'node:module'
+import { existsSync, readFileSync, writeFileSync, mkdirSync, copyFileSync, statSync, chmodSync, readdirSync } from 'node:fs'
+import { dirname, join, relative, sep } from 'node:path'
+import { homedir } from 'node:os'
+import { fileURLToPath } from 'node:url'
+import { createHash } from 'node:crypto'
+
+const sha = (buf) => createHash('sha256').update(buf).digest('hex')
+
+/** 版本比较（支持 0.8.0-rc.11 / 0.8.0 / 1.2.3）；无法解析时按字符串比较。 */
+export function compareVersions(a, b) {
+  const parse = (v) => {
+    const m = String(v || '').trim().match(/^(\d+)\.(\d+)\.(\d+)(?:-([a-z]+)\.?(\d+)?)?/i)
+    if (!m) return null
+    return [Number(m[1]), Number(m[2]), Number(m[3]), m[4] || '', Number(m[5] || 0)]
+  }
+  const x = parse(a); const y = parse(b)
+  if (!x || !y) return String(a || '').localeCompare(String(b || ''))
+  for (let i = 0; i < 3; i += 1) if (x[i] !== y[i]) return x[i] < y[i] ? -1 : 1
+  // 正式版 > 预发布（0.8.0 > 0.8.0-rc.12）
+  if (!x[3] && y[3]) return 1
+  if (x[3] && !y[3]) return -1
+  if (x[3] !== y[3]) return String(x[3]).localeCompare(String(y[3]))
+  if (x[4] !== y[4]) return x[4] < y[4] ? -1 : 1
+  return 0
+}
+
+/** 解析插件依赖的 engine 包目录（未安装返回 ''）。 */
+export function resolveBundledEngineDir() {
+  try {
+    const require = createRequire(import.meta.url)
+    const pkgJson = require.resolve('@whyshu/argent-engine/package.json')
+    return dirname(pkgJson)
+  } catch {
+    return ''
+  }
+}
+
+export function installedRuntimeVersion(target = join(homedir(), '.argent-dsh')) {
+  try { return String(readFileSync(join(target, 'VERSION'), 'utf8')).trim() } catch { return '' }
+}
+
+function listFiles(dir, base = dir) {
+  const out = []
+  for (const e of readdirSync(dir)) {
+    const p = join(dir, e)
+    if (statSync(p).isDirectory()) out.push(...listFiles(p, base))
+    else out.push(relative(base, p).split(sep).join('/'))
+  }
+  return out
+}
+
+/**
+ * 同步运行时（bundle → target）。
+ * @returns {{ok:boolean, action:'no_bundle'|'up_to_date'|'installed_newer'|'synced', from?:string, to?:string, files?:number, backupDir?:string}}
+ */
+export function syncRuntimeIfNeeded({
+  target = join(homedir(), '.argent-dsh'),
+  bundledDir = resolveBundledEngineDir(),
+  log = () => {},
+} = {}) {
+  if (!bundledDir || !existsSync(join(bundledDir, 'engine'))) return { ok: false, action: 'no_bundle' }
+  const src = join(bundledDir, 'engine')
+  const bundledVersion = (() => { try { return readFileSync(join(src, 'VERSION'), 'utf8').trim() } catch { return '' } })()
+  if (!bundledVersion) return { ok: false, action: 'no_bundle' }
+  const current = installedRuntimeVersion(target)
+  if (current && compareVersions(bundledVersion, current) < 0) {
+    return { ok: true, action: 'installed_newer', from: current, to: bundledVersion }
+  }
+  if (current && compareVersions(bundledVersion, current) === 0) {
+    return { ok: true, action: 'up_to_date', from: current, to: bundledVersion }
+  }
+  const manifestPath = join(bundledDir, 'MANIFEST.json')
+  let manifest = null
+  try { manifest = JSON.parse(readFileSync(manifestPath, 'utf8')) } catch { manifest = null }
+  const files = listFiles(src)
+  const ts = new Date().toISOString().replace(/[:.]/g, '-')
+  const backup = join(target, '.runtime-backup', `plugin-sync-${ts}`)
+  mkdirSync(backup, { recursive: true })
+  let copied = 0
+  for (const rel of files) {
+    const s = join(src, rel)
+    const d = join(target, rel)
+    if (existsSync(d)) {
+      try {
+        if (sha(readFileSync(d)) !== sha(readFileSync(s))) {
+          const b = join(backup, rel)
+          mkdirSync(dirname(b), { recursive: true })
+          copyFileSync(d, b)
+        }
+      } catch { /* 备份失败继续 */ }
+    }
+    mkdirSync(dirname(d), { recursive: true })
+    copyFileSync(s, d)
+    chmodSync(d, rel.endsWith('.sh') ? 0o755 : 0o644)
+    copied += 1
+  }
+  writeFileSync(join(target, 'VERSION'), `${bundledVersion}\n`)
+  log(`[argent] 运行时已跟随插件更新：${current || '(未安装)'} → ${bundledVersion}（${copied} 个文件，备份 ${backup}）`)
+  return { ok: true, action: 'synced', from: current || '', to: bundledVersion, files: copied, backupDir: backup, manifest: Boolean(manifest) }
+}