@forcome/ai-cli 0.1.1 → 0.1.5

package/README.md

@@ -8,7 +8,10 @@ Forcome AI 门户命令行——默认指向 https://ai.forcome.com，透传官
 ```bash
 npm i -g @forcome/ai-cli
 fai login            # 浏览器钉钉扫码授权（首次）
+fai connect --daemon # 让本机在 Web「执行设备」里保持在线
+fai device status    # 查看在线状态
 fai agent list       # 列助理
+fai agent run --agent-id <id> --device local -p "..." # 通过 Forcome agent gateway 调用本机
 fai gen text -m newapi/gpt-5.5 --stream "你好"   # 生成文本（必须显式 newapi 模型 + --stream）
 ```
 
@@ -26,19 +29,30 @@ API key 模式仅支持 tRPC 命令（`agent` / `gen` / `provider` / `model`）
 
 ```bash
 LOBEHUB_SERVER=https://staging.forcome.com fai login
+LOBEHUB_DEVICE_GATEWAY=https://staging.forcome.com/device-gateway fai connect
+AGENT_GATEWAY_URL=https://staging.forcome.com/agent-gateway fai agent run --agent-id <id> --device local -p "..."
 ```
 
 ## 已知限制（phase 1）
 
 - `lh gen text` 默认模型 `openai/gpt-4o-mini` 在本门户不可用（`ENABLED_OPENAI=0`）——**必须 `-m newapi/<model>`**，且加 `--stream`（非 stream 模式 server 返 SSE 流致 JSON 解析失败）。可用模型见 `fai model list newapi`。
-- `fai agent run`（实时 agent 执行）、`fai connect`（设备配对）依赖未部署的 agent-gateway / device-gateway，暂不支持。
+- `fai connect` / `fai status` 默认使用 `https://ai.forcome.com/device-gateway`。
+- `fai agent run` 默认使用 `https://ai.forcome.com/agent-gateway`；否则官方 CLI 会回落到 `https://agent-gateway.lobehub.com`，自建站 token 会验签失败。
+- Web 端通过 CLI 控制本机需要先运行 `fai connect --daemon`；仅 `fai login` 只会注册设备，不会让设备在线。
 
 ## 排障
 
 - `lh login` 的授权 URL 是 `http://192.168.16.157/...`（内网 IP）→ nginx `/oidc/` location 强制头丢了，见 [troubleshooting §8.109](../docs/troubleshooting.md)。
-- `fai: command not found` 或 `未找到 lh 命令` → 先 `npm i -g @lobehub/cli`（`fai` 依赖它）。
+- `fai: command not found` → 确认 npm 全局 bin 或 Windows 安装器写入的 `%LOCALAPPDATA%\ForcomeAI\cli\bin` 已进入当前终端 PATH。
 - `agent list` 报 procedure not found → CLI 与 server tRPC 版本漂移，pin 与当前 server 同源的 `@lobehub/cli`。
+- **「接入助理」扫描失败 `Unknown tool API: <name>`** → 同一类版本漂移的另一个面：**工具 API** 漂移。
+  该报错只由 `apps/cli/src/tools/index.ts`（CLI 自己的工具分发器）抛出，**与 device-gateway 无关**
+  （网关只按名字转发，不实现工具）。判据：把报错里的工具名拿去比对上游 `apps/cli/src/tools/`，
+  看它是哪个版本引入的。实例：`scanHeterogeneousAgents` 由 #17794 引入、首发于 `@lobehub/cli 0.0.47`；
+  服务端升到 2.2.14-canary.45 后网页会调它，而当时本包还 pin 在 `0.0.37` → 设备端不认识 → 扫描失败。
+  修法 = 把 `package.json` 的 `@lobehub/cli` pin 提到与当前 `LOBEHUB_TAG` 同源的版本并重新发布。
+- `agent run` 报 `Gateway auth failed: signature verification failed` → 确认走的是 `fai`，或显式设置 `AGENT_GATEWAY_URL=https://ai.forcome.com/agent-gateway`。
 
 ## 实现
 
-不改 `lh` 源码——本包仅设置 `LOBEHUB_SERVER` 默认值后 `spawn('lh', argv)` 透传，`@lobehub/cli` 作为 `dependency` 自动跟随上游升级。
+不改 `lh` 源码——本包默认设置 `LOBEHUB_SERVER`、`LOBEHUB_DEVICE_GATEWAY`、`AGENT_GATEWAY_URL`，再用当前 Node 直接执行依赖内的 `@lobehub/cli` 入口；不依赖全局 PATH 上的 `lh`。

package/bin/fai.js

@@ -4,15 +4,35 @@
 // 不用 isMain 守卫——本文件只作为 bin 运行（纯逻辑在 ../src/index.js）。
 
 import { spawn } from 'node:child_process';
