@sleep2agi/commhub-server 0.9.0-preview.242 → 0.9.0-preview.244
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 +1 -1
- package/src/agent-acl-slice3-http.test.ts +5 -0
- package/src/daemon-token-owner-http.test.ts +60 -9
- package/src/health-redaction.test.ts +25 -0
- package/src/hub-catalog-read-http.test.ts +4 -1
- package/src/requirements-assignee-drift.test.ts +38 -6
- package/src/requirements.ts +73 -29
- package/src/server.ts +6 -2
- package/src/tools.ts +4 -1
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.244",
|
|
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",
|
|
@@ -434,6 +434,11 @@ describe("update_node_config 响应键集(exact key set)", () => {
|
|
|
434
434
|
expect(Array.isArray(plain.messages)).toBe(true);
|
|
435
435
|
|
|
436
436
|
const human = await tool(ntok, "get_inbox", { alias: I.alias, limit: 5, human_first: true });
|
|
437
|
+
|
|
438
|
+
// 2026-10-31 —— **先证两份夹具彼此不同,再各自断言**(外部复核 (c):
|
|
439
|
+
// 「若四份夹具序列化出的字节相同,它只有一种形状 —— 后面的『各自断言』就是四次自拍」)。
|
|
440
|
+
// 这里两态也一样:若 human_first 其实没生效,下面两条键集断言会变成「同一个形状断两次」。
|
|
441
|
+
expect(JSON.stringify(Object.keys(plain).sort())).not.toBe(JSON.stringify(Object.keys(human).sort()));
|
|
437
442
|
expect(Object.keys(human).sort()).toEqual(["human_inbox", "messages", "ok"]);
|
|
438
443
|
expect(Object.keys(human.human_inbox).sort()).toEqual(["examined", "mode", "version"]);
|
|
439
444
|
expect(human.human_inbox.mode).toBe("metadata-keyset");
|
|
@@ -100,7 +100,13 @@ for (const [name, arguments_] of endpoints) {
|
|
|
100
100
|
test(`daemon identity boundary: ${name}`, async () => {
|
|
101
101
|
const args = name.includes("adopt_request") ? { ...arguments_, request_id: requestId } : arguments_;
|
|
102
102
|
for (const token of [mismatched, wrongBound, ownerless, owner.token, member.token]) {
|
|
103
|
-
|
|
103
|
+
const denied = await call(token, name, args);
|
|
104
|
+
expect(denied).toMatchObject({ ok: false, error: "caller_not_a_daemon" });
|
|
105
|
+
// 2026-10-31 —— #3275:**错误信封也是契约**。
|
|
106
|
+
// 这八个 ack/get 工具此前只被断言过 error 的**值**,没有一条钉住键集:
|
|
107
|
+
// 谁顺手在某个出口多塞一个字段(例如 hint / request_id),客户端的分支就多一个没人知道的键。
|
|
108
|
+
// ⇒ 在同一个循环里把形状钉住,成本几乎为零。
|
|
109
|
+
expect(Object.keys(denied).sort()).toEqual(["error", "ok"]);
|
|
104
110
|
}
|
|
105
111
|
expect(db.get("SELECT status FROM node_daemon_bindings WHERE request_id=?1", requestId).status).toBe("pending");
|
|
106
112
|
});
|
|
@@ -110,24 +116,69 @@ test("legacy owner and exact bound identity remain supported", async () => {
|
|
|
110
116
|
expect(db.get("SELECT bound_node_id FROM api_tokens WHERE token_id='owner678_legacy'").bound_node_id).toBeNull();
|
|
111
117
|
for (const token of [legacy, bound]) {
|
|
112
118
|
expect((await call(token, "list_my_children")).ok).toBe(true);
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
119
|
+
// 2026-10-31 —— #3275 批次 2:这两条是 **SSE 重连补偿**的入口(漏了门铃节点会卡死),
|
|
120
|
+
// 客户端按字段名读;键集从未被钉住。改为 `const` 赋值,顺便让严格口径能数到它们。
|
|
121
|
+
const pendCreate = await call(token, "list_my_pending_create_requests");
|
|
122
|
+
expect(pendCreate.ok).toBe(true);
|
|
123
|
+
expect(Object.keys(pendCreate).sort()).toEqual(["clone_count", "clone_requests", "count", "ok", "requests"]);
|
|
124
|
+
|
|
125
|
+
const pendLife = await call(token, "list_my_pending_lifecycle_requests");
|
|
126
|
+
expect(pendLife.ok).toBe(true);
|
|
127
|
+
expect(Object.keys(pendLife).sort()).toEqual(["ok", "start_count", "start_requests", "stop_count", "stop_requests"]);
|
|
128
|
+
// 计数与数组同源:两个 count 必须等于各自数组长度(否则「有 N 条」与「列出来」会分叉)
|
|
129
|
+
expect(pendLife.stop_count).toBe(pendLife.stop_requests.length);
|
|
130
|
+
expect(pendLife.start_count).toBe(pendLife.start_requests.length);
|
|
131
|
+
// 2026-10-31 —— #3275:形状由**一次真实调用**给出(不靠读源码猜)
|
|
132
|
+
const gotAdopt = await call(token, "get_adopt_request", { request_id: requestId });
|
|
133
|
+
expect(gotAdopt.ok).toBe(true);
|
|
134
|
+
// ⚠️ 我第一版按源码猜了 7 个键(binding_request_id / child_alias / child_node_id …)——**全错**。
|
|
135
|
+
// 真实形状由这次调用给出,12 个键;其中 error 为空、request_id 是这一行自己的 id。
|
|
136
|
+
// 这是本卡第三次被「读源码猜形状」打回,写进注释免得下一个人再猜:
|
|
137
|
+
// 行对象整行透传时,源码里看到的字段名是**SQL 的列名**,与对外载荷不是一回事。
|
|
138
|
+
expect(Object.keys(gotAdopt).sort()).toEqual([
|
|
139
|
+
"alias", "created_at", "daemon_node_id", "error", "network_id", "node_id",
|
|
140
|
+
"ok", "request_id", "requested_by", "status", "updated_at", "workdir",
|
|
141
|
+
]);
|
|
116
142
|
}
|
|
117
143
|
// An explicit binding does not bypass the network or revocation boundaries.
|
|
118
144
|
expect(await call(crossNetwork, "list_my_children")).toMatchObject({ ok: false, error: "caller_not_a_daemon" });
|
|
119
145
|
const denied = await fetch(`${base}/mcp`, { method: "POST", headers: { Authorization: `Bearer ${revoked}` } });
|
|
120
146
|
expect(denied.status).toBe(401);
|
|
121
|
-
|
|
147
|
+
// 2026-10-31 —— #3275:**成功体也要钉键集**(上面那个循环钉的是错误信封)。
|
|
148
|
+
// 这四条是 daemon 侧最常被按字段名读的回执;多一个键不会让谁报错,但会改变解析分支。
|
|
149
|
+
const adopted = await call(legacy, "ack_adopt_request", { request_id: requestId, status: "adopted" });
|
|
150
|
+
expect(adopted).toMatchObject({ ok: true, status: "active" });
|
|
151
|
+
expect(Object.keys(adopted).sort()).toEqual(["ok", "status"]);
|
|
122
152
|
expect((await call(legacy, "list_my_children")).children).toContainEqual({ child_node_id: child, alias: child, lifecycle_state: "active", managed: "adopted", binding_request_id: requestId });
|
|
153
|
+
// 2026-10-31 —— #3275:get_probe_request 的**不存在**分支键集(成功分支需要真实 probe 夹具,
|
|
154
|
+
// 本文件不造;错误分支同样是契约:客户端按 error 分支,多一个键就会多一个没人知道的分支)
|
|
155
|
+
const gotProbe = await call(legacy, "get_probe_request", { probe_id: "probe_fixture_absent" });
|
|
156
|
+
expect(gotProbe.ok).toBe(false);
|
|
157
|
+
// 实测:错误分支多一个 reason(不是只 {error, ok})——**又一次由真实调用纠正**
|
|
158
|
+
expect(Object.keys(gotProbe).sort()).toEqual(["error", "ok", "reason"]);
|
|
123
159
|
const stop = await call(owner.token, "stop_node", { node_id: child, network_id: owner.network_id });
|
|
124
160
|
expect(stop.ok).toBe(true);
|
|
125
|
-
|
|
126
|
-
|
|
161
|
+
// 2026-10-31 —— #3275 批次 2:get_stop_request 的**成功体**键集(daemon 按字段名读,
|
|
162
|
+
// 尤其 delete_config / grace_seconds / force 三个决定它要不要删配置)
|
|
163
|
+
const gotStop = await call(legacy, "get_stop_request", { request_id: stop.request_id });
|
|
164
|
+
expect(gotStop.ok).toBe(true);
|
|
165
|
+
expect(Object.keys(gotStop).sort()).toEqual([
|
|
166
|
+
"action", "child_alias", "child_node_id", "delete_config", "force", "grace_seconds", "ok", "request_id",
|
|
167
|
+
]);
|
|
168
|
+
const stoppedAck = await call(legacy, "ack_stop_request", { request_id: stop.request_id, status: "stopped" });
|
|
169
|
+
expect(stoppedAck.ok).toBe(true);
|
|
170
|
+
expect(Object.keys(stoppedAck).sort()).toEqual(["ok", "status"]); // #3275:成功体键集
|
|
127
171
|
const start = await call(owner.token, "start_node", { node_id: child, network_id: owner.network_id });
|
|
128
172
|
expect(start.ok).toBe(true);
|
|
129
|
-
|
|
130
|
-
expect(
|
|
173
|
+
const gotStart = await call(legacy, "get_start_request", { request_id: start.request_id });
|
|
174
|
+
expect(gotStart.ok).toBe(true);
|
|
175
|
+
// 成功体:四个固定键 + start_completion_capable;fork_recovery 只在「创建即恢复」路径出现(条件键)
|
|
176
|
+
expect(Object.keys(gotStart).sort()).toEqual([
|
|
177
|
+
"child_alias", "child_node_id", "ok", "request_id", "start_completion_capable",
|
|
178
|
+
]);
|
|
179
|
+
const startedAck = await call(legacy, "ack_start_request", { request_id: start.request_id, status: "started", child_pid: 4321 });
|
|
180
|
+
expect(startedAck).toMatchObject({ ok: true, status: "started" });
|
|
181
|
+
expect(Object.keys(startedAck).sort()).toEqual(["ok", "status"]); // #3275:成功体键集
|
|
131
182
|
});
|
|
132
183
|
|
|
133
184
|
test("ownerless legacy daemon remains supported without rewriting its owner", async () => {
|
|
@@ -1338,6 +1338,31 @@ describe("#473 anonymous /health — watchdog contract intact, no topology leak"
|
|
|
1338
1338
|
expect(/git|commit|build[-_]?(sha|id)?/.test("x-commhub")).toBe(false);
|
|
1339
1339
|
});
|
|
1340
1340
|
|
|
1341
|
+
// 2026-10-31 —— **计数之间的守恒式**(外部复核:「human + worker + unassigned == 待办行数;
|
|
1342
|
+
// 不等 ⇒ RuntimeError。它防的是将来改坏分桶:漏一类左边小、重复计一类左边大」)。
|
|
1343
|
+
// 本仓这里的两个数是同一个量的两个名字:mcp_inflight(当前)与 mcp_inflight_peak(峰值)。
|
|
1344
|
+
// 守恒式:peak ≥ inflight(任何时刻都成立,与采样时机无关);
|
|
1345
|
+
// 反过来若有人把 peak 写成"本次采样值",两者会相等而看不出——所以还要一条
|
|
1346
|
+
// 「peak 只增不减」:在窗口内取三次,peak 序列必须单调不减。
|
|
1347
|
+
test("mcp_inflight_peak dominates the current value and never decreases", async () => {
|
|
1348
|
+
const samples: Array<{ now: number; peak: number }> = [];
|
|
1349
|
+
for (let i = 0; i < 3; i++) {
|
|
1350
|
+
const d = await (await fetch(`${BASE}/health`)).json() as any;
|
|
1351
|
+
samples.push({ now: Number(d.mcp_inflight), peak: Number(d.mcp_inflight_peak) });
|
|
1352
|
+
await new Promise((r) => setTimeout(r, 120));
|
|
1353
|
+
}
|
|
1354
|
+
for (const s of samples) {
|
|
1355
|
+
expect(Number.isFinite(s.now)).toBe(true);
|
|
1356
|
+
expect(Number.isFinite(s.peak)).toBe(true);
|
|
1357
|
+
expect(s.peak).toBeGreaterThanOrEqual(s.now); // 守恒式
|
|
1358
|
+
expect(s.now).toBeGreaterThanOrEqual(0);
|
|
1359
|
+
}
|
|
1360
|
+
// 单调:峰值不许下降(它不是一个采样值)
|
|
1361
|
+
for (let i = 1; i < samples.length; i++) {
|
|
1362
|
+
expect(samples[i].peak).toBeGreaterThanOrEqual(samples[i - 1].peak);
|
|
1363
|
+
}
|
|
1364
|
+
});
|
|
1365
|
+
|
|
1341
1366
|
// 2026-10-31 —— **一致时零证据**(外部复核:「status / db / mineruProxy 三个字段是同一个位,
|
|
1342
1367
|
// 一致时零证据」)。本仓的 status 与 status_reasons 由构造保证一致 ⇒
|
|
1343
1368
|
// 「status=='ok' ⟺ reasons 为空」是恒真断言,保护不了任何东西。
|
|
@@ -327,7 +327,10 @@ describe("GET /api/providers", () => {
|
|
|
327
327
|
expect(a.status).toBe(200);
|
|
328
328
|
expect(a.body.state).toBe("never_switched");
|
|
329
329
|
expect(a.body.selection).toBeNull();
|
|
330
|
-
expect(String(a.body.hint)).toContain("
|
|
330
|
+
expect(String(a.body.hint)).toContain("本地的默认配置");
|
|
331
|
+
// 2026-10-31 —— **hint 必须自带动作**(外部复核:一句只描述状态的提示产不出下一步)。
|
|
332
|
+
// 这条断言钉住「它至少告诉读者第一步是什么」,而不是只说「现在是这样」。
|
|
333
|
+
expect(String(a.body.hint)).toMatch(/POST|GET|切一次/);
|
|
331
334
|
|
|
332
335
|
// ② 正在切:pending 时不带 hint(hint 只属于「没有读数」那一档)
|
|
333
336
|
const q = (requestId: string, status: string, payload: string | null, error: string | null) => db.run(
|
|
@@ -60,7 +60,9 @@ afterAll(() => { try { hub?.stop?.(); } catch {} rmSync(DIR, { recursive: true,
|
|
|
60
60
|
|
|
61
61
|
describe("assignee never contradicts a validated owner/agent_owner reference", () => {
|
|
62
62
|
test("陈旧自由文本被引用覆盖(agent_owner 优先 > owner > 文本)", async () => {
|
|
63
|
-
const { displayAssignee } = await import("./requirements.js").catch(
|
|
63
|
+
const { displayAssignee, refDisplayName } = await import("./requirements.js").catch(
|
|
64
|
+
() => ({ displayAssignee: null as any, refDisplayName: null as any })) as any;
|
|
65
|
+
if (typeof refDisplayName !== "function") throw new Error("refDisplayName 未导出");
|
|
64
66
|
if (typeof displayAssignee !== "function") {
|
|
65
67
|
// 函数未导出时的退路:直接验证读取路径(下面两条 HTTP 用例已经覆盖),
|
|
66
68
|
// 这里不静默通过 —— 明确记录「没有读数」的边界。
|
|
@@ -71,8 +73,13 @@ describe("assignee never contradicts a validated owner/agent_owner reference", (
|
|
|
71
73
|
owner_json: JSON.stringify({ kind: "user", username: "王工" }),
|
|
72
74
|
agent_owner_json: JSON.stringify({ kind: "node", id: "n_x", alias: "通信欧" }),
|
|
73
75
|
};
|
|
74
|
-
|
|
75
|
-
expect(displayAssignee({
|
|
76
|
+
// 读侧:只回显存下来的自由文本(不从引用推导 —— 无法区分「没设过」与「显式清空」)
|
|
77
|
+
expect(displayAssignee({ assignee: "ANet基建" })).toBe("ANet基建");
|
|
78
|
+
expect(displayAssignee({ assignee: "" })).toBe("");
|
|
79
|
+
// 写侧回填用的名字解析:引用 → 人名(node 用 alias,user 用 username)
|
|
80
|
+
expect(refDisplayName(JSON.stringify({ kind: "node", id: "n_x", alias: "通信欧" }))).toBe("通信欧");
|
|
81
|
+
expect(refDisplayName(JSON.stringify({ kind: "user", username: "王工" }))).toBe("王工");
|
|
82
|
+
expect(refDisplayName("")).toBe("");
|
|
76
83
|
// 没有引用时保留自由文本(系统外的人,删掉等于丢信息)
|
|
77
84
|
expect(displayAssignee({ assignee: " 王工 ", owner_json: null, agent_owner_json: null })).toBe("王工");
|
|
78
85
|
// 全是空 ⇒ 空串,不是 "undefined"/"null"
|
|
@@ -113,10 +120,35 @@ describe("assignee never contradicts a validated owner/agent_owner reference", (
|
|
|
113
120
|
expect(renamed.body.requirement.name).toBe("改个名字而已");
|
|
114
121
|
expect(renamed.body.requirement.assignee).toBe("asg-probe"); // 与上面那条同一张卡
|
|
115
122
|
|
|
116
|
-
//
|
|
117
|
-
//
|
|
123
|
+
// 两者**同时存在**时,读侧以**显式自由文本**为准(既有契约:调用方给的 assignee 不被覆盖)。
|
|
124
|
+
// 漂移的修法在写侧:设引用而**没显式给** assignee 时回填 —— 上面那条已经证明了这一点。
|
|
118
125
|
const both = await send("PATCH", `/api/requirements/${id}?network_id=${NET}`, { assignee: "王工" });
|
|
119
126
|
expect(both.status).toBe(200);
|
|
120
|
-
expect(both.body.requirement.assignee).toBe("
|
|
127
|
+
expect(both.body.requirement.assignee).toBe("王工");
|
|
128
|
+
});
|
|
129
|
+
});
|
|
130
|
+
|
|
131
|
+
describe("#3277 — deleting a node clears the cards that referenced it", () => {
|
|
132
|
+
test("agent_owner 被置空、participants 被摘掉,卡本身保留", async () => {
|
|
133
|
+
const { clearNodeFromRequirements } = await import("./requirements.js");
|
|
134
|
+
const created = await send("POST", `/api/requirements?network_id=${NET}`, {
|
|
135
|
+
name: "引用一个即将被删的节点",
|
|
136
|
+
column: "pool",
|
|
137
|
+
agent_owner: { kind: "node", alias: "asg-probe" },
|
|
138
|
+
participants: [{ kind: "node", alias: "asg-probe" }],
|
|
139
|
+
});
|
|
140
|
+
expect(created.status).toBe(201);
|
|
141
|
+
const id = created.body.requirement.id as string;
|
|
142
|
+
|
|
143
|
+
const res = clearNodeFromRequirements("n_asg_probe");
|
|
144
|
+
expect(res.agentOwnerCleared).toBeGreaterThan(0);
|
|
145
|
+
expect(res.participantsTouched).toBeGreaterThan(0);
|
|
146
|
+
|
|
147
|
+
const after = await send("GET", `/api/requirements/${id}?network_id=${NET}`);
|
|
148
|
+
expect(after.status).toBe(200);
|
|
149
|
+
// 卡还在,但不再指向一个不存在的节点
|
|
150
|
+
expect(after.body.requirement.agent_owner ?? null).toBeNull();
|
|
151
|
+
const parts = after.body.requirement.participants ?? [];
|
|
152
|
+
expect(parts.some((p: any) => p?.kind === "node" && p?.id === "n_asg_probe")).toBe(false);
|
|
121
153
|
});
|
|
122
154
|
});
|
package/src/requirements.ts
CHANGED
|
@@ -1263,11 +1263,9 @@ function patchRequirement(ctx: RequirementsRequestContext, row: Row, body: Recor
|
|
|
1263
1263
|
// 规则:调用方**没有显式给 assignee** 时,用本次写入后的引用回填;显式给了就以调用方为准
|
|
1264
1264
|
// (那可能是系统外的人,例如「王工」—— 用引用覆盖它等于丢信息)。
|
|
1265
1265
|
if (!has("assignee") && (has("owner") || has("agent_owner"))) {
|
|
1266
|
-
|
|
1267
|
-
|
|
1268
|
-
|
|
1269
|
-
agent_owner_json: people.agentOwnerJson,
|
|
1270
|
-
});
|
|
1266
|
+
// 用 refDisplayName(把 {kind,id} 换回人名),**不是** displayAssignee
|
|
1267
|
+
// (后者只回显存下来的自由文本 —— 这里正是要从引用推)。
|
|
1268
|
+
const fromRef = refDisplayName(people.agentOwnerJson) || refDisplayName(people.ownerJson);
|
|
1271
1269
|
if (fromRef) assignee = fromRef.slice(0, 80);
|
|
1272
1270
|
}
|
|
1273
1271
|
// RFC-040:只凭负责人身份改这张卡时,负责人 / 负责 Agent 只能交给本部门的人(或自己)/ 本部门成员的 Agent,
|
|
@@ -1483,30 +1481,76 @@ type LightRow = { requirement_id: string; seq?: number | null; network_id: strin
|
|
|
1483
1481
|
* agent_owner 必须是本网络 node),而 assignee 是自由文本。两者冲突时,读一侧应以引用为准。
|
|
1484
1482
|
* 没有引用时保留自由文本 —— 它可能是系统外的人(例如「王工」),删掉就等于丢信息。
|
|
1485
1483
|
*/
|
|
1486
|
-
|
|
1487
|
-
|
|
1488
|
-
|
|
1489
|
-
|
|
1490
|
-
|
|
1491
|
-
|
|
1492
|
-
|
|
1493
|
-
|
|
1494
|
-
|
|
1495
|
-
|
|
1496
|
-
|
|
1497
|
-
|
|
1498
|
-
|
|
1499
|
-
|
|
1500
|
-
|
|
1501
|
-
|
|
1502
|
-
|
|
1503
|
-
|
|
1504
|
-
|
|
1505
|
-
|
|
1506
|
-
|
|
1507
|
-
|
|
1508
|
-
|
|
1509
|
-
|
|
1484
|
+
/**
|
|
1485
|
+
* 2026-10-31 —— **删节点时要清掉指向它的卡引用**(#3277,实测 31 条悬空)。
|
|
1486
|
+
*
|
|
1487
|
+
* 实测:三个已删除的 node id 仍被 27 张卡引用,其中两个 id 在 api_tokens 里还有绑定行
|
|
1488
|
+
* ⇒ 悬空不是录入错误,是**删除路径的缺口**;而读侧把它显示成「负责人是 n_xxxx」。
|
|
1489
|
+
*
|
|
1490
|
+
* 处理:
|
|
1491
|
+
* · agent_owner 指向该节点 ⇒ 置空(卡本身不动,它是正确的)
|
|
1492
|
+
* · participants 含该节点 ⇒ 从列表里摘掉
|
|
1493
|
+
* · owner 是**人**,删节点不影响它 ⇒ 不动
|
|
1494
|
+
* 返回 { agentOwnerCleared, participantsTouched },供删除路径写进审计。
|
|
1495
|
+
*/
|
|
1496
|
+
export function clearNodeFromRequirements(nodeId: string): { agentOwnerCleared: number; participantsTouched: number } {
|
|
1497
|
+
const needle = `"id":"${nodeId}"`;
|
|
1498
|
+
let agentOwnerCleared = 0;
|
|
1499
|
+
const owners = db.all<{ requirement_id: string }>(
|
|
1500
|
+
"SELECT requirement_id FROM requirements WHERE agent_owner_json LIKE ?1", `%${needle}%`);
|
|
1501
|
+
for (const row of owners) {
|
|
1502
|
+
db.run("UPDATE requirements SET agent_owner_json = NULL, updated_at = ?2 WHERE requirement_id = ?1",
|
|
1503
|
+
[row.requirement_id, new Date().toISOString()]);
|
|
1504
|
+
agentOwnerCleared += 1;
|
|
1505
|
+
}
|
|
1506
|
+
let participantsTouched = 0;
|
|
1507
|
+
const parts = db.all<{ requirement_id: string; participants_json: string | null }>(
|
|
1508
|
+
"SELECT requirement_id, participants_json FROM requirements WHERE participants_json LIKE ?1", `%${needle}%`);
|
|
1509
|
+
for (const row of parts) {
|
|
1510
|
+
let list: Array<{ kind?: string; id?: string }> = [];
|
|
1511
|
+
try { list = JSON.parse(row.participants_json || "[]") as any[]; } catch { continue; }
|
|
1512
|
+
const next = (list || []).filter((ref) => !(ref?.kind === "node" && ref?.id === nodeId));
|
|
1513
|
+
if (next.length !== (list || []).length) {
|
|
1514
|
+
db.run("UPDATE requirements SET participants_json = ?2, updated_at = ?3 WHERE requirement_id = ?1",
|
|
1515
|
+
[row.requirement_id, JSON.stringify(next), new Date().toISOString()]);
|
|
1516
|
+
participantsTouched += 1;
|
|
1517
|
+
}
|
|
1518
|
+
}
|
|
1519
|
+
return { agentOwnerCleared, participantsTouched };
|
|
1520
|
+
}
|
|
1521
|
+
|
|
1522
|
+
export function refDisplayName(json: string | null | undefined): string {
|
|
1523
|
+
/**
|
|
1524
|
+
* 把写入侧的引用 `{kind,id}` 换回**给人看的名字**(node → nodes.alias,user → users.username)。
|
|
1525
|
+
* 只给**写侧回填**用:读侧不再由它推导 assignee(见 displayAssignee 的注释)。
|
|
1526
|
+
*/
|
|
1527
|
+
let ref: { kind?: string; id?: string; alias?: string; username?: string } | null = null;
|
|
1528
|
+
try { ref = json ? JSON.parse(json) : null; } catch { return ""; }
|
|
1529
|
+
if (!ref) return "";
|
|
1530
|
+
const inline = String(ref.alias || ref.username || "").trim();
|
|
1531
|
+
if (inline) return inline;
|
|
1532
|
+
if (!ref.id) return "";
|
|
1533
|
+
try {
|
|
1534
|
+
if (ref.kind === "node") {
|
|
1535
|
+
const r = db.get<{ alias: string | null }>("SELECT alias FROM nodes WHERE node_id = ?1", ref.id);
|
|
1536
|
+
if (r?.alias) return String(r.alias);
|
|
1537
|
+
} else if (ref.kind === "user") {
|
|
1538
|
+
const r = db.get<{ username: string | null }>("SELECT username FROM users WHERE user_id = ?1", ref.id);
|
|
1539
|
+
if (r?.username) return String(r.username);
|
|
1540
|
+
}
|
|
1541
|
+
} catch { /* 读不到就退回 id */ }
|
|
1542
|
+
return String(ref.id);
|
|
1543
|
+
}
|
|
1544
|
+
|
|
1545
|
+
export function displayAssignee(row: { assignee?: string | null }): string {
|
|
1546
|
+
/**
|
|
1547
|
+
* 2026-10-31 —— **只回显存下来的值,不从引用推导**(两次实测把方向改对了):
|
|
1548
|
+
* · 契约要求「显式 assignee 不被引用覆盖」(requirements-http 老测试)
|
|
1549
|
+
* · 契约也要求「显式清空后就是空」(同文件的 cleared 用例)
|
|
1550
|
+
* 两者合起来意味着:读侧无法区分「从没设过」与「显式清空」⇒ 推导就会猜错其中一边。
|
|
1551
|
+
* ⇒ 漂移的修法放在**写侧回填**(设引用且没显式给 assignee 时),读侧只负责如实显示。
|
|
1552
|
+
*/
|
|
1553
|
+
return String(row.assignee || "").trim();
|
|
1510
1554
|
}
|
|
1511
1555
|
|
|
1512
1556
|
const parseRef = (json: string | null) => { try { return json ? JSON.parse(json) : null; } catch { return null; } };
|
package/src/server.ts
CHANGED
|
@@ -105,7 +105,7 @@ import { diagnoseTask } from "./task-diagnostic.js";
|
|
|
105
105
|
import { listTaskLateReplies } from "./task-late-replies.js";
|
|
106
106
|
import { assertScheduledTaskBackendSupported, handleScheduledTaskRequest, startScheduledTaskScheduler } from "./scheduled-tasks.js";
|
|
107
107
|
import { startDueReminderTimer } from "./requirement-due-reminders.js";
|
|
108
|
-
import { handleRequirementsRequest } from "./requirements.js";
|
|
108
|
+
import { clearNodeFromRequirements, handleRequirementsRequest } from "./requirements.js";
|
|
109
109
|
import { readHubProviders, putHubProvider, providerWriteStatus } from "./hub-provider-config.js";
|
|
110
110
|
import { requestProviderApplication } from "./daemon-provider-snapshots.js";
|
|
111
111
|
import { requestNodeSecrets, getScopedSecrets } from "./scoped-secrets.js";
|
|
@@ -4051,7 +4051,10 @@ return Bun.serve({
|
|
|
4051
4051
|
observed_at: row?.observed_at ? new Date(row.observed_at).toISOString() : null,
|
|
4052
4052
|
...(state === "failed" ? { error: row?.error ?? null } : {}),
|
|
4053
4053
|
...(state === "never_switched"
|
|
4054
|
-
|
|
4054
|
+
// 2026-10-31 —— **hint 必须自带动作**(外部复核:互斥选项若需要不同动作才能区分,
|
|
4055
|
+
// 「一次动作」就只对其中一部分成立;同理,一句只描述状态的 hint 产不出下一步)。
|
|
4056
|
+
// 原来这句只说「显示的是本地默认配置」——读者知道现状,但不知道该做什么。
|
|
4057
|
+
? { hint: "这个节点还没有被切换过 provider,现在显示的是它本地的默认配置(不是 Hub 的读数)。要看 Hub 这份读数,先给节点切一次:POST 同一路由 {revision, selection},再 GET 回读 state 是否变 applied" }
|
|
4055
4058
|
: {}),
|
|
4056
4059
|
...(state === "unknown"
|
|
4057
4060
|
? {
|
|
@@ -6238,6 +6241,7 @@ return Bun.serve({
|
|
|
6238
6241
|
db.transaction(() => {
|
|
6239
6242
|
db.run("DELETE FROM nodes WHERE node_id = ?1", [node.node_id]);
|
|
6240
6243
|
clearNodeFromAgentTeams(node.node_id); // #764
|
|
6244
|
+
clearNodeFromRequirements(node.node_id); // #3277:卡上指向它的引用一并清掉
|
|
6241
6245
|
if (node.alias) {
|
|
6242
6246
|
db.run(
|
|
6243
6247
|
"DELETE FROM sessions WHERE alias = ?1 AND (network_id = ?2 OR (CAST(?2 AS TEXT) IS NULL AND network_id IS NULL))",
|
package/src/tools.ts
CHANGED
|
@@ -39,7 +39,7 @@ import { broadcastVerdict, dispatchVerdict, humanOnlyVerdict, NODE_TOOL_CLASS, n
|
|
|
39
39
|
import { countInFlightTasks } from "./node-in-flight-tasks.js";
|
|
40
40
|
import { restrictedMemberAttachmentsDenied } from "./restricted-files.js";
|
|
41
41
|
import { errorBody } from "./requirements-errors.js";
|
|
42
|
-
import { handleRequirementsRequest } from "./requirements.js";
|
|
42
|
+
import { handleRequirementsRequest, clearNodeFromRequirements } from "./requirements.js";
|
|
43
43
|
import {
|
|
44
44
|
buildAnetArgs as _unused_buildAnetArgs, // ensure module is loaded
|
|
45
45
|
validateName as validateChildName,
|
|
@@ -6003,6 +6003,9 @@ export function registerTools(server: McpServer, clientIP?: string, enforceNetwo
|
|
|
6003
6003
|
// By node_id, not alias — a same-alias rebuild keeps its session.
|
|
6004
6004
|
db.run(`DELETE FROM sessions WHERE node_id = ?1`, [row.child_node_id]);
|
|
6005
6005
|
clearNodeFromAgentTeams(row.child_node_id); // #764
|
|
6006
|
+
// 2026-10-31 —— #3277:卡上的引用也要清(实测 3 个已删节点仍被 27 张卡引用,
|
|
6007
|
+
// 其中 2 个 id 在 api_tokens 里还有绑定行 ⇒ 这是删除路径的缺口,不是录入错误)。
|
|
6008
|
+
clearNodeFromRequirements(row.child_node_id);
|
|
6006
6009
|
auditCreateNodeStrict({
|
|
6007
6010
|
action: "delete_node_completed",
|
|
6008
6011
|
user_id: null, network_id: row.network_id, target_id: request_id,
|