carlos-flow 2.5.9 → 2.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -12,7 +12,13 @@ const TOKEN = process.env.CARLOS_BRIDGE_TOKEN;
12
12
  const MCP_SERVER = process.env.CARLOS_FLOW_MCP_ROOT + "/src/index.js";
13
13
  const MAX_REQUEST_SIZE = 1024 * 1024; // 1MB
14
14
  const RATE_LIMIT = 10; // 每秒最多请求数
15
- const REQUEST_TIMEOUT = 5000; // 5s
15
+ // 请求超时:必须大于服务端的最长单次执行时间。
16
+ // 服务端 flow_run_verify 的内部超时是 120s(真实 spawn verify.cmd),
17
+ // 其它工具都是毫秒级。
18
+ // 旧实现固定 5s —— 结果是任何耗时 >5s 的验证命令(如 `npm test`)必然超时失败,
19
+ // 用户只看到「Timeout」,而服务端那边命令其实跑得好好的。
20
+ // 现在默认 180s(> 服务端 120s 上限),可用 CARLOS_BRIDGE_TIMEOUT_MS 覆盖。
21
+ const REQUEST_TIMEOUT = Number(process.env.CARLOS_BRIDGE_TIMEOUT_MS) || 180000; // 180s
16
22
 
17
23
  if (!TOKEN) {
18
24
  process.stderr.write("[bridge] ❌ CARLOS_BRIDGE_TOKEN 未设置(fail-closed)\n");
package/client/carlos.js CHANGED
@@ -254,9 +254,15 @@ function callMCP(method, params) {
254
254
  const reqId = Math.floor(Math.random() * 100000000) + 2;
255
255
  let resolved = false;
256
256
 
257
+ // 超时必须大于服务端的最长执行时间:
258
+ // · flow_run_verify 的服务端超时是 120s(verify.cmd 真实执行)
259
+ // · 其余工具都是毫秒级
260
+ // 旧实现统一用 5s —— 结果是 CLI 调 flow_run_verify 永远超时失败,
261
+ // 而 MCP server 那边还在正常跑命令,用户只看到「超时」看不到真实退出码。
262
+ const timeoutMs = Number(process.env.CARLOS_MCP_TIMEOUT_MS) || 180000;
257
263
  const timer = setTimeout(() => {
258
- if (!resolved) { resolved = true; socket.destroy(); reject(new Error("超时 (5s)")); }
259
- }, 5000);
264
+ if (!resolved) { resolved = true; socket.destroy(); reject(new Error(`超时 (${Math.round(timeoutMs / 1000)}s)`)); }
265
+ }, timeoutMs);
260
266
 
261
267
  socket.on("connect", () => {
262
268
  socket.write(JSON.stringify({ jsonrpc: "2.0", id: reqId, method, params: { ...params, _token: BRIDGE_TOKEN } }) + "\n");
package/ghost.json CHANGED
@@ -5,7 +5,7 @@
5
5
  "name": "Carlos 工作流",
6
6
  "description": "机械门禁 MCP:留痕/派发/裁定/审计/快照/免检/还原。自动管理 Bridge 后台常驻,首次调用 ~3-5s,后续 ~1s。",
7
7
  "whenToUse": "需要走 Carlos 工作流门禁时使用:留痕/派发/裁定/审计/快照/免检/还原",
8
- "version": "2.5.9",
8
+ "version": "2.6.0",
9
9
  "kind": "mcp",
10
10
  "entry": "client/carlos.js",
11
11
  "command": "门禁",
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "carlos-flow",
3
- "version": "2.5.9",
4
- "description": "Carlos 工作流 — 双生态统一分发(Cindy / OpenCode)。一次安装,按需初始化:`carlos-flow init --target cindy|opencode`",
3
+ "version": "2.6.0",
4
+ "description": "Carlos 工作流 — AI 编码 Agent 的机械门禁。留痕/派发/验证/裁定/审计/还原,约束写在代码里而非提示词里。单一包支持 Cindy/OpenCode/Cursor/Cline/VS Code/Claude Desktop。",
5
5
  "type": "module",
6
6
  "main": "src/index.js",
7
7
  "bin": {
@@ -82,6 +82,7 @@
82
82
  "README.zh.md",
83
83
  "README.en.md",
84
84
  "TRIGGER_GUIDE.md",
85
+ "MIGRATION.md",
85
86
  "CHANGELOG.md",
86
87
  "LICENSE"
87
88
  ]
package/src/index.js CHANGED
@@ -897,17 +897,27 @@ const TOOLS = [
897
897
  if (!state.card) return fail("没有留痕,无法执行验证。");
898
898
  if (!state.card.verify || !state.card.verify.cmd) return fail("卡片未指定验证命令。");
899
899
 
900
- const result = await runVerifyCommand(state.card.verify.cmd, a.cwd);
900
+ // 工作目录优先级:显式 cwd > 卡片提交时的项目目录 > server 进程 cwd。
901
+ // 旧实现只用后两者中的 process.cwd() —— MCP server 是常驻进程,
902
+ // 它的 cwd 是**启动时**的目录(可能是几个月前的某个旧仓库),
903
+ // 于是 verify.cmd 会在错误的目录里跑,测试脚本找不到、路径全错,
904
+ // 而门禁把这种失败当成了「验证不通过」(真 PASS 被误杀)。
905
+ const cardProject = state.card.env && typeof state.card.env.project === "string"
906
+ ? state.card.env.project
907
+ : "";
908
+ const workdir = a.cwd || cardProject || undefined;
909
+ const result = await runVerifyCommand(state.card.verify.cmd, workdir);
901
910
  const state2 = loadState(sessionId);
902
911
  state2.last_verify = {
903
912
  ts: new Date().toISOString(),
904
913
  cmd: state.card.verify.cmd,
914
+ cwd: workdir || process.cwd(),
905
915
  exitCode: result.exitCode,
906
916
  ok: result.ok,
907
917
  };
908
918
  saveState(sessionId, state2);
909
919
 
910
- return ok({ ok: result.ok, exitCode: result.exitCode, stdout: result.stdout, stderr: result.stderr });
920
+ return ok({ ok: result.ok, exitCode: result.exitCode, stdout: result.stdout, stderr: result.stderr, cwd: workdir || process.cwd() });
911
921
  } catch (e) {
912
922
  return fail(e && e.message ? e.message : String(e));
913
923
  }