-import { FORCOME_SERVER, resolveLhPath, resolveLhVersion, withLoginServer } from '../src/index.js';
+import {
+  FORCOME_AGENT_GATEWAY,
+  FORCOME_DEVICE_GATEWAY,
+  FORCOME_SERVER,
+  resolveAgentGatewayUrl,
+  resolveGatewayUrl,
+  resolveLhPath,
+  resolveLhVersion,
+  withDeviceGateway,
+  withLoginServer,
+} from '../src/index.js';
 
 // 默认指向 Forcome 门户（员工无需 --server）；env LOBEHUB_SERVER 可覆盖（staging 等）
 if (!process.env.LOBEHUB_SERVER) {
   process.env.LOBEHUB_SERVER = FORCOME_SERVER;
 }
+if (!process.env.LOBEHUB_DEVICE_GATEWAY) {
+  process.env.LOBEHUB_DEVICE_GATEWAY = FORCOME_DEVICE_GATEWAY;
+}
+if (!process.env.AGENT_GATEWAY_URL) {
+  process.env.AGENT_GATEWAY_URL = FORCOME_AGENT_GATEWAY;
+}
 
 // lh 的 login 读 --server flag（不读 env，默认 app.lobehub.com）→ 必须显式注入，否则登错服务器
-const args = withLoginServer(process.argv.slice(2), process.env.LOBEHUB_SERVER);
+const args = withDeviceGateway(
+  withLoginServer(process.argv.slice(2), process.env.LOBEHUB_SERVER),
+  resolveGatewayUrl(),
+);
+process.env.AGENT_GATEWAY_URL = resolveAgentGatewayUrl();
 
 // wrapper 自身状态（不透传给 lh）
 if (args[0] === '--forcome-version') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forcome/ai-cli",
-  "version": "0.1.1",
+  "version": "0.1.5",
   "description": "Forcome AI 门户 CLI 薄壳——默认指向 ai.forcome.com，透传官方 @lobehub/cli (lh)",
   "type": "module",
   "license": "MIT",
