@whyshu/argent 0.2.0 → 0.2.1

package/package.json

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

package/src/index.js

@@ -23,6 +23,7 @@ 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'
 
 const PKG_ROOT = dirname(dirname(fileURLToPath(import.meta.url)))
 const PKG_VERSION = (() => {
@@ -133,6 +134,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({

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,
+  }
+}