dsh-global-supervisor 0.0.0-stage → 0.5.2
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/LICENSE +21 -0
- package/README.md +52 -2
- package/README.zh-CN.md +55 -0
- package/client/client.js +168 -0
- package/client/src/factory-banner.txt +3 -0
- package/client/src/index.ts +153 -0
- package/cordis.patch.yml +8 -0
- package/dist/adapters/dsh-agent.d.ts +48 -0
- package/dist/adapters/dsh-agent.js +93 -0
- package/dist/adapters/dsh-agent.js.map +1 -0
- package/dist/adapters/dsh-im-notifier.d.ts +37 -0
- package/dist/adapters/dsh-im-notifier.js +48 -0
- package/dist/adapters/dsh-im-notifier.js.map +1 -0
- package/dist/adapters/dsh-llm-catalog.d.ts +26 -0
- package/dist/adapters/dsh-llm-catalog.js +41 -0
- package/dist/adapters/dsh-llm-catalog.js.map +1 -0
- package/dist/adapters/dsh-schedule.d.ts +51 -0
- package/dist/adapters/dsh-schedule.js +36 -0
- package/dist/adapters/dsh-schedule.js.map +1 -0
- package/dist/adapters/dsh-session.d.ts +40 -0
- package/dist/adapters/dsh-session.js +118 -0
- package/dist/adapters/dsh-session.js.map +1 -0
- package/dist/adapters/dsh-workspace.d.ts +29 -0
- package/dist/adapters/dsh-workspace.js +61 -0
- package/dist/adapters/dsh-workspace.js.map +1 -0
- package/dist/adapters/host-services.d.ts +13 -0
- package/dist/adapters/host-services.js +28 -0
- package/dist/adapters/host-services.js.map +1 -0
- package/dist/database/connection.d.ts +17 -0
- package/dist/database/connection.js +38 -0
- package/dist/database/connection.js.map +1 -0
- package/dist/database/migrations.d.ts +17 -0
- package/dist/database/migrations.js +239 -0
- package/dist/database/migrations.js.map +1 -0
- package/dist/database/repository/audit-repository.d.ts +29 -0
- package/dist/database/repository/audit-repository.js +21 -0
- package/dist/database/repository/audit-repository.js.map +1 -0
- package/dist/database/repository/event-repository.d.ts +34 -0
- package/dist/database/repository/event-repository.js +41 -0
- package/dist/database/repository/event-repository.js.map +1 -0
- package/dist/database/repository/event-routing-rule-repository.d.ts +37 -0
- package/dist/database/repository/event-routing-rule-repository.js +47 -0
- package/dist/database/repository/event-routing-rule-repository.js.map +1 -0
- package/dist/database/repository/plugin-setting-repository.d.ts +14 -0
- package/dist/database/repository/plugin-setting-repository.js +34 -0
- package/dist/database/repository/plugin-setting-repository.js.map +1 -0
- package/dist/database/repository/project-repository.d.ts +36 -0
- package/dist/database/repository/project-repository.js +83 -0
- package/dist/database/repository/project-repository.js.map +1 -0
- package/dist/database/repository/routing-rule-repository.d.ts +27 -0
- package/dist/database/repository/routing-rule-repository.js +57 -0
- package/dist/database/repository/routing-rule-repository.js.map +1 -0
- package/dist/database/repository/schedule-binding-repository.d.ts +33 -0
- package/dist/database/repository/schedule-binding-repository.js +36 -0
- package/dist/database/repository/schedule-binding-repository.js.map +1 -0
- package/dist/database/repository/task-repository.d.ts +47 -0
- package/dist/database/repository/task-repository.js +91 -0
- package/dist/database/repository/task-repository.js.map +1 -0
- package/dist/database/repository/task-run-repository.d.ts +23 -0
- package/dist/database/repository/task-run-repository.js +30 -0
- package/dist/database/repository/task-run-repository.js.map +1 -0
- package/dist/database/repository/thread-subscription-repository.d.ts +29 -0
- package/dist/database/repository/thread-subscription-repository.js +42 -0
- package/dist/database/repository/thread-subscription-repository.js.map +1 -0
- package/dist/database/repository/worker-report-repository.d.ts +38 -0
- package/dist/database/repository/worker-report-repository.js +32 -0
- package/dist/database/repository/worker-report-repository.js.map +1 -0
- package/dist/index.d.ts +88 -0
- package/dist/index.js +211 -0
- package/dist/index.js.map +1 -0
- package/dist/probe.d.ts +20 -0
- package/dist/probe.js +213 -0
- package/dist/probe.js.map +1 -0
- package/dist/protocols/schedule-timing.d.ts +34 -0
- package/dist/protocols/schedule-timing.js +165 -0
- package/dist/protocols/schedule-timing.js.map +1 -0
- package/dist/protocols/worker-report.d.ts +28 -0
- package/dist/protocols/worker-report.js +87 -0
- package/dist/protocols/worker-report.js.map +1 -0
- package/dist/runtime.d.ts +42 -0
- package/dist/runtime.js +92 -0
- package/dist/runtime.js.map +1 -0
- package/dist/services/agent-controller.d.ts +61 -0
- package/dist/services/agent-controller.js +146 -0
- package/dist/services/agent-controller.js.map +1 -0
- package/dist/services/event-batcher.d.ts +43 -0
- package/dist/services/event-batcher.js +98 -0
- package/dist/services/event-batcher.js.map +1 -0
- package/dist/services/event-manager.d.ts +52 -0
- package/dist/services/event-manager.js +64 -0
- package/dist/services/event-manager.js.map +1 -0
- package/dist/services/event-router.d.ts +60 -0
- package/dist/services/event-router.js +201 -0
- package/dist/services/event-router.js.map +1 -0
- package/dist/services/model-queue.d.ts +42 -0
- package/dist/services/model-queue.js +54 -0
- package/dist/services/model-queue.js.map +1 -0
- package/dist/services/notifier.d.ts +53 -0
- package/dist/services/notifier.js +99 -0
- package/dist/services/notifier.js.map +1 -0
- package/dist/services/project-monitor.d.ts +65 -0
- package/dist/services/project-monitor.js +125 -0
- package/dist/services/project-monitor.js.map +1 -0
- package/dist/services/router-identity.d.ts +60 -0
- package/dist/services/router-identity.js +93 -0
- package/dist/services/router-identity.js.map +1 -0
- package/dist/services/scheduler.d.ts +55 -0
- package/dist/services/scheduler.js +87 -0
- package/dist/services/scheduler.js.map +1 -0
- package/dist/services/settings-api.d.ts +40 -0
- package/dist/services/settings-api.js +212 -0
- package/dist/services/settings-api.js.map +1 -0
- package/dist/services/task-manager.d.ts +88 -0
- package/dist/services/task-manager.js +304 -0
- package/dist/services/task-manager.js.map +1 -0
- package/dist/services/task-state-machine.d.ts +17 -0
- package/dist/services/task-state-machine.js +37 -0
- package/dist/services/task-state-machine.js.map +1 -0
- package/dist/services/workspace-manager.d.ts +81 -0
- package/dist/services/workspace-manager.js +147 -0
- package/dist/services/workspace-manager.js.map +1 -0
- package/dist/tools/supervisor-tools.d.ts +9 -0
- package/dist/tools/supervisor-tools.js +644 -0
- package/dist/tools/supervisor-tools.js.map +1 -0
- package/dist/tools/toolkit.d.ts +40 -0
- package/dist/tools/toolkit.js +45 -0
- package/dist/tools/toolkit.js.map +1 -0
- package/dist/tools/worker-report-tool.d.ts +9 -0
- package/dist/tools/worker-report-tool.js +59 -0
- package/dist/tools/worker-report-tool.js.map +1 -0
- package/dist/types/index.d.ts +128 -0
- package/dist/types/index.js +6 -0
- package/dist/types/index.js.map +1 -0
- package/dist/utils/id.d.ts +4 -0
- package/dist/utils/id.js +8 -0
- package/dist/utils/id.js.map +1 -0
- package/docs/API_COMPATIBILITY.md +109 -0
- package/docs/ARCHITECTURE.md +28 -0
- package/docs/ASSESSMENT_SWOT.md +151 -0
- package/docs/DATABASE.md +28 -0
- package/docs/DEPLOYMENT.md +63 -0
- package/docs/DEVELOPMENT_PLAN.md +628 -0
- package/docs/INTEGRATIONS.md +88 -0
- package/docs/ITERATION_PLAN.md +953 -0
- package/docs/SUPER_AGENT_GAP_ANALYSIS.md +440 -0
- package/docs/TASK_STATE_MACHINE.md +26 -0
- package/docs/TEST_PLAN.md +53 -0
- package/docs/TROUBLESHOOTING.md +43 -0
- package/docs/UI_PANEL_PLAN.md +83 -0
- package/docs/USER_GUIDE.md +213 -0
- package/package.json +72 -4
|
@@ -0,0 +1,146 @@
|
|
|
1
|
+
import { ModelQueue } from './model-queue.js';
|
|
2
|
+
import { TaskManager } from './task-manager.js';
|
|
3
|
+
/** 默认执行超时(30 分钟,方案 §5.1 tasks.timeout_at)。 */
|
|
4
|
+
const DEFAULT_TIMEOUT_MS = 30 * 60 * 1000;
|
|
5
|
+
/** 解析 model_pref_json(畸形返回 undefined——偏好坏行不阻断派发)。 */
|
|
6
|
+
function parseModelPref(json) {
|
|
7
|
+
if (!json)
|
|
8
|
+
return undefined;
|
|
9
|
+
try {
|
|
10
|
+
const parsed = JSON.parse(json);
|
|
11
|
+
if (typeof parsed.provider === 'string' && typeof parsed.model === 'string') {
|
|
12
|
+
return {
|
|
13
|
+
provider: parsed.provider,
|
|
14
|
+
model: parsed.model,
|
|
15
|
+
...(typeof parsed.reasoningEffort === 'string' ? { reasoningEffort: parsed.reasoningEffort } : {}),
|
|
16
|
+
};
|
|
17
|
+
}
|
|
18
|
+
return undefined;
|
|
19
|
+
}
|
|
20
|
+
catch {
|
|
21
|
+
return undefined;
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
export class AgentController {
|
|
25
|
+
agents;
|
|
26
|
+
taskManager;
|
|
27
|
+
db;
|
|
28
|
+
queue;
|
|
29
|
+
permits = new Map();
|
|
30
|
+
constructor(agents, taskManager, db, maxConcurrency = 1) {
|
|
31
|
+
this.agents = agents;
|
|
32
|
+
this.taskManager = taskManager;
|
|
33
|
+
this.db = db;
|
|
34
|
+
this.queue = new ModelQueue(maxConcurrency);
|
|
35
|
+
}
|
|
36
|
+
/**
|
|
37
|
+
* 派发任务:queued → running → followup 指令(含汇报要求)。
|
|
38
|
+
* 并发许可保持到 worker_report 终态。
|
|
39
|
+
*/
|
|
40
|
+
async dispatchTask(taskId) {
|
|
41
|
+
const task = this.taskManager.tasks.byId(taskId);
|
|
42
|
+
if (!task)
|
|
43
|
+
return { dispatched: false, reason: 'task-missing', taskId };
|
|
44
|
+
const project = this.taskManager.projects.byId(task.project_id);
|
|
45
|
+
const workerSession = project?.worker_session_id;
|
|
46
|
+
if (!workerSession)
|
|
47
|
+
return { dispatched: false, reason: 'no-worker-session', taskId };
|
|
48
|
+
if (await this.agents.isBusy(workerSession)) {
|
|
49
|
+
return { dispatched: false, reason: 'busy', taskId };
|
|
50
|
+
}
|
|
51
|
+
const permit = await this.queue.submit({ id: taskId, priority: task.priority });
|
|
52
|
+
try {
|
|
53
|
+
this.taskManager.markDispatched(taskId, workerSession, new Date(Date.now() + DEFAULT_TIMEOUT_MS).toISOString());
|
|
54
|
+
const modelPref = parseModelPref(task.model_pref_json) ?? parseModelPref(project.model_pref_json);
|
|
55
|
+
await this.agents.dispatch(workerSession, this.buildInstruction(taskId, task.title, task.description), modelPref);
|
|
56
|
+
this.permits.set(taskId, permit);
|
|
57
|
+
return { dispatched: true, reason: 'ok', taskId };
|
|
58
|
+
}
|
|
59
|
+
catch (error) {
|
|
60
|
+
permit.release();
|
|
61
|
+
throw error;
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
/**
|
|
65
|
+
* 应用 Worker 汇报:TaskManager 状态机 + 终态释放并发许可。
|
|
66
|
+
* worker_report 工具的唯一后端入口。
|
|
67
|
+
*/
|
|
68
|
+
applyWorkerReport(report, callerSessionId) {
|
|
69
|
+
const outcome = this.taskManager.applyWorkerReport(report, callerSessionId);
|
|
70
|
+
if (outcome.accepted && (outcome.reason === 'applied')) {
|
|
71
|
+
const permit = this.permits.get(report.taskId);
|
|
72
|
+
if (permit) {
|
|
73
|
+
permit.release();
|
|
74
|
+
this.permits.delete(report.taskId);
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
return outcome;
|
|
78
|
+
}
|
|
79
|
+
/** 对 live 会话立即应用模型选择(工具层入口;冷会话返回 false)。 */
|
|
80
|
+
async applySessionModel(sessionId, pref) {
|
|
81
|
+
return this.agents.selectModelNow(sessionId, pref);
|
|
82
|
+
}
|
|
83
|
+
/** 运行中纠偏(不排队新轮次;下一模型步生效),留审计。 */
|
|
84
|
+
async steerTask(taskId, text, actor = { role: 'system' }) {
|
|
85
|
+
const task = this.taskManager.tasks.byId(taskId);
|
|
86
|
+
if (!task?.assigned_session_id)
|
|
87
|
+
return false;
|
|
88
|
+
await this.agents.steer(task.assigned_session_id, text);
|
|
89
|
+
this.taskManager.audit.log({
|
|
90
|
+
actorSessionId: actor.sessionId,
|
|
91
|
+
actorRole: actor.role,
|
|
92
|
+
action: 'task.steer',
|
|
93
|
+
targetType: 'task',
|
|
94
|
+
targetId: taskId,
|
|
95
|
+
detailJson: JSON.stringify({ text: text.slice(0, 200) }),
|
|
96
|
+
});
|
|
97
|
+
return true;
|
|
98
|
+
}
|
|
99
|
+
/** 取消:Agent 侧停止执行 + TaskManager 终态 + 许可释放。 */
|
|
100
|
+
async cancelTask(taskId, actor) {
|
|
101
|
+
const task = this.taskManager.tasks.byId(taskId);
|
|
102
|
+
if (task?.assigned_session_id) {
|
|
103
|
+
await this.agents.cancelAgent(task.assigned_session_id, 'supervisor 取消任务', true);
|
|
104
|
+
}
|
|
105
|
+
this.taskManager.cancel(taskId, actor);
|
|
106
|
+
const permit = this.permits.get(taskId);
|
|
107
|
+
if (permit) {
|
|
108
|
+
permit.release();
|
|
109
|
+
this.permits.delete(taskId);
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
/** 队列状态(诊断)。 */
|
|
113
|
+
stats() {
|
|
114
|
+
return this.queue.stats();
|
|
115
|
+
}
|
|
116
|
+
/**
|
|
117
|
+
* 释放某任务的并发许可(看门狗判超时/重试路径调用)。
|
|
118
|
+
* 许可若不释放,Worker 沉默一次即令后续派发永久挂起——这是队列死锁的唯一来源。
|
|
119
|
+
*/
|
|
120
|
+
releasePermit(taskId) {
|
|
121
|
+
const permit = this.permits.get(taskId);
|
|
122
|
+
if (!permit)
|
|
123
|
+
return false;
|
|
124
|
+
permit.release();
|
|
125
|
+
this.permits.delete(taskId);
|
|
126
|
+
return true;
|
|
127
|
+
}
|
|
128
|
+
/** 当前持有的许可数(诊断/测试)。 */
|
|
129
|
+
permitsCount() {
|
|
130
|
+
return this.permits.size;
|
|
131
|
+
}
|
|
132
|
+
/** 组装任务指令文本(含 worker_report 汇报要求)。 */
|
|
133
|
+
buildInstruction(taskId, title, description) {
|
|
134
|
+
return [
|
|
135
|
+
`【任务派发】${taskId}`,
|
|
136
|
+
`标题:${title}`,
|
|
137
|
+
description ? `说明:${description}` : '',
|
|
138
|
+
'',
|
|
139
|
+
'执行要求:完成或状态变化时调用 worker_report 工具汇报(workspace_id/task_id/status/progress/summary),',
|
|
140
|
+
`其中 task_id 必须为 ${taskId};任务完成时 status=completed。`,
|
|
141
|
+
]
|
|
142
|
+
.filter((line) => line !== '')
|
|
143
|
+
.join('\n');
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
//# sourceMappingURL=agent-controller.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"agent-controller.js","sourceRoot":"","sources":["../../src/services/agent-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* EventBatcher:事件批处理注入(ITERATION_PLAN Phase 5-A,借鉴 TianzeLuo)。
|
|
3
|
+
* Router 侧降噪:route_to_router 命中的事件先积累,防抖窗口内合批为一条 followup;
|
|
4
|
+
* Router 忙时延后(不丢),派发失败回填重试,批渲染带字符预算与召回提示。
|
|
5
|
+
*/
|
|
6
|
+
import type { EventRow } from '../types/index.js';
|
|
7
|
+
/** 派发目标(DshAgentAdapter 的最小面:dispatch + 可选忙判定)。 */
|
|
8
|
+
export interface BatchDispatchTarget {
|
|
9
|
+
dispatch(sessionId: string, text: string): Promise<void>;
|
|
10
|
+
isBusy?(sessionId: string): Promise<boolean>;
|
|
11
|
+
}
|
|
12
|
+
/** 批处理选项(均有缺省)。 */
|
|
13
|
+
export interface EventBatchOptions {
|
|
14
|
+
maxBatch?: number;
|
|
15
|
+
maxChars?: number;
|
|
16
|
+
debounceMs?: number;
|
|
17
|
+
}
|
|
18
|
+
export declare class EventBatcher {
|
|
19
|
+
private readonly agents;
|
|
20
|
+
private readonly routerSession;
|
|
21
|
+
/** 批派发失败回调(审计留痕用;批本身已回填待重试)。 */
|
|
22
|
+
private readonly onFlushError?;
|
|
23
|
+
private timer;
|
|
24
|
+
private readonly pending;
|
|
25
|
+
private readonly maxBatch;
|
|
26
|
+
private readonly maxChars;
|
|
27
|
+
private readonly debounceMs;
|
|
28
|
+
constructor(agents: BatchDispatchTarget, routerSession: () => string, options?: EventBatchOptions,
|
|
29
|
+
/** 批派发失败回调(审计留痕用;批本身已回填待重试)。 */
|
|
30
|
+
onFlushError?: ((error: unknown, batchSize: number) => void) | undefined);
|
|
31
|
+
/** 事件到达:满批即发,否则进入防抖窗口。 */
|
|
32
|
+
add(event: EventRow): void;
|
|
33
|
+
/** 立即合批发送:Router 忙则延后;失败回填 pending 并重试(at-least-once)。 */
|
|
34
|
+
flush(): Promise<void>;
|
|
35
|
+
/** 积压数量(诊断/测试)。 */
|
|
36
|
+
pendingCount(): number;
|
|
37
|
+
/** 停止定时器(插件卸载语义;未发批次留在内存由进程生命周期承担)。 */
|
|
38
|
+
stop(): void;
|
|
39
|
+
private armTimer;
|
|
40
|
+
private clearTimer;
|
|
41
|
+
/** 渲染一批事件为结构化文本(每条 inline 摘要 + 字符预算 + 召回提示)。 */
|
|
42
|
+
private renderBatch;
|
|
43
|
+
}
|
|
@@ -0,0 +1,98 @@
|
|
|
1
|
+
const DEFAULT_MAX_BATCH = 20;
|
|
2
|
+
const DEFAULT_MAX_CHARS = 8000;
|
|
3
|
+
const DEFAULT_DEBOUNCE_MS = 500;
|
|
4
|
+
/** 单条事件摘要的 inline 上限(借鉴 TianzeLuo inlineChars)。 */
|
|
5
|
+
const INLINE_CHARS = 280;
|
|
6
|
+
export class EventBatcher {
|
|
7
|
+
agents;
|
|
8
|
+
routerSession;
|
|
9
|
+
onFlushError;
|
|
10
|
+
timer;
|
|
11
|
+
pending = [];
|
|
12
|
+
maxBatch;
|
|
13
|
+
maxChars;
|
|
14
|
+
debounceMs;
|
|
15
|
+
constructor(agents, routerSession, options = {},
|
|
16
|
+
/** 批派发失败回调(审计留痕用;批本身已回填待重试)。 */
|
|
17
|
+
onFlushError) {
|
|
18
|
+
this.agents = agents;
|
|
19
|
+
this.routerSession = routerSession;
|
|
20
|
+
this.onFlushError = onFlushError;
|
|
21
|
+
this.maxBatch = options.maxBatch ?? DEFAULT_MAX_BATCH;
|
|
22
|
+
this.maxChars = options.maxChars ?? DEFAULT_MAX_CHARS;
|
|
23
|
+
this.debounceMs = options.debounceMs ?? DEFAULT_DEBOUNCE_MS;
|
|
24
|
+
}
|
|
25
|
+
/** 事件到达:满批即发,否则进入防抖窗口。 */
|
|
26
|
+
add(event) {
|
|
27
|
+
this.pending.push(event);
|
|
28
|
+
if (this.pending.length >= this.maxBatch) {
|
|
29
|
+
void this.flush();
|
|
30
|
+
}
|
|
31
|
+
else if (this.timer === undefined) {
|
|
32
|
+
this.armTimer();
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
/** 立即合批发送:Router 忙则延后;失败回填 pending 并重试(at-least-once)。 */
|
|
36
|
+
async flush() {
|
|
37
|
+
this.clearTimer();
|
|
38
|
+
if (this.pending.length === 0)
|
|
39
|
+
return;
|
|
40
|
+
const session = this.routerSession();
|
|
41
|
+
if (this.agents.isBusy !== undefined && await this.agents.isBusy(session)) {
|
|
42
|
+
this.armTimer();
|
|
43
|
+
return;
|
|
44
|
+
}
|
|
45
|
+
const batch = this.pending.splice(0, this.maxBatch);
|
|
46
|
+
try {
|
|
47
|
+
await this.agents.dispatch(session, this.renderBatch(batch, this.maxChars));
|
|
48
|
+
}
|
|
49
|
+
catch (error) {
|
|
50
|
+
this.pending.unshift(...batch);
|
|
51
|
+
this.armTimer();
|
|
52
|
+
this.onFlushError?.(error, batch.length);
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
/** 积压数量(诊断/测试)。 */
|
|
56
|
+
pendingCount() {
|
|
57
|
+
return this.pending.length;
|
|
58
|
+
}
|
|
59
|
+
/** 停止定时器(插件卸载语义;未发批次留在内存由进程生命周期承担)。 */
|
|
60
|
+
stop() {
|
|
61
|
+
this.clearTimer();
|
|
62
|
+
}
|
|
63
|
+
armTimer() {
|
|
64
|
+
if (this.timer !== undefined)
|
|
65
|
+
return;
|
|
66
|
+
this.timer = setTimeout(() => {
|
|
67
|
+
this.timer = undefined;
|
|
68
|
+
void this.flush();
|
|
69
|
+
}, this.debounceMs);
|
|
70
|
+
this.timer.unref();
|
|
71
|
+
}
|
|
72
|
+
clearTimer() {
|
|
73
|
+
if (this.timer !== undefined) {
|
|
74
|
+
clearTimeout(this.timer);
|
|
75
|
+
this.timer = undefined;
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
/** 渲染一批事件为结构化文本(每条 inline 摘要 + 字符预算 + 召回提示)。 */
|
|
79
|
+
renderBatch(batch, maxChars) {
|
|
80
|
+
const header = `【supervisor 事件批】共 ${batch.length} 条`;
|
|
81
|
+
const footer = '需完整上下文可用 supervisor_recall(按 event_id/task_id 召回关联任务、汇报与执行历史)。';
|
|
82
|
+
const budget = maxChars - header.length - footer.length;
|
|
83
|
+
const lines = [];
|
|
84
|
+
let used = 0;
|
|
85
|
+
for (const event of batch) {
|
|
86
|
+
const summary = event.payload_json.slice(0, INLINE_CHARS);
|
|
87
|
+
const line = `- ${event.event_id} [${event.source}/${event.type}] ${summary}`;
|
|
88
|
+
if (used + line.length > budget && lines.length > 0) {
|
|
89
|
+
lines.push('…(超出字符预算,余下事件留待下一批或经 supervisor_recall 查询)');
|
|
90
|
+
break;
|
|
91
|
+
}
|
|
92
|
+
lines.push(line);
|
|
93
|
+
used += line.length;
|
|
94
|
+
}
|
|
95
|
+
return [header, ...lines, '', footer].join('\n');
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
//# sourceMappingURL=event-batcher.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"event-batcher.js","sourceRoot":"","sources":["../../src/services/event-batcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* EventManager:统一事件入口(DEVELOPMENT_PLAN §6.4)。
|
|
3
|
+
* ingest → event_id 唯一约束去重(Schedule 非恰好一次投递的兜底)→ 落库 → 按规则表路由。
|
|
4
|
+
* handler 抛错不互相阻断,错误收集后返回调用方。
|
|
5
|
+
*/
|
|
6
|
+
import type { DatabaseSync } from 'node:sqlite';
|
|
7
|
+
import { EventRepository } from '../database/repository/event-repository.js';
|
|
8
|
+
import type { EventRow, EventSource } from '../types/index.js';
|
|
9
|
+
/** 事件输入(调用方构造;eventId 由来源保证唯一且稳定)。 */
|
|
10
|
+
export interface SupervisorEventInput {
|
|
11
|
+
eventId: string;
|
|
12
|
+
source: EventSource;
|
|
13
|
+
type: string;
|
|
14
|
+
workspaceId?: string;
|
|
15
|
+
taskId?: string;
|
|
16
|
+
payloadJson?: string;
|
|
17
|
+
dedupHash?: string;
|
|
18
|
+
/** 事件的 Thread 归属标识(如 GitHub Issue 编号、飞书话题 ID) */
|
|
19
|
+
threadId?: string;
|
|
20
|
+
/** 来源信道标识(如 im:feishu:group_123, webhook:github:repo_456) */
|
|
21
|
+
channelRef?: string;
|
|
22
|
+
/** 发送者身份(经 Gate 过滤后携带) */
|
|
23
|
+
actorJson?: string;
|
|
24
|
+
/** 是否为人类消息 */
|
|
25
|
+
human?: boolean;
|
|
26
|
+
}
|
|
27
|
+
/** 事件处理器。 */
|
|
28
|
+
export type EventHandler = (event: EventRow) => void | Promise<void>;
|
|
29
|
+
/** ingest 的结构化结果。 */
|
|
30
|
+
export interface IngestResult {
|
|
31
|
+
/** true 表示新事件已落库;false 表示重复被去重 */
|
|
32
|
+
inserted: boolean;
|
|
33
|
+
/** 实际派发的 handler 数 */
|
|
34
|
+
dispatched: number;
|
|
35
|
+
/** handler 抛出的错误(原样收集) */
|
|
36
|
+
errors: unknown[];
|
|
37
|
+
}
|
|
38
|
+
/** 事件管理器(内存态路由表 + events 表持久化)。 */
|
|
39
|
+
export declare class EventManager {
|
|
40
|
+
private readonly db;
|
|
41
|
+
readonly repository: EventRepository;
|
|
42
|
+
private readonly handlers;
|
|
43
|
+
constructor(db: DatabaseSync);
|
|
44
|
+
/** 注册处理器:type 精确匹配、尾缀 `.*` 前缀匹配(如 `schedule.*`)、或裸 `*` 全量匹配。 */
|
|
45
|
+
on(pattern: string, handler: EventHandler): void;
|
|
46
|
+
/**
|
|
47
|
+
* 写入并路由一个事件:重复 event_id 直接短路(不派发)。
|
|
48
|
+
*/
|
|
49
|
+
ingest(event: SupervisorEventInput): Promise<IngestResult>;
|
|
50
|
+
/** 按 type 匹配的 handler 列表(精确 + 前缀通配 + 裸 * 全量)。 */
|
|
51
|
+
private matchingHandlers;
|
|
52
|
+
}
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
import { EventRepository } from '../database/repository/event-repository.js';
|
|
2
|
+
/** 事件管理器(内存态路由表 + events 表持久化)。 */
|
|
3
|
+
export class EventManager {
|
|
4
|
+
db;
|
|
5
|
+
repository;
|
|
6
|
+
handlers = new Map();
|
|
7
|
+
constructor(db) {
|
|
8
|
+
this.db = db;
|
|
9
|
+
this.repository = new EventRepository(db);
|
|
10
|
+
}
|
|
11
|
+
/** 注册处理器:type 精确匹配、尾缀 `.*` 前缀匹配(如 `schedule.*`)、或裸 `*` 全量匹配。 */
|
|
12
|
+
on(pattern, handler) {
|
|
13
|
+
const list = this.handlers.get(pattern) ?? [];
|
|
14
|
+
list.push(handler);
|
|
15
|
+
this.handlers.set(pattern, list);
|
|
16
|
+
}
|
|
17
|
+
/**
|
|
18
|
+
* 写入并路由一个事件:重复 event_id 直接短路(不派发)。
|
|
19
|
+
*/
|
|
20
|
+
async ingest(event) {
|
|
21
|
+
const inserted = this.repository.ingest({
|
|
22
|
+
eventId: event.eventId,
|
|
23
|
+
source: event.source,
|
|
24
|
+
type: event.type,
|
|
25
|
+
workspaceId: event.workspaceId,
|
|
26
|
+
taskId: event.taskId,
|
|
27
|
+
payloadJson: event.payloadJson,
|
|
28
|
+
dedupHash: event.dedupHash,
|
|
29
|
+
threadId: event.threadId,
|
|
30
|
+
channelRef: event.channelRef,
|
|
31
|
+
actorJson: event.actorJson,
|
|
32
|
+
human: event.human,
|
|
33
|
+
});
|
|
34
|
+
if (!inserted) {
|
|
35
|
+
return { inserted: false, dispatched: 0, errors: [] };
|
|
36
|
+
}
|
|
37
|
+
const row = this.repository.byEventId(event.eventId);
|
|
38
|
+
if (!row) {
|
|
39
|
+
return { inserted: true, dispatched: 0, errors: [new Error('事件落库后不可读')] };
|
|
40
|
+
}
|
|
41
|
+
const matched = this.matchingHandlers(row.type);
|
|
42
|
+
const errors = [];
|
|
43
|
+
for (const handler of matched) {
|
|
44
|
+
try {
|
|
45
|
+
await handler(row);
|
|
46
|
+
}
|
|
47
|
+
catch (error) {
|
|
48
|
+
errors.push(error);
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
return { inserted: true, dispatched: matched.length, errors };
|
|
52
|
+
}
|
|
53
|
+
/** 按 type 匹配的 handler 列表(精确 + 前缀通配 + 裸 * 全量)。 */
|
|
54
|
+
matchingHandlers(type) {
|
|
55
|
+
const result = [];
|
|
56
|
+
for (const [pattern, list] of this.handlers) {
|
|
57
|
+
if (pattern === '*' || pattern === type || (pattern.endsWith('.*') && type.startsWith(pattern.slice(0, -1)))) {
|
|
58
|
+
result.push(...list);
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
return result;
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
//# sourceMappingURL=event-manager.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"event-manager.js","sourceRoot":"","sources":["../../src/services/event-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* EventRouter:事件路由决策层(ITERATION_PLAN Phase 2——简化 Eval)。
|
|
3
|
+
* 两层判断:代码层规则过滤(event_routing_rules 表)+ Router 决策(followup 后自行调工具)。
|
|
4
|
+
* observe 模式(默认)只评估并留痕不派发;auto 模式按规则 followup 到 Router 或指定会话。
|
|
5
|
+
*/
|
|
6
|
+
import type { DatabaseSync } from 'node:sqlite';
|
|
7
|
+
import { EventRoutingRuleRepository } from '../database/repository/event-routing-rule-repository.js';
|
|
8
|
+
import type { EventRoutingAction, EventRoutingRuleRow } from '../database/repository/event-routing-rule-repository.js';
|
|
9
|
+
import type { EventBatcher } from './event-batcher.js';
|
|
10
|
+
import type { EventRow } from '../types/index.js';
|
|
11
|
+
/** 事件派发目标(DshAgentAdapter 的 dispatch 最小面,便于测试替身)。 */
|
|
12
|
+
export interface EventDispatchTarget {
|
|
13
|
+
dispatch(sessionId: string, text: string): Promise<void>;
|
|
14
|
+
}
|
|
15
|
+
/** 路由结果(与 audit_logs.action 一致的机器可判别值)。 */
|
|
16
|
+
export type RouteOutcome = 'event.pending' | 'event.observed' | 'event.routed' | 'event.ignored' | 'event.passed_through';
|
|
17
|
+
/** supervisor_event_list 的单行视图(状态由该事件最新一条审计派生)。 */
|
|
18
|
+
export interface EventWithStatus {
|
|
19
|
+
event_id: string;
|
|
20
|
+
source: string;
|
|
21
|
+
type: string;
|
|
22
|
+
created_at: string;
|
|
23
|
+
payload_excerpt: string;
|
|
24
|
+
status: 'pending' | 'observed' | 'routed' | 'ignored' | 'passed_through';
|
|
25
|
+
}
|
|
26
|
+
export declare class EventRouter {
|
|
27
|
+
private readonly agents;
|
|
28
|
+
private readonly resolveRouterSession;
|
|
29
|
+
/** 可选批处理器:route_to_router 命中时合批投递(Phase 5-A,缺省直发) */
|
|
30
|
+
private readonly batcher?;
|
|
31
|
+
readonly rules: EventRoutingRuleRepository;
|
|
32
|
+
private readonly settings;
|
|
33
|
+
private readonly audit;
|
|
34
|
+
private readonly events;
|
|
35
|
+
private readonly threadSubs;
|
|
36
|
+
constructor(db: DatabaseSync, agents: EventDispatchTarget, resolveRouterSession: () => string,
|
|
37
|
+
/** 可选批处理器:route_to_router 命中时合批投递(Phase 5-A,缺省直发) */
|
|
38
|
+
batcher?: EventBatcher | undefined);
|
|
39
|
+
/** 当前路由模式(默认 observe——安全机制)。 */
|
|
40
|
+
mode(): 'observe' | 'auto';
|
|
41
|
+
/** 切换模式(KV 持久化 + 审计)。 */
|
|
42
|
+
setMode(mode: 'observe' | 'auto', actorSessionId?: string): void;
|
|
43
|
+
/** 保存路由规则(含审计)。 */
|
|
44
|
+
saveRule(input: {
|
|
45
|
+
sourcePattern: string;
|
|
46
|
+
action: EventRoutingAction;
|
|
47
|
+
targetSessionId?: string;
|
|
48
|
+
description?: string;
|
|
49
|
+
enabled?: boolean;
|
|
50
|
+
}, actorSessionId: string): Promise<EventRoutingRuleRow>;
|
|
51
|
+
/** 事件到达后的路由决策(永不抛错——派发失败降级 pending 并记入审计)。 */
|
|
52
|
+
route(event: EventRow): Promise<RouteOutcome>;
|
|
53
|
+
/**
|
|
54
|
+
* Thread 直通(最高优先级):事件所属 Thread 有 running 且已派发会话的订阅者时,
|
|
55
|
+
* 事件直投其 Worker 会话且不经 Router。无无可投订阅者时返回 undefined——事件继续走规则路由(不丢事件)。
|
|
56
|
+
*/
|
|
57
|
+
private routeThreadPassThrough;
|
|
58
|
+
/** 事件流水 + 每条的路由状态(可选按来源/状态过滤)。 */
|
|
59
|
+
listEventsWithStatus(source: string | undefined, limit: number, statusFilter: string | undefined): EventWithStatus[];
|
|
60
|
+
}
|