@@ -38,7 +38,7 @@
     "smoke": "node bin/fai.js --forcome-version"
   },
   "dependencies": {
-    "@lobehub/cli": "0.0.37"
+    "@lobehub/cli": "0.0.54"
   },
   "engines": {
     "node": ">=20"

package/src/index.js

@@ -6,12 +6,23 @@ import { createRequire } from 'node:module';
 const require = createRequire(import.meta.url);
 
 export const FORCOME_SERVER = 'https://ai.forcome.com';
+export const FORCOME_DEVICE_GATEWAY = 'https://ai.forcome.com/device-gateway';
+export const FORCOME_AGENT_GATEWAY = 'https://ai.forcome.com/agent-gateway';
 
 /** 解析目标 server：env LOBEHUB_SERVER 优先，否则默认 Forcome 门户。 */
 export function resolveServerUrl() {
   return process.env.LOBEHUB_SERVER || FORCOME_SERVER;
 }
 
+/** 解析 Forcome 自托管 device gateway；env 可覆盖到 staging。 */
+export function resolveGatewayUrl() {
+  return process.env.LOBEHUB_DEVICE_GATEWAY || FORCOME_DEVICE_GATEWAY;
+}
+
+export function resolveAgentGatewayUrl() {
+  return process.env.AGENT_GATEWAY_URL || FORCOME_AGENT_GATEWAY;
+}
+
 /** 从依赖解析官方 lh 入口（自包含，不依赖全局 PATH）。 */
 export function resolveLhPath() {
   return require.resolve('@lobehub/cli/dist/index.js');
@@ -38,3 +49,26 @@ export function withLoginServer(args, server) {
   }
   return args;
 }
+
+export function withDeviceGateway(args, gateway) {
+  const hasGateway = args.some((arg) => arg === '--gateway' || arg.startsWith('--gateway='));
+  if (hasGateway) {
+    return args;
+  }
+
+  if (args[0] === 'status') {
+    return [args[0], '--gateway', gateway, ...args.slice(1)];
+  }
+
+  if (args[0] === 'connect') {
+    if (args[1] === 'restart') {
+      return [args[0], args[1], '--gateway', gateway, ...args.slice(2)];
+    }
+    if (args[1] === 'stop' || args[1] === 'status' || args[1] === 'logs') {
+      return args;
+    }
+    return [args[0], '--gateway', gateway, ...args.slice(1)];
+  }
+
+  return args;
+}

package/src/index.test.js

@@ -1,6 +1,15 @@
 import { test } from 'node:test';
 import assert from 'node:assert/strict';
-import { resolveServerUrl, FORCOME_SERVER, withLoginServer } from './index.js';
+import {
+  FORCOME_AGENT_GATEWAY,
+  FORCOME_DEVICE_GATEWAY,
+  FORCOME_SERVER,
+  resolveAgentGatewayUrl,
+  resolveGatewayUrl,
+  resolveServerUrl,
+  withDeviceGateway,
+  withLoginServer,
+} from './index.js';
 
 test('resolveServerUrl 默认指向 Forcome 门户', () => {
   delete process.env.LOBEHUB_SERVER;
@@ -14,7 +23,32 @@ test('resolveServerUrl 受 LOBEHUB_SERVER env 覆盖（staging 等）', () => {
   delete process.env.LOBEHUB_SERVER;
 });
 
+test('resolveGatewayUrl 默认指向 Forcome device gateway', () => {
+  delete process.env.LOBEHUB_DEVICE_GATEWAY;
+  assert.equal(resolveGatewayUrl(), FORCOME_DEVICE_GATEWAY);
+  assert.equal(resolveGatewayUrl(), 'https://ai.forcome.com/device-gateway');
+});
+
+test('resolveGatewayUrl 受 LOBEHUB_DEVICE_GATEWAY env 覆盖', () => {
+  process.env.LOBEHUB_DEVICE_GATEWAY = 'https://staging.forcome.com/device-gateway';
+  assert.equal(resolveGatewayUrl(), 'https://staging.forcome.com/device-gateway');
+  delete process.env.LOBEHUB_DEVICE_GATEWAY;
+});
+
+test('resolveAgentGatewayUrl 默认指向 Forcome agent gateway', () => {
+  delete process.env.AGENT_GATEWAY_URL;
+  assert.equal(resolveAgentGatewayUrl(), FORCOME_AGENT_GATEWAY);
+  assert.equal(resolveAgentGatewayUrl(), 'https://ai.forcome.com/agent-gateway');
+});
+
+test('resolveAgentGatewayUrl 受 AGENT_GATEWAY_URL env 覆盖', () => {
+  process.env.AGENT_GATEWAY_URL = 'https://staging.forcome.com/agent-gateway';
+  assert.equal(resolveAgentGatewayUrl(), 'https://staging.forcome.com/agent-gateway');
+  delete process.env.AGENT_GATEWAY_URL;
+});
+
 const SRV = 'https://ai.forcome.com';
+const GW = 'https://ai.forcome.com/device-gateway';
 
 test('withLoginServer: login 无 --server 时注入默认 server（避免登到 app.lobehub.com）', () => {
   assert.deepEqual(withLoginServer(['login'], SRV), ['login', '--server', SRV]);
@@ -31,3 +65,25 @@ test('withLoginServer: 非 login 命令不动（agent/gen/file 走 env）', () =
   assert.deepEqual(withLoginServer(['agent', 'list'], SRV), ['agent', 'list']);
   assert.deepEqual(withLoginServer(['gen', 'text', '-m', 'newapi/gpt-5.5'], SRV), ['gen', 'text', '-m', 'newapi/gpt-5.5']);
 });
+
+test('withDeviceGateway: connect/status 无 --gateway 时注入默认 gateway', () => {
+  assert.deepEqual(withDeviceGateway(['connect', '--daemon'], GW), ['connect', '--gateway', GW, '--daemon']);
+  assert.deepEqual(withDeviceGateway(['status'], GW), ['status', '--gateway', GW]);
+  assert.deepEqual(withDeviceGateway(['connect', 'restart'], GW), ['connect', 'restart', '--gateway', GW]);
+});
+
+test('withDeviceGateway: 已带 --gateway 或非 gateway 命令不动', () => {
+  assert.deepEqual(
+    withDeviceGateway(['connect', '--gateway', 'https://staging.forcome.com/device-gateway'], GW),
+    ['connect', '--gateway', 'https://staging.forcome.com/device-gateway'],
+  );
+  assert.deepEqual(
+    withDeviceGateway(['connect', 'restart', '--gateway=https://staging.forcome.com/device-gateway'], GW),
+    ['connect', 'restart', '--gateway=https://staging.forcome.com/device-gateway'],
+  );
+  assert.deepEqual(withDeviceGateway(['connect', 'status'], GW), ['connect', 'status']);
+  assert.deepEqual(withDeviceGateway(['connect', 'stop'], GW), ['connect', 'stop']);
+  assert.deepEqual(withDeviceGateway(['connect', 'logs'], GW), ['connect', 'logs']);
+  assert.deepEqual(withDeviceGateway(['device', 'status', '--json'], GW), ['device', 'status', '--json']);
+  assert.deepEqual(withDeviceGateway(['agent', 'list'], GW), ['agent', 'list']);
+});