@xgjktech/xg_cwork_im 1.17.2 → 1.17.4
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/dist/index.d.ts.map +1 -1
- package/dist/index.js +28 -1
- package/dist/index.js.map +1 -1
- package/dist/src/agent-stream-client-registry.d.ts +4 -0
- package/dist/src/agent-stream-client-registry.d.ts.map +1 -0
- package/dist/src/agent-stream-client-registry.js +8 -0
- package/dist/src/agent-stream-client-registry.js.map +1 -0
- package/dist/src/channel.d.ts.map +1 -1
- package/dist/src/channel.js +2 -0
- package/dist/src/channel.js.map +1 -1
- package/dist/src/connection.d.ts +1 -1
- package/dist/src/connection.d.ts.map +1 -1
- package/dist/src/dispatch-mentioned-reply.d.ts +1 -0
- package/dist/src/dispatch-mentioned-reply.d.ts.map +1 -1
- package/dist/src/dispatch-mentioned-reply.js +5 -3
- package/dist/src/dispatch-mentioned-reply.js.map +1 -1
- package/dist/src/gateway-session-queue.d.ts +1 -0
- package/dist/src/gateway-session-queue.d.ts.map +1 -1
- package/dist/src/plan-blocked-notice.d.ts +14 -0
- package/dist/src/plan-blocked-notice.d.ts.map +1 -0
- package/dist/src/plan-blocked-notice.js +41 -0
- package/dist/src/plan-blocked-notice.js.map +1 -0
- package/dist/src/plan-blocked-notice.test.d.ts +2 -0
- package/dist/src/plan-blocked-notice.test.d.ts.map +1 -0
- package/dist/src/plan-blocked-notice.test.js +96 -0
- package/dist/src/plan-blocked-notice.test.js.map +1 -0
- package/dist/src/plan-event-subscription.d.ts +36 -0
- package/dist/src/plan-event-subscription.d.ts.map +1 -0
- package/dist/src/plan-event-subscription.js +57 -0
- package/dist/src/plan-event-subscription.js.map +1 -0
- package/dist/src/plan-event-subscription.test.d.ts +2 -0
- package/dist/src/plan-event-subscription.test.d.ts.map +1 -0
- package/dist/src/plan-event-subscription.test.js +167 -0
- package/dist/src/plan-event-subscription.test.js.map +1 -0
- package/dist/src/plan-stat-event.d.ts +28 -0
- package/dist/src/plan-stat-event.d.ts.map +1 -0
- package/dist/src/plan-stat-event.js +68 -0
- package/dist/src/plan-stat-event.js.map +1 -0
- package/dist/src/plan-stat-event.test.d.ts +2 -0
- package/dist/src/plan-stat-event.test.d.ts.map +1 -0
- package/dist/src/plan-stat-event.test.js +167 -0
- package/dist/src/plan-stat-event.test.js.map +1 -0
- package/dist/src/plan-store-access.d.ts +23 -0
- package/dist/src/plan-store-access.d.ts.map +1 -0
- package/dist/src/plan-store-access.js +96 -0
- package/dist/src/plan-store-access.js.map +1 -0
- package/dist/src/plan-store-access.test.d.ts +2 -0
- package/dist/src/plan-store-access.test.d.ts.map +1 -0
- package/dist/src/plan-store-access.test.js +207 -0
- package/dist/src/plan-store-access.test.js.map +1 -0
- package/dist/src/plan-tool-middleware.d.ts +22 -0
- package/dist/src/plan-tool-middleware.d.ts.map +1 -0
- package/dist/src/plan-tool-middleware.js +85 -0
- package/dist/src/plan-tool-middleware.js.map +1 -0
- package/dist/src/plan-tool-middleware.test.d.ts +2 -0
- package/dist/src/plan-tool-middleware.test.d.ts.map +1 -0
- package/dist/src/plan-tool-middleware.test.js +488 -0
- package/dist/src/plan-tool-middleware.test.js.map +1 -0
- package/dist/src/plan-tool-result.d.ts +20 -0
- package/dist/src/plan-tool-result.d.ts.map +1 -0
- package/dist/src/plan-tool-result.js +78 -0
- package/dist/src/plan-tool-result.js.map +1 -0
- package/dist/src/plan-tool-result.test.d.ts +2 -0
- package/dist/src/plan-tool-result.test.d.ts.map +1 -0
- package/dist/src/plan-tool-result.test.js +107 -0
- package/dist/src/plan-tool-result.test.js.map +1 -0
- package/dist/src/plan-ws-registry.d.ts +11 -0
- package/dist/src/plan-ws-registry.d.ts.map +1 -0
- package/dist/src/plan-ws-registry.js +27 -0
- package/dist/src/plan-ws-registry.js.map +1 -0
- package/dist/src/plan-ws-registry.test.d.ts +2 -0
- package/dist/src/plan-ws-registry.test.d.ts.map +1 -0
- package/dist/src/plan-ws-registry.test.js +43 -0
- package/dist/src/plan-ws-registry.test.js.map +1 -0
- package/dist/src/subagent-monitor.d.ts +3 -14
- package/dist/src/subagent-monitor.d.ts.map +1 -1
- package/dist/src/subagent-monitor.js +34 -35
- package/dist/src/subagent-monitor.js.map +1 -1
- package/openclaw.plugin.json +2 -1
- package/package.json +7 -3
|
@@ -0,0 +1,96 @@
|
|
|
1
|
+
import { openPlanStoreReadonly, resolvePlanDbPath } from "@xgjktech/xg-openclaw-shared";
|
|
2
|
+
const LOG_PREFIX = "[xg_cwork_im] [plan-store]";
|
|
3
|
+
let stateDir;
|
|
4
|
+
let handle;
|
|
5
|
+
let warnedNoStateDir = false;
|
|
6
|
+
/** 注入 stateDir(来自 api.runtime.state.resolveStateDir())。register(api) 时调用一次。 */
|
|
7
|
+
export function setPlanStateDir(dir) {
|
|
8
|
+
stateDir = dir;
|
|
9
|
+
handle = undefined;
|
|
10
|
+
warnedNoStateDir = false;
|
|
11
|
+
}
|
|
12
|
+
/** 测试用:重置模块级缓存与 stateDir */
|
|
13
|
+
export function resetPlanStoreAccessForTest() {
|
|
14
|
+
stateDir = undefined;
|
|
15
|
+
handle = undefined;
|
|
16
|
+
warnedNoStateDir = false;
|
|
17
|
+
}
|
|
18
|
+
function getHandle() {
|
|
19
|
+
if (handle) {
|
|
20
|
+
return handle;
|
|
21
|
+
}
|
|
22
|
+
if (!stateDir) {
|
|
23
|
+
if (!warnedNoStateDir) {
|
|
24
|
+
console.warn(`${LOG_PREFIX} stateDir 未设置,无法打开计划库`);
|
|
25
|
+
warnedNoStateDir = true;
|
|
26
|
+
}
|
|
27
|
+
return undefined;
|
|
28
|
+
}
|
|
29
|
+
let dbPath = "<unresolved>";
|
|
30
|
+
try {
|
|
31
|
+
dbPath = resolvePlanDbPath(stateDir);
|
|
32
|
+
handle = openPlanStoreReadonly(dbPath);
|
|
33
|
+
return handle;
|
|
34
|
+
}
|
|
35
|
+
catch (cause) {
|
|
36
|
+
console.warn(`${LOG_PREFIX} 打开计划库失败 dbPath=${dbPath} 原因=${String(cause)}`);
|
|
37
|
+
return undefined;
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
/**
|
|
41
|
+
* 按 planId 反查完整计划。
|
|
42
|
+
* 库不存在 / 打开失败 / 读取异常 → 返回 undefined 并记 warn 日志,绝不抛。
|
|
43
|
+
*/
|
|
44
|
+
export function getPlanById(planId) {
|
|
45
|
+
const h = getHandle();
|
|
46
|
+
if (!h) {
|
|
47
|
+
return undefined;
|
|
48
|
+
}
|
|
49
|
+
try {
|
|
50
|
+
return h.get(planId);
|
|
51
|
+
}
|
|
52
|
+
catch (cause) {
|
|
53
|
+
console.warn(`${LOG_PREFIX} 读取 plan 失败 planId=${planId} 原因=${String(cause)}`);
|
|
54
|
+
handle = undefined;
|
|
55
|
+
return undefined;
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
/**
|
|
59
|
+
* 列出全部计划摘要(重启恢复用)。
|
|
60
|
+
* 异常同上 → 返回空数组,绝不抛。
|
|
61
|
+
*/
|
|
62
|
+
export function listPlanSummaries() {
|
|
63
|
+
const h = getHandle();
|
|
64
|
+
if (!h) {
|
|
65
|
+
return [];
|
|
66
|
+
}
|
|
67
|
+
try {
|
|
68
|
+
return h.list();
|
|
69
|
+
}
|
|
70
|
+
catch (cause) {
|
|
71
|
+
console.warn(`${LOG_PREFIX} 列出 plan 列表失败 原因=${String(cause)}`);
|
|
72
|
+
handle = undefined;
|
|
73
|
+
return [];
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
/**
|
|
77
|
+
* 按来源会话(channel + to)反查全量 plan(WS 快照用)。
|
|
78
|
+
* shared 侧只读实现已内置"旧库缺 origin 列 → 返回 []"的探测降级;
|
|
79
|
+
* 这里叠加本文件既有的句柄级降级纪律:拿不到句柄 / 查询异常 → 记 warn、返回 []、绝不抛、
|
|
80
|
+
* 失败时清空句柄缓存(与 getPlanById 同款,供后续调用重试恢复)。
|
|
81
|
+
*/
|
|
82
|
+
export function listPlansByOrigin(channel, to) {
|
|
83
|
+
const h = getHandle();
|
|
84
|
+
if (!h) {
|
|
85
|
+
return [];
|
|
86
|
+
}
|
|
87
|
+
try {
|
|
88
|
+
return h.listPlansByOrigin({ channel, to });
|
|
89
|
+
}
|
|
90
|
+
catch (cause) {
|
|
91
|
+
console.warn(`${LOG_PREFIX} 按 origin 列出 plan 失败 channel=${channel} to=${to} 原因=${String(cause)}`);
|
|
92
|
+
handle = undefined;
|
|
93
|
+
return [];
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
//# sourceMappingURL=plan-store-access.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"plan-store-access.js","sourceRoot":"","sources":["../../src/plan-store-access.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"plan-store-access.test.d.ts","sourceRoot":"","sources":["../../src/plan-store-access.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,207 @@
|
|
|
1
|
+
import assert from "node:assert/strict";
|
|
2
|
+
import { mkdtempSync, rmSync } from "node:fs";
|
|
3
|
+
import { tmpdir } from "node:os";
|
|
4
|
+
import { join } from "node:path";
|
|
5
|
+
import { DatabaseSync } from "node:sqlite";
|
|
6
|
+
import { after, afterEach, beforeEach, describe, it } from "node:test";
|
|
7
|
+
import { resolvePlanDbPath, SqlitePlanStore } from "@xgjktech/xg-openclaw-shared";
|
|
8
|
+
import { getPlanById, listPlanSummaries, listPlansByOrigin, resetPlanStoreAccessForTest, setPlanStateDir, } from "./plan-store-access.js";
|
|
9
|
+
const tempDirs = [];
|
|
10
|
+
function makeTempStateDir() {
|
|
11
|
+
const dir = mkdtempSync(join(tmpdir(), "xg-plan-store-access-test-"));
|
|
12
|
+
tempDirs.push(dir);
|
|
13
|
+
return dir;
|
|
14
|
+
}
|
|
15
|
+
function makePlan(overrides = {}) {
|
|
16
|
+
return {
|
|
17
|
+
planId: "plan-1",
|
|
18
|
+
goal: "迁移配置到新版本",
|
|
19
|
+
createdAt: "2026-07-27T00:00:00.000Z",
|
|
20
|
+
updatedAt: "2026-07-27T00:00:00.000Z",
|
|
21
|
+
tasks: [],
|
|
22
|
+
...overrides,
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
beforeEach(() => {
|
|
26
|
+
resetPlanStoreAccessForTest();
|
|
27
|
+
});
|
|
28
|
+
afterEach(() => {
|
|
29
|
+
resetPlanStoreAccessForTest();
|
|
30
|
+
});
|
|
31
|
+
after(() => {
|
|
32
|
+
for (const dir of tempDirs) {
|
|
33
|
+
rmSync(dir, { recursive: true, force: true });
|
|
34
|
+
}
|
|
35
|
+
});
|
|
36
|
+
describe("getPlanById / listPlanSummaries: 缺库降级 (F4)", () => {
|
|
37
|
+
it("returns undefined / [] without throwing when plans.sqlite does not exist", () => {
|
|
38
|
+
const stateDir = makeTempStateDir();
|
|
39
|
+
setPlanStateDir(stateDir);
|
|
40
|
+
assert.equal(getPlanById("x"), undefined);
|
|
41
|
+
assert.deepEqual(listPlanSummaries(), []);
|
|
42
|
+
});
|
|
43
|
+
});
|
|
44
|
+
describe("getPlanById: 后建库恢复 (F5)", () => {
|
|
45
|
+
it("recovers once the harness plugin later creates and writes the db, without resetting module state", () => {
|
|
46
|
+
const stateDir = makeTempStateDir();
|
|
47
|
+
setPlanStateDir(stateDir);
|
|
48
|
+
// T1: 库不存在时先调用一次,期望降级为 undefined 且不缓存失败
|
|
49
|
+
assert.equal(getPlanById("plan-1"), undefined);
|
|
50
|
+
// T2: harness 侧后建库并写入
|
|
51
|
+
const dbPath = resolvePlanDbPath(stateDir);
|
|
52
|
+
const writer = new SqlitePlanStore(dbPath);
|
|
53
|
+
writer.set(makePlan({ planId: "plan-1", goal: "后建库恢复" }));
|
|
54
|
+
writer.close();
|
|
55
|
+
// T3: 不重置模块状态,再次调用应能读到(验证未缓存"打开失败")
|
|
56
|
+
const plan = getPlanById("plan-1");
|
|
57
|
+
assert.ok(plan);
|
|
58
|
+
assert.equal(plan.planId, "plan-1");
|
|
59
|
+
assert.equal(plan.goal, "后建库恢复");
|
|
60
|
+
});
|
|
61
|
+
});
|
|
62
|
+
describe("getPlanById: 正常反查", () => {
|
|
63
|
+
it("round-trips a plan with blocked task (note) and steps", () => {
|
|
64
|
+
const stateDir = makeTempStateDir();
|
|
65
|
+
setPlanStateDir(stateDir);
|
|
66
|
+
const dbPath = resolvePlanDbPath(stateDir);
|
|
67
|
+
const writer = new SqlitePlanStore(dbPath);
|
|
68
|
+
writer.set(makePlan({
|
|
69
|
+
planId: "plan-2",
|
|
70
|
+
goal: "带阻塞任务的计划",
|
|
71
|
+
tasks: [
|
|
72
|
+
{
|
|
73
|
+
title: "备份旧配置",
|
|
74
|
+
status: "blocked",
|
|
75
|
+
note: "缺少权限",
|
|
76
|
+
steps: [{ text: "导出 json", status: "completed" }],
|
|
77
|
+
},
|
|
78
|
+
{ title: "校验数据", status: "pending" },
|
|
79
|
+
],
|
|
80
|
+
}));
|
|
81
|
+
writer.close();
|
|
82
|
+
const plan = getPlanById("plan-2");
|
|
83
|
+
assert.ok(plan);
|
|
84
|
+
assert.equal(plan.goal, "带阻塞任务的计划");
|
|
85
|
+
assert.equal(plan.tasks.length, 2);
|
|
86
|
+
assert.equal(plan.tasks[0].status, "blocked");
|
|
87
|
+
assert.equal(plan.tasks[0].note, "缺少权限");
|
|
88
|
+
assert.deepEqual(plan.tasks[0].steps, [{ text: "导出 json", status: "completed" }]);
|
|
89
|
+
assert.equal(plan.tasks[1].status, "pending");
|
|
90
|
+
});
|
|
91
|
+
it("returns undefined for an unknown planId (normal case, not an error)", () => {
|
|
92
|
+
const stateDir = makeTempStateDir();
|
|
93
|
+
setPlanStateDir(stateDir);
|
|
94
|
+
const dbPath = resolvePlanDbPath(stateDir);
|
|
95
|
+
const writer = new SqlitePlanStore(dbPath);
|
|
96
|
+
writer.set(makePlan({ planId: "plan-exists" }));
|
|
97
|
+
writer.close();
|
|
98
|
+
assert.equal(getPlanById("plan-does-not-exist"), undefined);
|
|
99
|
+
});
|
|
100
|
+
});
|
|
101
|
+
describe("listPlanSummaries", () => {
|
|
102
|
+
it("lists all plans with correct taskCounts", () => {
|
|
103
|
+
const stateDir = makeTempStateDir();
|
|
104
|
+
setPlanStateDir(stateDir);
|
|
105
|
+
const dbPath = resolvePlanDbPath(stateDir);
|
|
106
|
+
const writer = new SqlitePlanStore(dbPath);
|
|
107
|
+
writer.set(makePlan({
|
|
108
|
+
planId: "plan-a",
|
|
109
|
+
goal: "计划 A",
|
|
110
|
+
tasks: [
|
|
111
|
+
{ title: "t1", status: "completed" },
|
|
112
|
+
{ title: "t2", status: "blocked", note: "n" },
|
|
113
|
+
{ title: "t3", status: "in_progress" },
|
|
114
|
+
{ title: "t4", status: "pending" },
|
|
115
|
+
],
|
|
116
|
+
}));
|
|
117
|
+
writer.set(makePlan({
|
|
118
|
+
planId: "plan-b",
|
|
119
|
+
goal: "计划 B",
|
|
120
|
+
tasks: [{ title: "t1", status: "completed" }],
|
|
121
|
+
}));
|
|
122
|
+
writer.close();
|
|
123
|
+
const summaries = listPlanSummaries();
|
|
124
|
+
assert.equal(summaries.length, 2);
|
|
125
|
+
const byId = new Map(summaries.map((s) => [s.planId, s]));
|
|
126
|
+
const a = byId.get("plan-a");
|
|
127
|
+
assert.ok(a);
|
|
128
|
+
assert.deepEqual(a.taskCounts, { total: 4, completed: 1, blocked: 1, inProgress: 1 });
|
|
129
|
+
const b = byId.get("plan-b");
|
|
130
|
+
assert.ok(b);
|
|
131
|
+
assert.deepEqual(b.taskCounts, { total: 1, completed: 1, blocked: 0, inProgress: 0 });
|
|
132
|
+
});
|
|
133
|
+
});
|
|
134
|
+
describe("未设置 stateDir", () => {
|
|
135
|
+
it("getPlanById returns undefined without throwing", () => {
|
|
136
|
+
assert.equal(getPlanById("x"), undefined);
|
|
137
|
+
assert.deepEqual(listPlanSummaries(), []);
|
|
138
|
+
});
|
|
139
|
+
});
|
|
140
|
+
/** 手工建一个 v1(无 origin 列)的 plans 表,模拟旧库升级前的真实状态(同 shared TASK-2x-1 手法)。 */
|
|
141
|
+
function createV1Schema(dbPath) {
|
|
142
|
+
const db = new DatabaseSync(dbPath);
|
|
143
|
+
db.exec(`
|
|
144
|
+
CREATE TABLE IF NOT EXISTS plans (
|
|
145
|
+
plan_id TEXT PRIMARY KEY,
|
|
146
|
+
goal TEXT NOT NULL,
|
|
147
|
+
created_at TEXT NOT NULL,
|
|
148
|
+
updated_at TEXT NOT NULL,
|
|
149
|
+
doc TEXT NOT NULL
|
|
150
|
+
) STRICT;
|
|
151
|
+
`);
|
|
152
|
+
db.exec("CREATE INDEX IF NOT EXISTS idx_plans_updated_at ON plans(updated_at);");
|
|
153
|
+
db.exec("PRAGMA user_version = 1;");
|
|
154
|
+
db.close();
|
|
155
|
+
}
|
|
156
|
+
function insertV1Row(dbPath, plan) {
|
|
157
|
+
const db = new DatabaseSync(dbPath);
|
|
158
|
+
db.prepare(`INSERT INTO plans (plan_id, goal, created_at, updated_at, doc)
|
|
159
|
+
VALUES (@planId, @goal, @createdAt, @updatedAt, @doc)`).run({
|
|
160
|
+
planId: plan.planId,
|
|
161
|
+
goal: plan.goal,
|
|
162
|
+
createdAt: plan.createdAt,
|
|
163
|
+
updatedAt: plan.updatedAt,
|
|
164
|
+
doc: JSON.stringify(plan),
|
|
165
|
+
});
|
|
166
|
+
db.close();
|
|
167
|
+
}
|
|
168
|
+
describe("listPlansByOrigin", () => {
|
|
169
|
+
it("真实临时库 + 多条 plan → 只返回匹配的", () => {
|
|
170
|
+
const stateDir = makeTempStateDir();
|
|
171
|
+
setPlanStateDir(stateDir);
|
|
172
|
+
const dbPath = resolvePlanDbPath(stateDir);
|
|
173
|
+
const writer = new SqlitePlanStore(dbPath);
|
|
174
|
+
writer.set(makePlan({
|
|
175
|
+
planId: "plan-g1",
|
|
176
|
+
origin: { channel: "xg_cwork_im", to: "g-1" },
|
|
177
|
+
}));
|
|
178
|
+
writer.set(makePlan({
|
|
179
|
+
planId: "plan-g2",
|
|
180
|
+
origin: { channel: "xg_cwork_im", to: "g-2" },
|
|
181
|
+
}));
|
|
182
|
+
writer.set(makePlan({ planId: "plan-no-origin" }));
|
|
183
|
+
writer.close();
|
|
184
|
+
const results = listPlansByOrigin("xg_cwork_im", "g-1");
|
|
185
|
+
assert.equal(results.length, 1);
|
|
186
|
+
assert.equal(results[0].planId, "plan-g1");
|
|
187
|
+
});
|
|
188
|
+
it("🔴 旧版库(无 origin 列,手工建 v1 表)→ 返回 [] 不抛", () => {
|
|
189
|
+
const stateDir = makeTempStateDir();
|
|
190
|
+
setPlanStateDir(stateDir);
|
|
191
|
+
const dbPath = resolvePlanDbPath(stateDir);
|
|
192
|
+
createV1Schema(dbPath);
|
|
193
|
+
insertV1Row(dbPath, makePlan({ planId: "plan-old" }));
|
|
194
|
+
assert.doesNotThrow(() => {
|
|
195
|
+
const results = listPlansByOrigin("xg_cwork_im", "g-1");
|
|
196
|
+
assert.deepEqual(results, []);
|
|
197
|
+
});
|
|
198
|
+
});
|
|
199
|
+
it("缺库 → 返回 [] 不抛", () => {
|
|
200
|
+
const stateDir = makeTempStateDir();
|
|
201
|
+
setPlanStateDir(stateDir);
|
|
202
|
+
assert.doesNotThrow(() => {
|
|
203
|
+
assert.deepEqual(listPlansByOrigin("xg_cwork_im", "g-1"), []);
|
|
204
|
+
});
|
|
205
|
+
});
|
|
206
|
+
});
|
|
207
|
+
//# sourceMappingURL=plan-store-access.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"plan-store-access.test.js","sourceRoot":"","sources":["../../src/plan-store-access.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import type { OpenClawPluginApi } from "openclaw/plugin-sdk";
|
|
2
|
+
import type { Plan } from "@xgjktech/xg-openclaw-shared";
|
|
3
|
+
export type AgentToolResultMiddleware = Parameters<OpenClawPluginApi["registerAgentToolResultMiddleware"]>[0];
|
|
4
|
+
export interface PlanMiddlewareDeps {
|
|
5
|
+
/** details 缺失时按 planId 反查权威状态(注入 TASK-2 的 getPlanById) */
|
|
6
|
+
getPlanById: (planId: string) => Plan | undefined;
|
|
7
|
+
/** 发送 PLAN_STAT 增量事件(注入实现,便于单测假实现;本身设计为同步返回、内部自行 catch) */
|
|
8
|
+
sendPlanStat: (params: {
|
|
9
|
+
plan: Plan;
|
|
10
|
+
source: "tool" | "snapshot";
|
|
11
|
+
}) => void;
|
|
12
|
+
}
|
|
13
|
+
/**
|
|
14
|
+
* 创建计划工具结果的 middleware handler。
|
|
15
|
+
*
|
|
16
|
+
* 三条硬约束(RULING-1 §2 / DESIGN.md D1b,红线):
|
|
17
|
+
* 1. 绝不抛异常:全身 try/catch,捕获后记 warn 并正常返回。
|
|
18
|
+
* 2. 绝不修改结果:恒返回 void,不 mutate event.result。
|
|
19
|
+
* 3. 不在 handler 内 await 网络 IO。
|
|
20
|
+
*/
|
|
21
|
+
export declare function createPlanToolResultMiddleware(deps: PlanMiddlewareDeps): AgentToolResultMiddleware;
|
|
22
|
+
//# sourceMappingURL=plan-tool-middleware.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"plan-tool-middleware.d.ts","sourceRoot":"","sources":["../../src/plan-tool-middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAC;AAIzD,MAAM,MAAM,yBAAyB,GAAG,UAAU,CAC9C,iBAAiB,CAAC,mCAAmC,CAAC,CACzD,CAAC,CAAC,CAAC,CAAC;AAML,MAAM,WAAW,kBAAkB;IAC/B,0DAA0D;IAC1D,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,GAAG,SAAS,CAAC;IAClD,2DAA2D;IAC3D,YAAY,EAAE,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,IAAI,CAAC;QAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAAA;KAAE,KAAK,IAAI,CAAC;CAC/E;AA2CD;;;;;;;GAOG;AACH,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,kBAAkB,GAAG,yBAAyB,CA0ClG"}
|
|
@@ -0,0 +1,85 @@
|
|
|
1
|
+
import { buildBlockedTelemetryLine, collectBlockedNotices } from "./plan-blocked-notice.js";
|
|
2
|
+
import { parsePlanToolResultFromValue } from "./plan-tool-result.js";
|
|
3
|
+
const PLAN_TOOL_NAMES = new Set(["xg_plan_write", "xg_plan_execute"]);
|
|
4
|
+
const LOG_PREFIX = "[xg_cwork_im] [plan-tool-middleware]";
|
|
5
|
+
function firstTextContent(result) {
|
|
6
|
+
const first = result.content[0];
|
|
7
|
+
if (!first || first.type !== "text" || typeof first.text !== "string") {
|
|
8
|
+
return undefined;
|
|
9
|
+
}
|
|
10
|
+
return first.text;
|
|
11
|
+
}
|
|
12
|
+
/**
|
|
13
|
+
* 从 middleware 事件中取 plan(优先级见 DESIGN.md D1):
|
|
14
|
+
* 1. `event.result.details`(结构守卫,纯对象无需 JSON.parse)
|
|
15
|
+
* 2. 回退解析 `event.result.content[0].text`
|
|
16
|
+
* 都拿不到 → undefined
|
|
17
|
+
*/
|
|
18
|
+
function extractPlanToolResult(event) {
|
|
19
|
+
const fromDetails = parsePlanToolResultFromValue(event.result.details);
|
|
20
|
+
if (fromDetails) {
|
|
21
|
+
return { parsed: fromDetails, fromDetails: true };
|
|
22
|
+
}
|
|
23
|
+
const text = firstTextContent(event.result);
|
|
24
|
+
if (text === undefined) {
|
|
25
|
+
return undefined;
|
|
26
|
+
}
|
|
27
|
+
const fromText = parsePlanToolResultFromValue(safeJsonParse(text));
|
|
28
|
+
if (fromText) {
|
|
29
|
+
return { parsed: fromText, fromDetails: false };
|
|
30
|
+
}
|
|
31
|
+
return undefined;
|
|
32
|
+
}
|
|
33
|
+
function safeJsonParse(text) {
|
|
34
|
+
try {
|
|
35
|
+
return JSON.parse(text);
|
|
36
|
+
}
|
|
37
|
+
catch {
|
|
38
|
+
return undefined;
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
/**
|
|
42
|
+
* 创建计划工具结果的 middleware handler。
|
|
43
|
+
*
|
|
44
|
+
* 三条硬约束(RULING-1 §2 / DESIGN.md D1b,红线):
|
|
45
|
+
* 1. 绝不抛异常:全身 try/catch,捕获后记 warn 并正常返回。
|
|
46
|
+
* 2. 绝不修改结果:恒返回 void,不 mutate event.result。
|
|
47
|
+
* 3. 不在 handler 内 await 网络 IO。
|
|
48
|
+
*/
|
|
49
|
+
export function createPlanToolResultMiddleware(deps) {
|
|
50
|
+
return (event, _ctx) => {
|
|
51
|
+
try {
|
|
52
|
+
if (!PLAN_TOOL_NAMES.has(event.toolName)) {
|
|
53
|
+
return;
|
|
54
|
+
}
|
|
55
|
+
const extracted = extractPlanToolResult(event);
|
|
56
|
+
if (!extracted) {
|
|
57
|
+
console.warn(`${LOG_PREFIX} 无法从工具返回中解析出合法 plan toolName=${event.toolName} toolCallId=${event.toolCallId}`);
|
|
58
|
+
return;
|
|
59
|
+
}
|
|
60
|
+
const { parsed, fromDetails } = extracted;
|
|
61
|
+
let plan = parsed.plan;
|
|
62
|
+
// 仅当 details 缺失(走了回退路径且仍拿不到完整 plan)时,才用权威反查
|
|
63
|
+
if (!fromDetails) {
|
|
64
|
+
const authoritative = deps.getPlanById(parsed.planId);
|
|
65
|
+
if (authoritative) {
|
|
66
|
+
plan = authoritative;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
// D2:每一条 blocked notice 都打一行遥测日志,不做任何去重——
|
|
70
|
+
// 日志重复恰恰是监控需要的频次信号(推群时代的去重是为了防刷屏,已不适用)。
|
|
71
|
+
for (const notice of collectBlockedNotices(plan)) {
|
|
72
|
+
console.warn(buildBlockedTelemetryLine(plan, notice, event.toolName));
|
|
73
|
+
}
|
|
74
|
+
// D3:每次计划工具成功调用都发一条 PLAN_STAT 增量,不筛 action、不做 diff、不去重。
|
|
75
|
+
// sendPlanStat 本身设计为同步返回、内部自行 catch,天然满足 fire-and-forget。
|
|
76
|
+
deps.sendPlanStat({ plan, source: "tool" });
|
|
77
|
+
return;
|
|
78
|
+
}
|
|
79
|
+
catch (err) {
|
|
80
|
+
console.warn(`${LOG_PREFIX} handler 内部异常,已吞: ${String(err)}`);
|
|
81
|
+
return;
|
|
82
|
+
}
|
|
83
|
+
};
|
|
84
|
+
}
|
|
85
|
+
//# sourceMappingURL=plan-tool-middleware.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"plan-tool-middleware.js","sourceRoot":"","sources":["../../src/plan-tool-middleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"plan-tool-middleware.test.d.ts","sourceRoot":"","sources":["../../src/plan-tool-middleware.test.ts"],"names":[],"mappings":""}
|