@sleep2agi/commhub-server 0.9.0-preview.269 → 0.9.0-preview.270
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/build-info.json +2 -2
- package/package.json +1 -1
- package/src/list-tasks-omit-default.test.ts +84 -0
- package/src/tools.ts +10 -3
package/build-info.json
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sleep2agi/commhub-server",
|
|
3
|
-
"version": "0.9.0-preview.
|
|
3
|
+
"version": "0.9.0-preview.270",
|
|
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",
|
|
@@ -0,0 +1,84 @@
|
|
|
1
|
+
// #3119 —— 节点令牌没传 omit_stats 时,默认省略 stats。
|
|
2
|
+
//
|
|
3
|
+
// 为什么不给 since_last 设默认(同样重要,写在这里免得后来人"顺手"加上):
|
|
4
|
+
// list_tasks 同时被用来回答「我手上有哪些活」—— 那是个**全集**问题。
|
|
5
|
+
// 默认 since_last 会让「早就派给我、一直没动」的任务消失,节点据此得出「没活」。
|
|
6
|
+
// 那是把一个成本问题换成一个正确性问题,不划算。
|
|
7
|
+
//
|
|
8
|
+
// 判据三格:
|
|
9
|
+
// ① 节点令牌 + 不传 omit_stats ⇒ 没有 stats,且 stats_omitted:true
|
|
10
|
+
// ② 节点令牌 + 显式 false ⇒ stats 回来(默认不是强制)
|
|
11
|
+
// ③ 用户令牌 + 不传 ⇒ 与以前一致(有 stats)—— 看板要计数
|
|
12
|
+
import './require-explicit-test-db';
|
|
13
|
+
import { afterAll, beforeEach, describe, expect, test } from 'bun:test';
|
|
14
|
+
import { db } from './db';
|
|
15
|
+
import { registerTools } from './tools';
|
|
16
|
+
import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
|
|
17
|
+
|
|
18
|
+
const net = 'net_omit_defaults';
|
|
19
|
+
const nodeUser = 'u_omit_node';
|
|
20
|
+
const humanUser = 'u_omit_human';
|
|
21
|
+
|
|
22
|
+
function client(opts: { username: string; isNode: boolean }) {
|
|
23
|
+
const handlers: Record<string, any> = {};
|
|
24
|
+
const server = new McpServer({ name: 't-omit', version: '0' }) as any;
|
|
25
|
+
const tool = server.tool.bind(server);
|
|
26
|
+
server.tool = (name: string, desc: any, shape: any, handler: any) => { handlers[name] = handler; return tool(name, desc, shape, handler); };
|
|
27
|
+
registerTools(server, undefined, opts.isNode ? net : null, opts.username, opts.username, opts.isNode, opts.isNode ? 'tok_omit' : null);
|
|
28
|
+
return async (name: string, args: any = {}) => JSON.parse((await handlers[name](args)).content[0].text);
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
function cleanup() {
|
|
32
|
+
db.run("DELETE FROM tasks WHERE task_id LIKE 't_omit_%'");
|
|
33
|
+
db.run('DELETE FROM list_tasks_watermarks WHERE network_id=?1', [net]);
|
|
34
|
+
db.run('DELETE FROM nodes WHERE network_id=?1', [net]);
|
|
35
|
+
db.run('DELETE FROM network_members WHERE network_id=?1', [net]);
|
|
36
|
+
db.run('DELETE FROM api_tokens WHERE network_id=?1', [net]);
|
|
37
|
+
db.run('DELETE FROM networks WHERE network_id=?1', [net]);
|
|
38
|
+
db.run('DELETE FROM users WHERE user_id IN (?1, ?2)', [nodeUser, humanUser]);
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
beforeEach(() => {
|
|
42
|
+
cleanup();
|
|
43
|
+
for (const u of [nodeUser, humanUser]) {
|
|
44
|
+
db.run("INSERT INTO users(user_id,username,password_hash,role) VALUES(?1,?1,'x','user')", [u]);
|
|
45
|
+
db.run("INSERT INTO network_members(user_id,network_id,role) VALUES(?1,?2,'owner')", [u, net]);
|
|
46
|
+
db.run('INSERT INTO nodes(node_id,node_name,alias,network_id) VALUES(?1,?2,?2,?3)', [`n_${u}`, u, net]);
|
|
47
|
+
}
|
|
48
|
+
db.run('INSERT INTO networks(network_id,network_name,owner_id) VALUES(?1,?1,?2)', [net, humanUser]);
|
|
49
|
+
// 节点令牌:network token + bound_node_id,这样 callerTokenIsNetwork 路径成立
|
|
50
|
+
db.run("INSERT INTO api_tokens(token_id,user_id,network_id,scope,name,token_hash,bound_node_id) VALUES('tok_omit',?1,?2,'network','node',?3,?4)",
|
|
51
|
+
[nodeUser, net, 'hash_omit', `n_${nodeUser}`]);
|
|
52
|
+
db.run(`INSERT INTO tasks(task_id, from_name, to_name, status, content, created_at, network_id)
|
|
53
|
+
VALUES ('t_omit_1', 'peer', ?1, 'delivered', 'work', '2026-11-05 01:00:00', ?2)`, [nodeUser, net]);
|
|
54
|
+
});
|
|
55
|
+
afterAll(cleanup);
|
|
56
|
+
|
|
57
|
+
describe("#3119 节点令牌默认省略 stats", () => {
|
|
58
|
+
test("① 节点令牌 + 不传 ⇒ 无 stats,且明确 stats_omitted", async () => {
|
|
59
|
+
const call = client({ username: nodeUser, isNode: true });
|
|
60
|
+
const r = await call('list_tasks', { alias: nodeUser, network_id: net, limit: 20 });
|
|
61
|
+
expect(r.ok).toBe(true);
|
|
62
|
+
expect(r.stats).toBeUndefined();
|
|
63
|
+
expect(r.stats_omitted).toBe(true);
|
|
64
|
+
});
|
|
65
|
+
|
|
66
|
+
test("② 节点令牌 + 显式 false ⇒ stats 回来(默认不是强制)", async () => {
|
|
67
|
+
const call = client({ username: nodeUser, isNode: true });
|
|
68
|
+
const r = await call('list_tasks', { alias: nodeUser, network_id: net, limit: 20, omit_stats: false });
|
|
69
|
+
expect(Array.isArray(r.stats)).toBe(true);
|
|
70
|
+
});
|
|
71
|
+
|
|
72
|
+
test("③ 用户令牌 + 不传 ⇒ 与以前一致(有 stats)", async () => {
|
|
73
|
+
const call = client({ username: humanUser, isNode: false });
|
|
74
|
+
const r = await call('list_tasks', { alias: humanUser, network_id: net, limit: 20 });
|
|
75
|
+
expect(Array.isArray(r.stats)).toBe(true);
|
|
76
|
+
});
|
|
77
|
+
|
|
78
|
+
test("镜像否定:节点令牌默认**不**启用 since_last(否则「早就派给我」的任务会消失)", async () => {
|
|
79
|
+
const call = client({ username: nodeUser, isNode: true });
|
|
80
|
+
const r = await call('list_tasks', { alias: nodeUser, network_id: net, limit: 20 });
|
|
81
|
+
expect(r.since_from).toBeUndefined();
|
|
82
|
+
expect(r.tasks.map((t: any) => t.task_id)).toContain('t_omit_1');
|
|
83
|
+
});
|
|
84
|
+
});
|
package/src/tools.ts
CHANGED
|
@@ -3128,8 +3128,11 @@ export function registerTools(server: McpServer, clientIP?: string, enforceNetwo
|
|
|
3128
3128
|
created_since: z.string().max(64).optional()
|
|
3129
3129
|
.describe("Only tasks created after this timestamp (ISO 8601 or 'YYYY-MM-DD HH:MM:SS'). Use the previous response's server_time as the next value."),
|
|
3130
3130
|
// #3119 —— stats 是全表 GROUP BY:轮询时它比任务列表本身还贵。
|
|
3131
|
-
|
|
3132
|
-
|
|
3131
|
+
// #3119 —— 不给 `.default(false)`:要能区分「没传」与「显式传 false」。
|
|
3132
|
+
// 节点令牌没传时默认省略 stats(它是给「看图的人」用的计数,轮询的节点不读它);
|
|
3133
|
+
// 显式传 false 仍然可以要回来。用户令牌保持旧行为(默认返回 stats)。
|
|
3134
|
+
omit_stats: z.boolean().optional()
|
|
3135
|
+
.describe("Skip the per-status counts (they scan every task in scope). Defaults to true for node tokens, false otherwise."),
|
|
3133
3136
|
// #3943 —— 服务端水位。调用方不传时间,Hub 用「上次给这个调用者返回的时刻」当下界,
|
|
3134
3137
|
// 返回后把水位推到本次的 server_time。客户端连时钟都不用记(也就不会因两边差几秒漏活)。
|
|
3135
3138
|
since_last: z.boolean().optional().default(false)
|
|
@@ -3189,6 +3192,10 @@ export function registerTools(server: McpServer, clientIP?: string, enforceNetwo
|
|
|
3189
3192
|
if (since_last && created_since) {
|
|
3190
3193
|
return { content: [{ type: "text" as const, text: JSON.stringify({ ok: false, error: "created_since_and_since_last_are_exclusive" }) }] };
|
|
3191
3194
|
}
|
|
3195
|
+
// 为什么不给 since_last 也设默认:list_tasks 同时被用来回答「我手上有哪些活」,
|
|
3196
|
+
// 那是一个**全集**问题;默认 since_last 会让「早就派给我、一直没动」的任务消失,
|
|
3197
|
+
// 节点据此得出「没活」——把一个成本问题换成一个正确性问题,不划算。
|
|
3198
|
+
const omitStats = omit_stats ?? callerTokenIsNetwork;
|
|
3192
3199
|
const effectiveNetIdForWatermark = enforceNetworkId ?? getNetworkId(netId);
|
|
3193
3200
|
const watermarkKey = (() => {
|
|
3194
3201
|
if (callerTokenIsNetwork && callerTokenId && enforceNetworkId) {
|
|
@@ -3244,7 +3251,7 @@ export function registerTools(server: McpServer, clientIP?: string, enforceNetwo
|
|
|
3244
3251
|
}
|
|
3245
3252
|
|
|
3246
3253
|
// Stats(#3119:轮询时默认仍然返回,调用方可用 omit_stats 显式关掉)
|
|
3247
|
-
if (
|
|
3254
|
+
if (omitStats) {
|
|
3248
3255
|
return { content: [{ type: "text" as const, text: JSON.stringify({
|
|
3249
3256
|
ok: true,
|
|
3250
3257
|
...(durable_cursor ? { capability: "list_tasks.immutable-node-cursor.v1" } : {}),
|