@sleep2agi/commhub-server 0.9.0-preview.224 → 0.9.0-preview.226

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.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sleep2agi/commhub-server",
3
- "version": "0.9.0-preview.224",
3
+ "version": "0.9.0-preview.226",
4
4
  "description": "CommHub Server — AI Agent communication hub with MCP protocol, multi-network isolation, user auth, and MCP tools (17 collaboration-core + node/provider ops tools; authoritative list: docs-site/docs/api/mcp-tools.md).",
5
5
  "type": "module",
6
6
  "main": "src/index.ts",
@@ -280,4 +280,130 @@ describe("GET /api/providers", () => {
280
280
  const missing = [...PROVIDER_WRITE_ERROR_CODES].filter((c) => !src.includes(`'${c}'`) && !src.includes(`"${c}"`));
281
281
  if (missing.length) throw new Error(`码清单里这些码在源码中找不到产出点:${missing.join(", ")}`);
282
282
  });
283
+
284
+ // 2026-10-31 —— 节点当前 provider/模型的三态读口(#3145 的数据面)。
285
+ // 关键:**从未切换过 / 正在切 / 切失败** 必须能分开 —— 界面给的下一步完全不同。
286
+ test("GET /api/nodes/:id/provider-selection distinguishes never_switched / pending / applied / failed", async () => {
287
+ const { db } = await import("./db.js");
288
+ const nodeId = "ps-probe-node";
289
+ db.run(`INSERT OR REPLACE INTO nodes (node_id, node_name, network_id, alias, created_at, updated_at)
290
+ VALUES (?1, 'ps-probe', ?2, 'ps-probe', ?3, ?3)`, [nodeId, ownerNet, Date.now()]);
291
+ const read = async () => {
292
+ const r = await fetch(`${base}/api/nodes/${nodeId}/provider-selection`, { headers: { Authorization: `Bearer ${ownerToken}` } });
293
+ return { status: r.status, body: await r.json() as any };
294
+ };
295
+ try {
296
+ // ① 从未切换过:带 hint,selection 为 null(不假装是 Hub 的读数)
297
+ const a = await read();
298
+ expect(a.status).toBe(200);
299
+ expect(a.body.state).toBe("never_switched");
300
+ expect(a.body.selection).toBeNull();
301
+ expect(String(a.body.hint)).toContain("本地默认配置");
302
+
303
+ // ② 正在切:pending 时不带 hint(hint 只属于「没有读数」那一档)
304
+ const q = (requestId: string, status: string, payload: string | null, error: string | null) => db.run(
305
+ `INSERT OR REPLACE INTO daemon_provider_snapshots (request_id, network_id, daemon_node_id, requested_by, status, created_at, expires_at, observed_at, snapshot_json, error)
306
+ VALUES (?1, ?2, ?3, 'test', ?4, ?5, ?6, ?5, ?7, ?8)`,
307
+ [requestId, ownerNet, nodeId, status, Date.now(), Date.now() + 60_000, payload, error],
308
+ );
309
+ q("dpa_probe_1", "pending", null, null);
310
+ const b = await read();
311
+ expect(b.body.state).toBe("pending");
312
+ expect("hint" in b.body).toBe(false);
313
+
314
+ // ③ 已生效:selection 原样带回,并给出 revision
315
+ q("dpa_probe_2", "completed", JSON.stringify({ expected_revision: 7, provider_id: "main", model: "m1" }), null);
316
+ const c = await read();
317
+ expect(c.body.state).toBe("applied");
318
+ expect(c.body.selection).toMatchObject({ provider_id: "main", model: "m1" });
319
+ expect(c.body.revision).toBe(7);
320
+ expect(typeof c.body.observed_at).toBe("string");
321
+
322
+ // ④ 失败:必须带 error(否则界面只能说「失败了」)
323
+ q("dpa_probe_3", "failed", null, "daemon_rejected_selection");
324
+ const d = await read();
325
+ expect(d.body.state).toBe("failed");
326
+ expect(d.body.error).toBe("daemon_rejected_selection");
327
+ } finally {
328
+ db.run(`DELETE FROM daemon_provider_snapshots WHERE daemon_node_id = ?1`, [nodeId]);
329
+ db.run(`DELETE FROM node_daemon_bindings WHERE request_id = 'bind_ps'`);
330
+ db.run(`DELETE FROM nodes WHERE node_id = 'ps-target-node'`);
331
+ db.run(`DELETE FROM api_tokens WHERE token_id = 'tok_ps_write'`);
332
+ db.run(`DELETE FROM nodes WHERE node_id = ?1`, [nodeId]);
333
+ }
334
+ });
335
+
336
+ // 2026-10-31 —— 写侧:切 provider 的**第一步**(排队 + 带切换前读数)。
337
+ // 关键断言不是「返回 202」,而是「它把 before 带回来了」——没有 before,
338
+ // 「切成功了吗」只能靠客户端自己记住上一次。
339
+ test("POST /api/nodes/:id/provider-selection queues an application and returns the pre-state", async () => {
340
+ const { db } = await import("./db.js");
341
+ const nodeId = "ps-write-node";
342
+ // provider 切换只对 host_supervisor 守护进程有意义 —— 那条前置条件本身也要先被证明:
343
+ // 普通节点 ⇒ 404 daemon_not_found(下面第一条断言)。
344
+ db.run(`INSERT OR REPLACE INTO nodes (node_id, node_name, network_id, alias, created_at, updated_at, config_snapshot)
345
+ VALUES (?1, 'ps-write', ?2, 'ps-write', ?3, ?3, '{}')`, [nodeId, ownerNet, Date.now()]);
346
+ const selection0 = { node_id: nodeId, node_revision: "a".repeat(64), provider_id: "main", auth_id: "auth1", model: "m1", confirm_restart: true };
347
+ const postRaw = async (body: any) => {
348
+ const r = await fetch(`${base}/api/nodes/${nodeId}/provider-selection`, {
349
+ method: "POST",
350
+ headers: { Authorization: `Bearer ${ownerToken}`, "content-type": "application/json" },
351
+ body: JSON.stringify(body),
352
+ });
353
+ return { status: r.status, body: await r.json() as any };
354
+ };
355
+ db.run(`INSERT OR REPLACE INTO daemon_provider_snapshots (request_id, network_id, daemon_node_id, requested_by, status, created_at, expires_at, observed_at, snapshot_json, error)
356
+ VALUES ('dpa_prev', ?1, ?2, 'test', 'completed', ?3, ?4, ?3, ?5, NULL)`,
357
+ [ownerNet, nodeId, Date.now(), Date.now() + 60_000, JSON.stringify({ expected_revision: 3, provider_id: "prev", model: "m0" })]);
358
+ // 真实语义:切的是**被这个守护进程监督的节点**,不是守护进程自己 ⇒ 需要一个 target 节点 + 一条 active 绑定
359
+ const targetId = "ps-target-node";
360
+ db.run(`INSERT OR REPLACE INTO nodes (node_id, node_name, network_id, alias, created_at, updated_at)
361
+ VALUES (?1, 'ps-target', ?2, 'ps-target', ?3, ?3)`, [targetId, ownerNet, Date.now()]);
362
+ db.run(`INSERT OR REPLACE INTO node_daemon_bindings (request_id, network_id, node_id, daemon_node_id, workdir, requested_by, status, created_at, updated_at)
363
+ VALUES ('bind_ps', ?1, ?2, ?3, '/tmp', 'test', 'active', ?4, ?4)`, [ownerNet, targetId, nodeId, Date.now()]);
364
+ const selection = { node_id: targetId, node_revision: "a".repeat(64), provider_id: "main", auth_id: "auth1", model: "m1", confirm_restart: true };
365
+ try {
366
+ const post = async (body: any) => {
367
+ const r = await fetch(`${base}/api/nodes/${nodeId}/provider-selection`, {
368
+ method: "POST",
369
+ headers: { Authorization: `Bearer ${ownerToken}`, "content-type": "application/json" },
370
+ body: JSON.stringify(body),
371
+ });
372
+ return { status: r.status, body: await r.json() as any };
373
+ };
374
+ // ① 普通节点(不是 host_supervisor)⇒ 404:切换只对守护进程有意义
375
+ expect((await postRaw({ revision: 3, selection: selection0 })).status).toBe(404);
376
+
377
+ // 补上前置条件:节点既要有 node-scoped token,也要 config_snapshot.role=host_supervisor
378
+ db.run(`INSERT OR REPLACE INTO api_tokens (token_id, token_hash, user_id, network_id, name, created_at)
379
+ VALUES ('tok_ps_write', 'hash', ?1, ?2, 'node:ps-write', datetime('now'))`, [ownerUserId, ownerNet]);
380
+ db.run(`UPDATE nodes SET config_snapshot = '{"role":"host_supervisor"}' WHERE node_id = ?1`, [nodeId]);
381
+
382
+ // 缺 revision ⇒ 400(且提示「先 GET 同一路由」)
383
+ const noRev = await post({ selection });
384
+ expect(noRev.status).toBe(400);
385
+ expect(noRev.body.error).toBe("invalid_revision");
386
+
387
+ // 正常:202 + state=pending + before 是上一次生效的 selection
388
+ const ok = await post({ revision: 3, selection });
389
+ if (ok.status !== 202) throw new Error(`期望 202,实际 ${ok.status}:${JSON.stringify(ok.body)}`);
390
+ expect(ok.status).toBe(202);
391
+ expect(ok.body.state).toBe("pending");
392
+ expect(ok.body.request_id).toMatch(/^dpa_/);
393
+ expect(ok.body.before).toMatchObject({ provider_id: "prev", model: "m0" });
394
+ expect(String(ok.body.hint)).toContain("pending 不等于生效");
395
+
396
+ // 回读:pending 状态在 GET 上立刻可见(写与读用同一个状态源)
397
+ const get = await fetch(`${base}/api/nodes/${nodeId}/provider-selection`, { headers: { Authorization: `Bearer ${ownerToken}` } });
398
+ const got = await get.json() as any;
399
+ expect(got.state).toBe("pending");
400
+ } finally {
401
+ db.run(`DELETE FROM daemon_provider_applications WHERE request_id IN (SELECT request_id FROM daemon_provider_snapshots WHERE daemon_node_id = ?1)`, [nodeId]);
402
+ db.run(`DELETE FROM daemon_provider_snapshots WHERE daemon_node_id = ?1`, [nodeId]);
403
+ db.run(`DELETE FROM node_daemon_bindings WHERE request_id = 'bind_ps'`);
404
+ db.run(`DELETE FROM nodes WHERE node_id = 'ps-target-node'`);
405
+ db.run(`DELETE FROM api_tokens WHERE token_id = 'tok_ps_write'`);
406
+ db.run(`DELETE FROM nodes WHERE node_id = ?1`, [nodeId]);
407
+ }
408
+ });
283
409
  });
