@adamancyzhang/claude-orchestrator 0.3.0 → 0.3.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/README.md +203 -201
- package/dist/cli/commands.d.ts +6 -17
- package/dist/cli/commands.js +133 -172
- package/dist/cli/commands.js.map +1 -1
- package/dist/config.d.ts +28 -14
- package/dist/config.js +51 -20
- package/dist/config.js.map +1 -1
- package/dist/executor/runner.d.ts +19 -0
- package/dist/executor/runner.js +59 -0
- package/dist/executor/runner.js.map +1 -0
- package/dist/executor/template.d.ts +12 -0
- package/dist/executor/template.js +42 -0
- package/dist/executor/template.js.map +1 -0
- package/dist/hooks/engine.d.ts +22 -0
- package/dist/hooks/engine.js +50 -0
- package/dist/hooks/engine.js.map +1 -0
- package/dist/index.js +115 -250
- package/dist/index.js.map +1 -1
- package/dist/leader/chain-router.d.ts +22 -0
- package/dist/leader/chain-router.js +163 -0
- package/dist/leader/chain-router.js.map +1 -0
- package/dist/leader/event-bus.d.ts +1 -1
- package/dist/leader/event-bus.js +1 -1
- package/dist/leader/event-bus.js.map +1 -1
- package/dist/leader/index.d.ts +1 -2
- package/dist/leader/index.js +35 -13
- package/dist/leader/index.js.map +1 -1
- package/dist/leader/recovery.d.ts +2 -0
- package/dist/leader/recovery.js +37 -22
- package/dist/leader/recovery.js.map +1 -1
- package/dist/leader/state.d.ts +2 -1
- package/dist/leader/state.js +48 -2
- package/dist/leader/state.js.map +1 -1
- package/dist/leader/tui.d.ts +8 -0
- package/dist/leader/tui.js +74 -9
- package/dist/leader/tui.js.map +1 -1
- package/dist/leader/watcher.d.ts +4 -3
- package/dist/leader/watcher.js +8 -13
- package/dist/leader/watcher.js.map +1 -1
- package/dist/models/schemas.d.ts +307 -87
- package/dist/models/schemas.js +51 -43
- package/dist/models/schemas.js.map +1 -1
- package/dist/modules/message-router.d.ts +1 -3
- package/dist/modules/message-router.js +3 -26
- package/dist/modules/message-router.js.map +1 -1
- package/dist/modules/registry.js +3 -3
- package/dist/modules/registry.js.map +1 -1
- package/dist/modules/task-queue.d.ts +1 -1
- package/dist/modules/task-queue.js +28 -2
- package/dist/modules/task-queue.js.map +1 -1
- package/dist/skills/CLAUDE.md +155 -0
- package/dist/skills/claude-code-developer/SKILL.md +325 -0
- package/dist/skills/claude-orchestrator/SKILL.md +244 -0
- package/dist/skills/task-acceptance/SKILL.md +201 -0
- package/dist/skills/task-execution/SKILL.md +142 -0
- package/dist/skills/task-planning/SKILL.md +188 -0
- package/dist/skills/task-review/SKILL.md +220 -0
- package/dist/skills/task-traceability/SKILL.md +154 -0
- package/dist/skills/task-verification/SKILL.md +194 -0
- package/dist/templates/worker-accept.md +46 -0
- package/dist/templates/worker-build.md +45 -0
- package/dist/templates/worker-decompose.md +67 -0
- package/dist/templates/worker-evaluate.md +41 -0
- package/dist/templates/worker-plan.md +43 -0
- package/dist/templates/worker-review.md +46 -0
- package/dist/templates/worker-verify.md +47 -0
- package/dist/utils/exec.d.ts +5 -0
- package/dist/utils/exec.js +27 -0
- package/dist/utils/exec.js.map +1 -1
- package/dist/utils/logger.d.ts +10 -0
- package/dist/utils/logger.js +22 -0
- package/dist/utils/logger.js.map +1 -0
- package/dist/worker/evaluator.d.ts +13 -0
- package/dist/worker/evaluator.js +112 -0
- package/dist/worker/evaluator.js.map +1 -0
- package/dist/worker/watcher.d.ts +13 -4
- package/dist/worker/watcher.js +108 -24
- package/dist/worker/watcher.js.map +1 -1
- package/dist/zk/client.d.ts +0 -5
- package/dist/zk/client.js +0 -27
- package/dist/zk/client.js.map +1 -1
- package/dist/zk/paths.d.ts +8 -10
- package/dist/zk/paths.js +1 -6
- package/dist/zk/paths.js.map +1 -1
- package/dist/zk/watcher.d.ts +0 -2
- package/dist/zk/watcher.js +0 -3
- package/dist/zk/watcher.js.map +1 -1
- package/package.json +2 -2
- package/dist/modules/context-store.d.ts +0 -10
- package/dist/modules/context-store.js +0 -25
- package/dist/modules/context-store.js.map +0 -1
- package/dist/templates/leader.md +0 -10
- package/dist/templates/worker.md +0 -8
package/dist/models/schemas.js
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { z } from "zod";
|
|
2
2
|
// ── Enums ──
|
|
3
3
|
export const InstanceStatus = z.enum(["idle", "busy"]);
|
|
4
|
-
export const InstanceRole = z.enum(["
|
|
5
|
-
export const
|
|
4
|
+
export const InstanceRole = z.enum(["planner", "builder", "verifier", "reviewer", "accepter", "leader"]);
|
|
5
|
+
export const TaskLink = z.enum(["plan", "build", "verify", "review", "accept"]);
|
|
6
|
+
export const TaskStatus = z.enum(["pending", "claimed", "completed", "blocked", "failed"]);
|
|
6
7
|
export const TaskPriority = z.number().int().min(0).max(2);
|
|
7
8
|
export const TaskPriorityName = {
|
|
8
9
|
0: "HIGH",
|
|
@@ -17,7 +18,7 @@ function utcNow() {
|
|
|
17
18
|
export const InstanceSchema = z.object({
|
|
18
19
|
id: z.string(),
|
|
19
20
|
name: z.string(),
|
|
20
|
-
role: InstanceRole.default("
|
|
21
|
+
role: InstanceRole.default("builder"),
|
|
21
22
|
status: InstanceStatus.default("idle"),
|
|
22
23
|
current_task_id: z.string().nullable().default(null),
|
|
23
24
|
connected_since: z.string(),
|
|
@@ -36,6 +37,8 @@ export const TaskSchema = z.object({
|
|
|
36
37
|
completed_at: z.string().nullable().default(null),
|
|
37
38
|
claimed_by: z.string().nullable().default(null),
|
|
38
39
|
result: z.string().nullable().default(null),
|
|
40
|
+
link: TaskLink.nullable().default(null),
|
|
41
|
+
chain_id: z.string().nullable().default(null),
|
|
39
42
|
retry_count: z.number().int().default(0),
|
|
40
43
|
blocked_reason: z.string().nullable().default(null),
|
|
41
44
|
fail_reason: z.string().nullable().default(null),
|
|
@@ -43,6 +46,8 @@ export const TaskSchema = z.object({
|
|
|
43
46
|
assigned_to_name: z.string().nullable().default(null),
|
|
44
47
|
completed_by_name: z.string().nullable().default(null),
|
|
45
48
|
duration_seconds: z.number().nullable().default(null),
|
|
49
|
+
depends_on: z.array(z.string()).default([]),
|
|
50
|
+
blocked_by: z.array(z.string()).default([]),
|
|
46
51
|
});
|
|
47
52
|
export const MessageSchema = z.object({
|
|
48
53
|
id: z.string().default(""),
|
|
@@ -55,22 +60,20 @@ export const MessageSchema = z.object({
|
|
|
55
60
|
content: z.string(),
|
|
56
61
|
created_at: z.string(),
|
|
57
62
|
read: z.boolean().default(false),
|
|
63
|
+
link: z.string().nullable().default(null),
|
|
64
|
+
task_title: z.string().nullable().default(null),
|
|
65
|
+
task_description: z.string().nullable().default(null),
|
|
66
|
+
task_criteria: z.string().nullable().default(null),
|
|
58
67
|
task_doc_path: z.string().nullable().default(null),
|
|
59
68
|
result_path: z.string().nullable().default(null),
|
|
60
69
|
reply_to: z.string().nullable().default(null),
|
|
61
70
|
});
|
|
62
|
-
export const ContextEntrySchema = z.object({
|
|
63
|
-
key: z.string(),
|
|
64
|
-
value: z.string(),
|
|
65
|
-
updated_by: z.string().default(""),
|
|
66
|
-
updated_at: z.string(),
|
|
67
|
-
});
|
|
68
71
|
// ── Factory helpers (mirrors Python Field(default_factory=...)) ──
|
|
69
72
|
export function createInstance(overrides) {
|
|
70
73
|
return InstanceSchema.parse({
|
|
71
74
|
id: overrides.id ?? crypto.randomUUID().replace(/-/g, ""),
|
|
72
75
|
name: overrides.name,
|
|
73
|
-
role: overrides.role ?? "
|
|
76
|
+
role: overrides.role ?? "builder",
|
|
74
77
|
status: "idle",
|
|
75
78
|
current_task_id: null,
|
|
76
79
|
connected_since: utcNow(),
|
|
@@ -91,6 +94,8 @@ export function createTask(overrides) {
|
|
|
91
94
|
completed_at: null,
|
|
92
95
|
claimed_by: null,
|
|
93
96
|
result: null,
|
|
97
|
+
link: overrides.link ?? null,
|
|
98
|
+
chain_id: overrides.chain_id ?? null,
|
|
94
99
|
retry_count: 0,
|
|
95
100
|
blocked_reason: null,
|
|
96
101
|
fail_reason: null,
|
|
@@ -98,6 +103,8 @@ export function createTask(overrides) {
|
|
|
98
103
|
assigned_to_name: overrides.assigned_to_name ?? null,
|
|
99
104
|
completed_by_name: null,
|
|
100
105
|
duration_seconds: null,
|
|
106
|
+
depends_on: overrides.depends_on ?? [],
|
|
107
|
+
blocked_by: overrides.blocked_by ?? [],
|
|
101
108
|
});
|
|
102
109
|
}
|
|
103
110
|
export function createMessage(overrides) {
|
|
@@ -112,29 +119,20 @@ export function createMessage(overrides) {
|
|
|
112
119
|
content: overrides.content,
|
|
113
120
|
created_at: utcNow(),
|
|
114
121
|
read: false,
|
|
122
|
+
link: overrides.link ?? null,
|
|
123
|
+
task_title: overrides.task_title ?? null,
|
|
124
|
+
task_description: overrides.task_description ?? null,
|
|
125
|
+
task_criteria: overrides.task_criteria ?? null,
|
|
115
126
|
task_doc_path: overrides.task_doc_path ?? null,
|
|
116
127
|
result_path: overrides.result_path ?? null,
|
|
117
128
|
reply_to: overrides.reply_to ?? null,
|
|
118
129
|
});
|
|
119
130
|
}
|
|
120
|
-
export function createContextEntry(overrides) {
|
|
121
|
-
return ContextEntrySchema.parse({
|
|
122
|
-
key: overrides.key,
|
|
123
|
-
value: overrides.value,
|
|
124
|
-
updated_by: overrides.updated_by ?? "",
|
|
125
|
-
updated_at: utcNow(),
|
|
126
|
-
});
|
|
127
|
-
}
|
|
128
131
|
// ── Tool input schemas ──
|
|
129
132
|
export const RegisterInstanceInput = z.object({
|
|
130
133
|
name: z.string().min(1),
|
|
131
|
-
role: InstanceRole
|
|
134
|
+
role: InstanceRole,
|
|
132
135
|
instance_id: z.string().optional(),
|
|
133
|
-
work_dir: z.string().optional(),
|
|
134
|
-
});
|
|
135
|
-
export const HeartbeatInput = z.object({
|
|
136
|
-
instance_id: z.string(),
|
|
137
|
-
current_task: z.string().optional(),
|
|
138
136
|
});
|
|
139
137
|
export const PushTaskInput = z.object({
|
|
140
138
|
title: z.string().min(1),
|
|
@@ -142,6 +140,10 @@ export const PushTaskInput = z.object({
|
|
|
142
140
|
priority: TaskPriority.default(1),
|
|
143
141
|
instance_id: z.string().default(""),
|
|
144
142
|
assignee: z.string().optional(),
|
|
143
|
+
link: z.string().optional(),
|
|
144
|
+
chain_id: z.string().optional(),
|
|
145
|
+
depends_on: z.array(z.string()).default([]),
|
|
146
|
+
blocked_by: z.array(z.string()).default([]),
|
|
145
147
|
});
|
|
146
148
|
export const ClaimTaskInput = z.object({
|
|
147
149
|
instance_id: z.string(),
|
|
@@ -160,14 +162,11 @@ export const SendMessageInput = z.object({
|
|
|
160
162
|
to_instance: z.string().optional(),
|
|
161
163
|
to_name: z.string().optional(),
|
|
162
164
|
broadcast: z.boolean().default(false),
|
|
165
|
+
help: z.boolean().default(false),
|
|
163
166
|
});
|
|
164
167
|
export const PollMessagesInput = z.object({
|
|
165
168
|
instance_id: z.string(),
|
|
166
169
|
});
|
|
167
|
-
export const WaitForMessageInput = z.object({
|
|
168
|
-
instance_id: z.string(),
|
|
169
|
-
timeout_seconds: z.number().int().min(1).default(30),
|
|
170
|
-
});
|
|
171
170
|
export const MarkReadInput = z.object({
|
|
172
171
|
instance_id: z.string(),
|
|
173
172
|
message_id: z.string(),
|
|
@@ -176,20 +175,29 @@ export const DismissMessageInput = z.object({
|
|
|
176
175
|
instance_id: z.string(),
|
|
177
176
|
message_id: z.string(),
|
|
178
177
|
});
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
178
|
+
// ── Chain & Evaluation Schemas ──
|
|
179
|
+
export const ChainTaskDefSchema = z.object({
|
|
180
|
+
title: z.string(),
|
|
181
|
+
description: z.string(),
|
|
182
|
+
criteria: z.string(),
|
|
183
|
+
priority: z.number().int().min(0).max(3),
|
|
184
|
+
});
|
|
185
|
+
export const ChainDefSchema = z.object({
|
|
186
|
+
chain_id: z.string(),
|
|
187
|
+
chain_title: z.string(),
|
|
188
|
+
tasks: z.object({
|
|
189
|
+
plan: ChainTaskDefSchema.nullable(),
|
|
190
|
+
build: ChainTaskDefSchema,
|
|
191
|
+
verify: ChainTaskDefSchema,
|
|
192
|
+
review: ChainTaskDefSchema,
|
|
193
|
+
accept: ChainTaskDefSchema,
|
|
194
|
+
}),
|
|
195
|
+
});
|
|
196
|
+
export const EvalDecisionSchema = z.object({
|
|
197
|
+
decision: z.enum(["activate_next", "feedback", "close_chain"]),
|
|
198
|
+
reason: z.string(),
|
|
199
|
+
feedback: z.string().optional(),
|
|
200
|
+
nextLink: z.string().optional(),
|
|
201
|
+
suggestedWorker: z.string().nullable().optional(),
|
|
194
202
|
});
|
|
195
203
|
//# sourceMappingURL=schemas.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schemas.js","sourceRoot":"","sources":["../../src/models/schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,cAAc;AAEd,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AAGvD,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"schemas.js","sourceRoot":"","sources":["../../src/models/schemas.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,12 +3,10 @@ import { type Message } from "../models/schemas.js";
|
|
|
3
3
|
export declare class MessageRouter {
|
|
4
4
|
private zk;
|
|
5
5
|
constructor(zk: ZkClient);
|
|
6
|
-
send(fromInstance: string, fromName: string, content: string, toInstance?: string, broadcast?: boolean, toName?: string): Promise<Message[]>;
|
|
6
|
+
send(fromInstance: string, fromName: string, content: string, toInstance?: string, broadcast?: boolean, toName?: string, help?: boolean): Promise<Message[]>;
|
|
7
7
|
poll(instanceId: string): Promise<Message[]>;
|
|
8
8
|
waitForMessage(instanceId: string, timeoutSeconds?: number): Promise<Message[]>;
|
|
9
9
|
markRead(instanceId: string, messageId: string): Promise<void>;
|
|
10
10
|
dismissMessage(instanceId: string, messageId: string): Promise<void>;
|
|
11
|
-
sendWithTemplate(fromInstance: string, fromName: string, fromRole: string, content: string, templateName: "leader.md" | "worker.md", variables: Record<string, string>, templateDir: string, toInstance?: string, broadcast?: boolean, toName?: string): Promise<Message[]>;
|
|
12
|
-
requestHelp(fromInstance: string, fromName: string, question: string, ctx?: string): Promise<Message[]>;
|
|
13
11
|
}
|
|
14
12
|
export declare function renderTemplate(templatePath: string, variables: Record<string, string>): Promise<string>;
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import * as fs from "node:fs";
|
|
2
|
-
import * as path from "node:path";
|
|
3
2
|
import { MessageSchema, createMessage, } from "../models/schemas.js";
|
|
4
3
|
function utcNow() {
|
|
5
4
|
return new Date().toISOString();
|
|
@@ -9,7 +8,7 @@ export class MessageRouter {
|
|
|
9
8
|
constructor(zk) {
|
|
10
9
|
this.zk = zk;
|
|
11
10
|
}
|
|
12
|
-
async send(fromInstance, fromName, content, toInstance, broadcast = false, toName) {
|
|
11
|
+
async send(fromInstance, fromName, content, toInstance, broadcast = false, toName, help = false) {
|
|
13
12
|
const messages = [];
|
|
14
13
|
// Name-based addressing: resolve to_name to instance_id
|
|
15
14
|
if (toName) {
|
|
@@ -26,9 +25,9 @@ export class MessageRouter {
|
|
|
26
25
|
toInstance = match.id;
|
|
27
26
|
}
|
|
28
27
|
}
|
|
29
|
-
let msgType = broadcast ? "broadcast" : "direct";
|
|
28
|
+
let msgType = help ? "help" : (broadcast ? "broadcast" : "direct");
|
|
30
29
|
let targets;
|
|
31
|
-
if (broadcast) {
|
|
30
|
+
if (broadcast || help) {
|
|
32
31
|
const instances = await this.zk.listInstances();
|
|
33
32
|
targets = instances
|
|
34
33
|
.map((i) => i.id)
|
|
@@ -93,28 +92,6 @@ export class MessageRouter {
|
|
|
93
92
|
async dismissMessage(instanceId, messageId) {
|
|
94
93
|
await this.zk.deleteMessage(instanceId, messageId);
|
|
95
94
|
}
|
|
96
|
-
async sendWithTemplate(fromInstance, fromName, fromRole, content, templateName, variables, templateDir, toInstance, broadcast = false, toName) {
|
|
97
|
-
const templatePath = path.join(templateDir, "agents", templateName);
|
|
98
|
-
const rendered = await renderTemplate(templatePath, {
|
|
99
|
-
...variables,
|
|
100
|
-
content,
|
|
101
|
-
});
|
|
102
|
-
return this.send(fromInstance, fromName, rendered, toInstance, broadcast, toName);
|
|
103
|
-
}
|
|
104
|
-
async requestHelp(fromInstance, fromName, question, ctx) {
|
|
105
|
-
let content = question;
|
|
106
|
-
if (ctx) {
|
|
107
|
-
content = `${question}\n\nContext:\n${ctx}`;
|
|
108
|
-
}
|
|
109
|
-
// Set message type to "help" by modifying after creation
|
|
110
|
-
const messages = await this.send(fromInstance, fromName, content, undefined, true);
|
|
111
|
-
// Update type to "help" for each message
|
|
112
|
-
for (const msg of messages) {
|
|
113
|
-
msg.type = "help";
|
|
114
|
-
await this.zk.updateMessage(msg.to_instance, msg.id, msg);
|
|
115
|
-
}
|
|
116
|
-
return messages;
|
|
117
|
-
}
|
|
118
95
|
}
|
|
119
96
|
export async function renderTemplate(templatePath, variables) {
|
|
120
97
|
let content = await fs.promises.readFile(templatePath, "utf-8");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-router.js","sourceRoot":"","sources":["../../src/modules/message-router.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"message-router.js","sourceRoot":"","sources":["../../src/modules/message-router.ts"],"names":[],"mappings":"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"}
|
package/dist/modules/registry.js
CHANGED
|
@@ -4,10 +4,10 @@ export class InstanceRegistry {
|
|
|
4
4
|
constructor(zk) {
|
|
5
5
|
this.zk = zk;
|
|
6
6
|
}
|
|
7
|
-
async register(name, role = "
|
|
8
|
-
const validRole = ["
|
|
7
|
+
async register(name, role = "builder", instanceId) {
|
|
8
|
+
const validRole = ["planner", "builder", "verifier", "reviewer", "accepter", "leader"].includes(role)
|
|
9
9
|
? role
|
|
10
|
-
: "
|
|
10
|
+
: "builder";
|
|
11
11
|
if (instanceId) {
|
|
12
12
|
const existing = await this.zk.getInstance(instanceId);
|
|
13
13
|
if (existing) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/modules/registry.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,cAAc,GAGf,MAAM,sBAAsB,CAAC;AAE9B,MAAM,OAAO,gBAAgB;IACP;IAApB,YAAoB,EAAY;QAAZ,OAAE,GAAF,EAAE,CAAU;IAAG,CAAC;IAEpC,KAAK,CAAC,QAAQ,CACZ,IAAY,EACZ,OAAe,SAAS,EACxB,UAAmB;QAEnB,MAAM,SAAS,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/modules/registry.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { type Task } from "../models/schemas.js";
|
|
|
3
3
|
export declare class TaskQueue {
|
|
4
4
|
private zk;
|
|
5
5
|
constructor(zk: ZkClient);
|
|
6
|
-
push(title: string, description?: string, priority?: number, createdBy?: string, assignedTo?: string, createdByName?: string, assignedToName?: string | null): Promise<Task>;
|
|
6
|
+
push(title: string, description?: string, priority?: number, createdBy?: string, assignedTo?: string, createdByName?: string, assignedToName?: string | null, link?: string | null, chainId?: string | null, dependsOn?: string[], blockedBy?: string[]): Promise<Task>;
|
|
7
7
|
claim(instanceId: string): Promise<Task | null>;
|
|
8
8
|
complete(instanceId: string, taskId: string, result: string): Promise<Task>;
|
|
9
9
|
block(instanceId: string, taskId: string, reason: string): Promise<Task>;
|
|
@@ -7,7 +7,7 @@ export class TaskQueue {
|
|
|
7
7
|
constructor(zk) {
|
|
8
8
|
this.zk = zk;
|
|
9
9
|
}
|
|
10
|
-
async push(title, description = "", priority = 1, createdBy = "", assignedTo, createdByName, assignedToName) {
|
|
10
|
+
async push(title, description = "", priority = 1, createdBy = "", assignedTo, createdByName, assignedToName, link, chainId, dependsOn, blockedBy) {
|
|
11
11
|
const task = createTask({
|
|
12
12
|
title,
|
|
13
13
|
description,
|
|
@@ -16,6 +16,10 @@ export class TaskQueue {
|
|
|
16
16
|
assigned_to: assignedTo ?? null,
|
|
17
17
|
created_by_name: createdByName,
|
|
18
18
|
assigned_to_name: assignedToName ?? null,
|
|
19
|
+
link,
|
|
20
|
+
chain_id: chainId,
|
|
21
|
+
depends_on: dependsOn ?? [],
|
|
22
|
+
blocked_by: blockedBy ?? [],
|
|
19
23
|
});
|
|
20
24
|
const taskId = await this.zk.createPendingTask(task);
|
|
21
25
|
task.id = taskId;
|
|
@@ -23,12 +27,30 @@ export class TaskQueue {
|
|
|
23
27
|
}
|
|
24
28
|
async claim(instanceId) {
|
|
25
29
|
const pending = await this.zk.listPendingTasks();
|
|
30
|
+
// Read instance role for weight matching
|
|
31
|
+
let instanceRole = "";
|
|
32
|
+
try {
|
|
33
|
+
const instData = await this.zk.getInstance(instanceId);
|
|
34
|
+
instanceRole = instData?.role ?? "";
|
|
35
|
+
}
|
|
36
|
+
catch {
|
|
37
|
+
// proceed without role-weight sorting
|
|
38
|
+
}
|
|
39
|
+
const roleToLink = {
|
|
40
|
+
planner: "plan",
|
|
41
|
+
builder: "build",
|
|
42
|
+
verifier: "verify",
|
|
43
|
+
reviewer: "review",
|
|
44
|
+
accepter: "accept",
|
|
45
|
+
};
|
|
26
46
|
const sortKey = (item) => {
|
|
27
47
|
const [, data] = item;
|
|
28
48
|
const assigned = data.assigned_to;
|
|
29
49
|
const prio = data.priority ?? 1;
|
|
30
50
|
const isAssignedToMe = assigned === instanceId ? 0 : 1;
|
|
31
|
-
|
|
51
|
+
const taskLink = data.link ?? "";
|
|
52
|
+
const roleMatch = taskLink && roleToLink[instanceRole] === taskLink ? 0 : 1;
|
|
53
|
+
return [isAssignedToMe, roleMatch, prio, item[0]];
|
|
32
54
|
};
|
|
33
55
|
pending.sort((a, b) => {
|
|
34
56
|
const ka = sortKey(a);
|
|
@@ -81,6 +103,8 @@ export class TaskQueue {
|
|
|
81
103
|
completed_at: now,
|
|
82
104
|
completed_by_name: claimedData.claimed_by_name ?? "",
|
|
83
105
|
result,
|
|
106
|
+
link: claimedData.link ?? null,
|
|
107
|
+
chain_id: claimedData.chain_id ?? null,
|
|
84
108
|
retry_count: claimedData.retry_count ?? 0,
|
|
85
109
|
duration_seconds: durationSeconds,
|
|
86
110
|
created_by_name: claimedData.created_by_name ?? "",
|
|
@@ -135,6 +159,8 @@ export class TaskQueue {
|
|
|
135
159
|
assigned_to_name: completedData.assigned_to_name ?? null,
|
|
136
160
|
created_by_name: completedData.created_by_name ?? "",
|
|
137
161
|
created_at: utcNow(),
|
|
162
|
+
link: completedData.link ?? null,
|
|
163
|
+
chain_id: completedData.chain_id ?? null,
|
|
138
164
|
retry_count: retryCount,
|
|
139
165
|
status: "pending",
|
|
140
166
|
blocked_reason: null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-queue.js","sourceRoot":"","sources":["../../src/modules/task-queue.ts"],"names":[],"mappings":"AACA,OAAO,EACL,UAAU,EACV,UAAU,GAEX,MAAM,sBAAsB,CAAC;AAE9B,SAAS,MAAM;IACb,OAAO,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;AAClC,CAAC;AAED,MAAM,OAAO,SAAS;IACA;IAApB,YAAoB,EAAY;QAAZ,OAAE,GAAF,EAAE,CAAU;IAAG,CAAC;IAEpC,KAAK,CAAC,IAAI,CACR,KAAa,EACb,cAAsB,EAAE,EACxB,WAAmB,CAAC,EACpB,YAAoB,EAAE,EACtB,UAAmB,EACnB,aAAsB,EACtB,cAA8B;
|
|
1
|
+
{"version":3,"file":"task-queue.js","sourceRoot":"","sources":["../../src/modules/task-queue.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,155 @@
|
|
|
1
|
+
# Skills for Multi-Agent Orchestration
|
|
2
|
+
|
|
3
|
+
Skills 是按责任链角色设计的标准化工作流。每个 skill 对应一个责任链角色,定义明确的输入、步骤、和产出。Skills 之间通过交叉引用形成闭环协作。
|
|
4
|
+
|
|
5
|
+
---
|
|
6
|
+
|
|
7
|
+
## 责任链与 Skill 映射
|
|
8
|
+
|
|
9
|
+
```
|
|
10
|
+
Leader (协调层)
|
|
11
|
+
└── claude-orchestrator: 实例注册、任务分发、消息传递、上下文共享
|
|
12
|
+
|
|
13
|
+
责任链: Plan → Build → Verify → Review → Accept
|
|
14
|
+
│ │ │ │ │
|
|
15
|
+
▼ ▼ ▼ ▼ ▼
|
|
16
|
+
task- task- task- task- task-
|
|
17
|
+
planning execution verification review acceptance
|
|
18
|
+
|
|
19
|
+
基础层 (所有角色):
|
|
20
|
+
task-traceability: 追溯 → 执行 → 映射 → 举证 → 记录 — 责任链可审计、可交接、可签收的基础
|
|
21
|
+
```
|
|
22
|
+
|
|
23
|
+
| 角色 | Skill | 输入 | 产出 |
|
|
24
|
+
|------|-------|------|------|
|
|
25
|
+
| **Leader** | `claude-orchestrator` | 需求/目标 | 任务在队列中,Worker 在工作 |
|
|
26
|
+
| **Planner** | `task-planning` + `task-traceability` | 需求上下文 | 蓝图文档 + 任务队列 + 可追溯记录 |
|
|
27
|
+
| **Builder** | `task-execution` + `task-traceability` | 蓝图 + 任务 | 代码 commit + 可追溯记录 |
|
|
28
|
+
| **Verifier** | `task-verification` + `task-traceability` | 蓝图 + Builder 产出 | 验证报告 + 可追溯记录 |
|
|
29
|
+
| **Reviewer** | `task-review` + `task-traceability` | 蓝图 + Build 代码 + Verify 报告 | 审查报告 (Pass/Revise) + 可追溯记录 |
|
|
30
|
+
| **Accepter** | `task-acceptance` + `task-traceability` | 全链产出 + 验收标准 | 验收报告 (Go/No-Go) + 可追溯记录 |
|
|
31
|
+
|
|
32
|
+
---
|
|
33
|
+
|
|
34
|
+
## 各 Skill 详述
|
|
35
|
+
|
|
36
|
+
### claude-orchestrator
|
|
37
|
+
|
|
38
|
+
Multi-agent orchestration CLI backed by ZooKeeper。所有角色都使用它来完成基础设施操作:注册实例、认领任务、发送消息、读写共享上下文。
|
|
39
|
+
|
|
40
|
+
- **入口**: `claude-orchestrator <command>`
|
|
41
|
+
- **关键命令**: `register`, `claim-task`, `complete-task`, `push-task`, `send-message`, `set-context`, `get-context`
|
|
42
|
+
- **适用角色**: 所有角色
|
|
43
|
+
|
|
44
|
+
### task-planning
|
|
45
|
+
|
|
46
|
+
Planner 将需求分析拆解为可执行任务蓝图的标准化工作流。
|
|
47
|
+
|
|
48
|
+
- **触发**: "分析需求"、"拆解任务"、"制定计划"
|
|
49
|
+
- **六步法**: 读取需求 → 定义蓝图 → 拆解任务 → 推入队列 → 建立验收标准 → 通知 Leader
|
|
50
|
+
- **产出**: 蓝图文档 + orchestrator 任务队列中的任务
|
|
51
|
+
- **依赖**: 需求上下文(Leader 提供或文档来源)
|
|
52
|
+
|
|
53
|
+
### task-execution
|
|
54
|
+
|
|
55
|
+
Builder 认领任务后精准执行的工作流。
|
|
56
|
+
|
|
57
|
+
- **触发**: "执行任务"、"开始构建"、claim build 类型任务后
|
|
58
|
+
- **六步法**: 认领并获取上下文 → 理解范围 → 执行实现 → 自测验证 → 提交代码 → 报告完成
|
|
59
|
+
- **产出**: 代码 commit + 可追溯记录 (commit hash → 任务文档)
|
|
60
|
+
- **协作 skill**: `task-traceability` (提交规范)
|
|
61
|
+
- **依赖**: Planner 的蓝图
|
|
62
|
+
|
|
63
|
+
### task-verification
|
|
64
|
+
|
|
65
|
+
Verifier 对照蓝图独立验证 Builder 产出的工作流。
|
|
66
|
+
|
|
67
|
+
- **触发**: "验证任务"、"verify"、claim verify 类型任务后
|
|
68
|
+
- **六步法**: 认领并读蓝图 → 收集产出物 → 逐项验证 → 边缘检查 → 判定偏离 → 产出报告
|
|
69
|
+
- **产出**: 验证报告(通过/不通过 + 问题清单)
|
|
70
|
+
- **依赖**: Planner 的蓝图 + Builder 的代码 commit
|
|
71
|
+
|
|
72
|
+
### task-review
|
|
73
|
+
|
|
74
|
+
Reviewer 从设计意图高度审查全链产出的工作流。
|
|
75
|
+
|
|
76
|
+
- **触发**: "审查"、"review"、"code review"、claim review 类型任务后
|
|
77
|
+
- **六步法**: 收集全链信息 → 审查设计一致性 → 审查验证报告 → 判定问题等级 → 书写报告 → 通知流转
|
|
78
|
+
- **产出**: 审查报告(Pass/Revise + P0-P3 问题清单)
|
|
79
|
+
- **依赖**: Plan 蓝图 + Build 代码 + Verify 报告
|
|
80
|
+
|
|
81
|
+
### task-acceptance
|
|
82
|
+
|
|
83
|
+
Accepter 从业务需求角度验收最终交付物的工作流。
|
|
84
|
+
|
|
85
|
+
- **触发**: "确认并验收"、"验收一下"、"检查完成情况"
|
|
86
|
+
- **八步法**: 参见 `skills/task-acceptance/SKILL.md`
|
|
87
|
+
- **产出**: 验收报告(Go/No-Go + 问题清单)
|
|
88
|
+
- **依赖**: 全链产出(Plan → Build → Verify → Review)+ 业务验收标准
|
|
89
|
+
|
|
90
|
+
### task-traceability
|
|
91
|
+
|
|
92
|
+
基础层工作流:责任链可审计、可交接、可签收的基石。所有角色都依赖它来建立可追溯记录。
|
|
93
|
+
|
|
94
|
+
- **触发**: 任何责任链环节的任务执行
|
|
95
|
+
- **五步法**: 追溯上游要求 → 按追溯到的要求执行 → 将产出映射回上游要求 → 为每个映射提供证据 → 持久化追溯记录
|
|
96
|
+
- **适用**: 所有角色(Plan / Build / Verify / Review / Accept)
|
|
97
|
+
- **为什么是基础层**: 没有追溯,Plan 的蓝图无法被 Build 执行,Build 的产出无法被 Verify 验证,Verify 的报告无法被 Review 采信,Review 的判定无法被 Accept 签收。任何一个环节的追溯断裂,整个责任链就断了。
|
|
98
|
+
|
|
99
|
+
---
|
|
100
|
+
|
|
101
|
+
## Skill 间协作关系
|
|
102
|
+
|
|
103
|
+
```
|
|
104
|
+
┌─────────────────────────────────────────────────────────────┐
|
|
105
|
+
│ task-traceability (基础层) │
|
|
106
|
+
│ 追溯 → 执行 → 映射 → 举证 → 记录 — 每个环节的通用模式 │
|
|
107
|
+
└─────────────────────────────────────────────────────────────┘
|
|
108
|
+
│ │ │ │ │
|
|
109
|
+
▼ ▼ ▼ ▼ ▼
|
|
110
|
+
task-planning task-execution task-verification task-review task-acceptance
|
|
111
|
+
(Planner) (Builder) (Verifier) (Reviewer) (Accepter)
|
|
112
|
+
│ │ │ │ │
|
|
113
|
+
│ 蓝图+标准 │ 代码+记录 │ 验证报告+问题 │ 审查报告 │ 验收报告
|
|
114
|
+
▼ ▼ ▼ ▼ ▼
|
|
115
|
+
责任链流转: Plan → Build → Verify → Review → Accept
|
|
116
|
+
```
|
|
117
|
+
|
|
118
|
+
每个环节发现问题可向前反馈至对应环节。例如:
|
|
119
|
+
- Verifier 发现偏离 → 反馈 Builder
|
|
120
|
+
- Reviewer 发现设计意图未实现 → 反馈 Planner 和 Builder
|
|
121
|
+
- Accepter 发现验收不通过 → 反馈至对应环节的负责人
|
|
122
|
+
|
|
123
|
+
`task-traceability` 确保每个环节的产出都有完整的追溯链:谁做的 → 基于什么要求 → 产出是什么 → 证据在哪里 → 记录存在哪里。没有追溯链,反馈就找不到锚点,交接就不可靠,签收就无法审计。
|
|
124
|
+
|
|
125
|
+
所有角色通过 `claude-orchestrator` 的消息和共享上下文进行跨角色沟通。
|
|
126
|
+
|
|
127
|
+
---
|
|
128
|
+
|
|
129
|
+
## 角色预设权重与 Skill 选择
|
|
130
|
+
|
|
131
|
+
Worker 注册时的 role 是预设权重,认领任务后才确定当前角色和对应的 skill:
|
|
132
|
+
|
|
133
|
+
| 注册 role | 预设匹配的任务 link | 认领后使用的 skill |
|
|
134
|
+
|-----------|-------------------|-------------------|
|
|
135
|
+
| `planner` | `plan` | `task-planning` + `task-traceability` |
|
|
136
|
+
| `builder` | `build` | `task-execution` + `task-traceability` |
|
|
137
|
+
| `verifier` | `verify` | `task-verification` + `task-traceability` |
|
|
138
|
+
| `reviewer` | `review` | `task-review` + `task-traceability` |
|
|
139
|
+
| `accepter` | `accept` | `task-acceptance` + `task-traceability` |
|
|
140
|
+
|
|
141
|
+
任意 Worker 可认领任意环节的任务。认领后以任务所属环节的角色身份执行,使用对应的 skill。
|
|
142
|
+
|
|
143
|
+
---
|
|
144
|
+
|
|
145
|
+
## 快速索引
|
|
146
|
+
|
|
147
|
+
| 我想做... | 使用 skill |
|
|
148
|
+
|-----------|-----------|
|
|
149
|
+
| 分析需求,拆解成任务 | `task-planning` + `task-traceability` |
|
|
150
|
+
| 认领并执行一个开发任务 | `task-execution` + `task-traceability` |
|
|
151
|
+
| 建立可追溯的执行记录 | `task-traceability` |
|
|
152
|
+
| 验证 Builder 的产出是否合格 | `task-verification` + `task-traceability` |
|
|
153
|
+
| 审查代码质量和设计一致性 | `task-review` + `task-traceability` |
|
|
154
|
+
| 验收最终交付物,签 Go/No-Go | `task-acceptance` + `task-traceability` |
|
|
155
|
+
| 注册实例、收发消息、管理任务 | `claude-orchestrator` |
|