@whyshu/argent 0.2.6 → 0.2.8

package/package.json

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

package/src/index.js

@@ -227,39 +227,44 @@ export function apply(ctx) {
       }
     }
 
-    // MCP 网关（engine.* / erp.* / ml.*）
-    try {
-      const mcpClient = await hostImport('@deepseek-ai/dsh-mcp-client')
-      const mcpReady = ctx.plugin(mcpClient, {
-        transport: 'stdio',
-        serverName: 'argent',
-        command: process.execPath,
-        args: [join(PKG_ROOT, 'mcp', 'gateway.mjs')],
-        cwd: PKG_ROOT,
-        env: {
-          ARGENT_DATA_DIR: dataDir,
-          ARGENT_TENANT: TENANT,
-          ARGENT_ENGINE_DIR: engineDir,
-          ARGENT_GATEWAY_ML: process.env.ARGENT_GATEWAY_ML || '',
-        },
-        toolCallTimeoutMs: 180000,
-        failOnStartupError: false,
-      })
-      // 启动等待上限：网关子进程已起但 mcp-client 握手可能很慢（2026-11-07 本机实测挂起）
-      // ⇒ 超时只告警、不阻塞后续（隧道/ERP 连接器已在前面启动）。
-      const MCP_START_TIMEOUT_MS = 20_000
-      const raced = await Promise.race([
-        mcpReady.then(() => 'ok'),
-        new Promise((resolve) => {
-          const t = setTimeout(() => resolve('timeout'), MCP_START_TIMEOUT_MS)
-          t.unref?.()
-        }),
-      ])
-      if (raced === 'ok') console.log(`[argent] MCP 网关已注册（engineDir=${engineDir || '(无引擎)'}）`)
-      else console.warn(`[argent] MCP 网关握手超时（${MCP_START_TIMEOUT_MS}ms，后台继续；不影响隧道/ERP 连接器）`)
-    } catch (e) {
-      console.error('[argent] MCP 网关注册失败（其余功能不受影响）:', e?.message || e)
-    }
+    // ⛔ 2026-11-07 实测：启动阶段 ctx.plugin(dsh-mcp-client) 会挂起 dsh 启动（端口 bound 但 HTTP 不响应），
+    //    用户侧表现为「dsh 启动失败」；只有删插件才能启动。故：默认延后注册，且可用 ARGENT_MCP_DISABLE=1 关闭。
+    if (process.env.ARGENT_MCP_DISABLE === '1') {
+      console.log('[argent] MCP 网关已禁用（ARGENT_MCP_DISABLE=1）')
+    } else setTimeout(() => { void (async () => {
+      try {
+        const mcpClient = await hostImport('@deepseek-ai/dsh-mcp-client')
+        const mcpReady = ctx.plugin(mcpClient, {
+          transport: 'stdio',
+          serverName: 'argent',
+          command: process.execPath,
+          args: [join(PKG_ROOT, 'mcp', 'gateway.mjs')],
+          cwd: PKG_ROOT,
+          env: {
+            ARGENT_DATA_DIR: dataDir,
+            ARGENT_TENANT: TENANT,
+            ARGENT_ENGINE_DIR: engineDir,
+            ARGENT_GATEWAY_ML: process.env.ARGENT_GATEWAY_ML || '',
+          },
+          toolCallTimeoutMs: 180000,
+          failOnStartupError: false,
+        })
+        // 启动等待上限：网关子进程已起但 mcp-client 握手可能很慢（2026-11-07 本机实测挂起）
+        // ⇒ 超时只告警、不阻塞后续（隧道/ERP 连接器已在前面启动）。
+        const MCP_START_TIMEOUT_MS = 20_000
+        const raced = await Promise.race([
+          mcpReady.then(() => 'ok'),
+          new Promise((resolve) => {
+            const t = setTimeout(() => resolve('timeout'), MCP_START_TIMEOUT_MS)
+            t.unref?.()
+          }),
+        ])
+        if (raced === 'ok') console.log(`[argent] MCP 网关已注册（engineDir=${engineDir || '(无引擎)'}）`)
+        else console.warn(`[argent] MCP 网关握手超时（${MCP_START_TIMEOUT_MS}ms，后台继续；不影响隧道/ERP 连接器）`)
+      } catch (e) {
+        console.error('[argent] MCP 网关注册失败（其余功能不受影响）:', e?.message || e)
+      }
+    })(); }, 5000)
 
     // ERP 连接器：只有 poller 才启动（UI 端不抢队列）
     if (role === 'poller') {

package/src/tunnel.mjs

@@ -530,18 +530,33 @@ export function startTunnel(options = {}) {
   }
 
   // ── dsh 准入 cookie（仅内存；401/403 重换一次）──────────────────────────
+  // dsh 准入 token 的三条来源（优先级：env → 启动脚本写出的 token 文件 → 本机 /api/argent-state/access）
+  // 为什么需要文件来源：`/api/argent-state/access` 由 argent-core 插件提供；单插件（@whyshu/argent）装配下
+  // 该端点 401 ⇒ 隧道拿不到 token ⇒ App 侧表现为 access-unavailable（2026-11-07 实测）。
+  const readTokenFile = () => {
+    try {
+      const t = readFileSync(join(String(options.dataDir || ''), 'dsh-web.token'), 'utf8').trim()
+      return t || ''
+    } catch { return '' }
+  }
   const acquireCookie = async ({ refresh = false } = {}) => {
     if (!refresh && dsh.cookie) return dsh.cookie
-    let access
-    try {
-      access = await fetchImpl(`${dshBase}${DSH_ACCESS_PATH}`, {
-        headers: { accept: 'application/json' },
-        signal: AbortSignal.timeout(5000),
-      })
-    } catch { throw err('access-unreachable') }
     let body = null
-    try { body = await access.json() } catch { body = null }
-    if (!access.ok || !body || body.ok !== true || !body.token) throw err('access-unavailable', `HTTP ${access.status}`)
+    const envToken = String(env.ARGENT_DSH_TOKEN || '').trim()
+    const fileToken = envToken ? '' : readTokenFile()
+    if (envToken || fileToken) {
+      body = { ok: true, token: envToken || fileToken }
+    } else {
+      let access
+      try {
+        access = await fetchImpl(`${dshBase}${DSH_ACCESS_PATH}`, {
+          headers: { accept: 'application/json' },
+          signal: AbortSignal.timeout(5000),
+        })
+      } catch { throw err('access-unreachable') }
+      try { body = await access.json() } catch { body = null }
+      if (!access.ok || !body || body.ok !== true || !body.token) throw err('access-unavailable', `HTTP ${access.status}`)
+    }
     let res
     try {
       res = await fetchImpl(`${dshBase}/?token=${encodeURIComponent(String(body.token))}`, {