package/src/server.ts CHANGED
@@ -107,6 +107,7 @@ import { assertScheduledTaskBackendSupported, handleScheduledTaskRequest, startS
107
107
  import { startDueReminderTimer } from "./requirement-due-reminders.js";
108
108
  import { handleRequirementsRequest } from "./requirements.js";
109
109
  import { readHubProviders, putHubProvider, providerWriteStatus } from "./hub-provider-config.js";
110
+ import { requestProviderApplication } from "./daemon-provider-snapshots.js";
110
111
  import { requestNodeSecrets, getScopedSecrets } from "./scoped-secrets.js";
111
112
  import { readEnvTransportLog } from "./env-transport-gate.js";
112
113
  import { enforceImpactOf, normalizePeerAllowlist, normalizeToolAllowlist, restAllowlistVerdict, restRouteLabel } from "./node-permissions.js";
@@ -3881,6 +3882,95 @@ return Bun.serve({
3881
3882
  logAudit(restAuth.userId, restAuth.username, "node_permission_mode_changed", "node", node.node_id, JSON.stringify({ from: previous, to: mode }), getClientIP(req), node.network_id);
3882
3883
  return withCors(req, Response.json({ ok: true, node_id: node.node_id, permission_mode: mode, previous }));
3883
3884
  }
3885
+ // 2026-10-31 —— **读侧:这个节点当前用的是哪个 provider / 模型**(#3145 的数据面)。
3886
+ // 写侧(切哪个)已有 requestProviderApplication(MCP),但客户端要"显示当前",需要一个 REST 读口,
3887
+ // 否则界面只能显示上次操作的结果——而"上次操作"与"现在生效"不是同一件事。
3888
+ const providerSelMatch = url.pathname.match(/^\/api\/nodes\/([^/]+)\/provider-selection$/);
3889
+ if (providerSelMatch && req.method === "GET") {
3890
+ if (!restAuth) return withCors(req, Response.json({ ok: false, error: "auth required" }, { status: 401 }));
3891
+ if (restAuth.networkId) return userTokenRequired(req);
3892
+ const nodeRef = decodeURIComponent(providerSelMatch[1]);
3893
+ const node = db.get<{ node_id: string; network_id: string | null }>(
3894
+ "SELECT node_id, network_id FROM nodes WHERE node_id = ?1", nodeRef);
3895
+ const role = node?.network_id ? getUserNetworkRole(restAuth.userId, node.network_id) : null;
3896
+ if (!node || !node.network_id || (!role && !isAdmin)) {
3897
+ return withCors(req, Response.json({ ok: false, error: "node_not_found" }, { status: 404 }));
3898
+ }
3899
+ const row = db.get<{ request_id: string; status: string; observed_at: number | null; snapshot_json: string | null; error: string | null }>(
3900
+ `SELECT request_id, status, observed_at, snapshot_json, error FROM daemon_provider_snapshots
3901
+ WHERE network_id = ?1 AND daemon_node_id = ?2 AND request_id LIKE 'dpa\_%' ESCAPE '\\'
3902
+ ORDER BY created_at DESC LIMIT 1`,
3903
+ node.network_id, node.node_id);
3904
+ // 三态而不是「有/没有」:从未切换过 / 正在切 / 切失败,界面要给的下一步完全不同。
3905
+ const state = !row ? "never_switched"
3906
+ : row.status === "pending" ? "pending"
3907
+ : row.status === "failed" || row.status === "expired" ? "failed"
3908
+ : "applied";
3909
+ let selection: unknown = null;
3910
+ if (row?.snapshot_json) { try { selection = JSON.parse(row.snapshot_json); } catch { selection = null; } }
3911
+ return withCors(req, Response.json({
3912
+ ok: true,
3913
+ node_id: node.node_id,
3914
+ state,
3915
+ selection,
3916
+ revision: (selection as any)?.expected_revision ?? null,
3917
+ observed_at: row?.observed_at ? new Date(row.observed_at).toISOString() : null,
3918
+ ...(state === "failed" ? { error: row?.error ?? null } : {}),
3919
+ ...(state === "never_switched"
3920
+ ? { hint: "这个节点还没有被切换过 provider;显示的是它的本地默认配置(不是 Hub 的读数)" }
3921
+ : {}),
3922
+ }));
3923
+ }
3924
+ // 2026-10-31 —— **写侧:切这个节点的 provider / 模型**(#3146 的第一个动作面)。
3925
+ // 直接复用 requestProviderApplication(校验/授权/加密下发都在那边),
3926
+ // 这里只做两件 REST 侧的事:把「切换前是什么」一起回给对方,并给出下一步该看什么。
3927
+ if (providerSelMatch && req.method === "POST") {
3928
+ if (!restAuth) return withCors(req, Response.json({ ok: false, error: "auth required" }, { status: 401 }));
3929
+ if (restAuth.networkId) return userTokenRequired(req);
3930
+ const nodeRef = decodeURIComponent(providerSelMatch[1]);
3931
+ const node = db.get<{ node_id: string; network_id: string | null }>(
3932
+ "SELECT node_id, network_id FROM nodes WHERE node_id = ?1", nodeRef);
3933
+ const role = node?.network_id ? getUserNetworkRole(restAuth.userId, node.network_id) : null;
3934
+ if (!node || !node.network_id || (!role && !isAdmin)) {
3935
+ return withCors(req, Response.json({ ok: false, error: "node_not_found" }, { status: 404 }));
3936
+ }
3937
+ let body: any = null;
3938
+ try { body = await req.json(); } catch { return withCors(req, Response.json({ ok: false, error: "invalid_json" }, { status: 400 })); }
3939
+ const revision = Number.isSafeInteger(body?.revision) ? body.revision : NaN;
3940
+ if (!Number.isSafeInteger(revision) || revision < 0) {
3941
+ return withCors(req, Response.json({ ok: false, error: "invalid_revision", hint: "传节点当前的 config revision;不确定就先 GET 同一路由" }, { status: 400 }));
3942
+ }
3943
+ // 切换前读数(对照):没有它,「切成功了吗」只能靠客户端自己记住上一次
3944
+ const beforeRow = db.get<{ snapshot_json: string | null }>(
3945
+ `SELECT snapshot_json FROM daemon_provider_snapshots
3946
+ WHERE network_id = ?1 AND daemon_node_id = ?2 AND request_id LIKE 'dpa\_%' ESCAPE '\\'
3947
+ ORDER BY created_at DESC LIMIT 1`, node.network_id, node.node_id);
3948
+ let before: unknown = null;
3949
+ if (beforeRow?.snapshot_json) { try { before = JSON.parse(beforeRow.snapshot_json); } catch { before = null; } }
3950
+
3951
+ const applied = requestProviderApplication(
3952
+ { userId: restAuth.userId ?? null, isNode: false, networkId: node.network_id },
3953
+ node.node_id, revision, body?.selection,
3954
+ );
3955
+ if (!applied.ok) {
3956
+ const status = applied.error === "user_token_required" ? 401
3957
+ : applied.error === "provider_admin_required" ? 403
3958
+ : applied.error === "daemon_not_found" ? 404
3959
+ : applied.error === "application_target_not_bound" ? 400
3960
+ : applied.error === "invalid_application" ? 400
3961
+ : 409;
3962
+ return withCors(req, Response.json({ ...applied, before }, { status }));
3963
+ }
3964
+ return withCors(req, Response.json({
3965
+ ok: true,
3966
+ node_id: node.node_id,
3967
+ request_id: applied.request_id,
3968
+ state: "pending",
3969
+ before, // 切换前(可能为 null = 从未切换过)
3970
+ expires_at: new Date(applied.expires_at).toISOString(),
3971
+ hint: "已排队;用 GET 同一路由回读 state=applied 才算生效(pending 不等于生效)",
3972
+ }, { status: 202 }));
3973
+ }
3884
3974
  // #2969 后半 —— 接口白名单:PUT /api/nodes/:id/tool-allowlist { tools: string[] | null }
3885
3975
  // 与 peer-allowlist 同一套授权口径。
3886
3976
  const toolAllowMatch = url.pathname.match(/^\/api\/nodes\/([^/]+)\/tool-allowlist$/);