@adamancyzhang/claude-orchestrator 0.3.2 → 0.4.0
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 +198 -280
- package/dist/cli/commands.d.ts +0 -10
- package/dist/cli/commands.js +1 -184
- package/dist/cli/commands.js.map +1 -1
- package/dist/config.d.ts +22 -0
- package/dist/config.js +23 -0
- package/dist/config.js.map +1 -1
- package/dist/executor/template.js +21 -3
- package/dist/executor/template.js.map +1 -1
- package/dist/index.js +9 -34
- package/dist/index.js.map +1 -1
- package/dist/leader/chain-router.d.ts +5 -1
- package/dist/leader/chain-router.js +90 -2
- package/dist/leader/chain-router.js.map +1 -1
- 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 +7 -0
- package/dist/leader/index.js +5 -2
- package/dist/leader/index.js.map +1 -1
- package/dist/leader/merge-validator.d.ts +24 -0
- package/dist/leader/merge-validator.js +112 -0
- package/dist/leader/merge-validator.js.map +1 -0
- package/dist/leader/state.d.ts +17 -0
- package/dist/leader/state.js +48 -2
- package/dist/leader/state.js.map +1 -1
- package/dist/leader/tui.d.ts +2 -0
- package/dist/leader/tui.js +140 -16
- package/dist/leader/tui.js.map +1 -1
- package/dist/leader/watcher.js +12 -0
- package/dist/leader/watcher.js.map +1 -1
- package/dist/models/schemas.d.ts +15 -0
- package/dist/models/schemas.js +6 -1
- package/dist/models/schemas.js.map +1 -1
- package/dist/orchestrator/run.d.ts +6 -0
- package/dist/orchestrator/run.js +181 -0
- package/dist/orchestrator/run.js.map +1 -0
- package/dist/skills/CLAUDE.md +1 -1
- package/dist/skills/claude-orchestrator/SKILL.md +75 -217
- package/dist/templates/agents/worker-accept.md +48 -0
- package/dist/templates/agents/worker-build.md +38 -0
- package/dist/templates/agents/worker-decompose.md +40 -0
- package/dist/templates/agents/worker-evaluate.md +49 -0
- package/dist/templates/agents/worker-plan.md +36 -0
- package/dist/templates/agents/worker-review.md +42 -0
- package/dist/templates/agents/worker-verify.md +44 -0
- package/dist/templates/claude-memory/personal-claude-accepter.md +17 -0
- package/dist/templates/claude-memory/personal-claude-builder.md +24 -0
- package/dist/templates/claude-memory/personal-claude-planner.md +22 -0
- package/dist/templates/claude-memory/personal-claude-reviewer.md +25 -0
- package/dist/templates/claude-memory/personal-claude-verifier.md +24 -0
- package/dist/templates/claude-memory/team-claude.md +61 -0
- package/dist/utils/logger.d.ts +1 -0
- package/dist/utils/logger.js +3 -0
- package/dist/utils/logger.js.map +1 -1
- package/dist/worker/child-runner.d.ts +12 -0
- package/dist/worker/child-runner.js +99 -0
- package/dist/worker/child-runner.js.map +1 -0
- package/dist/worker/child.d.ts +2 -0
- package/dist/worker/child.js +8 -0
- package/dist/worker/child.js.map +1 -0
- package/dist/worker/commit-checker.d.ts +20 -0
- package/dist/worker/commit-checker.js +87 -0
- package/dist/worker/commit-checker.js.map +1 -0
- package/dist/worker/watcher.d.ts +5 -1
- package/dist/worker/watcher.js +41 -4
- package/dist/worker/watcher.js.map +1 -1
- package/dist/worker/worktree-initializer.d.ts +10 -0
- package/dist/worker/worktree-initializer.js +235 -0
- package/dist/worker/worktree-initializer.js.map +1 -0
- package/package.json +2 -2
- package/dist/templates/worker-accept.md +0 -46
- package/dist/templates/worker-build.md +0 -45
- package/dist/templates/worker-decompose.md +0 -67
- package/dist/templates/worker-evaluate.md +0 -41
- package/dist/templates/worker-plan.md +0 -43
- package/dist/templates/worker-review.md +0 -46
- package/dist/templates/worker-verify.md +0 -47
|
@@ -8,6 +8,13 @@ const NEXT_LINKS = {
|
|
|
8
8
|
review: "accept",
|
|
9
9
|
accept: null,
|
|
10
10
|
};
|
|
11
|
+
const LINK_TO_ROLE = {
|
|
12
|
+
plan: "planner",
|
|
13
|
+
build: "builder",
|
|
14
|
+
verify: "verifier",
|
|
15
|
+
review: "reviewer",
|
|
16
|
+
accept: "accepter",
|
|
17
|
+
};
|
|
11
18
|
export class ChainRouter {
|
|
12
19
|
zk;
|
|
13
20
|
taskQueue;
|
|
@@ -16,8 +23,9 @@ export class ChainRouter {
|
|
|
16
23
|
leaderInstanceId;
|
|
17
24
|
leaderName;
|
|
18
25
|
runner;
|
|
26
|
+
mergeValidator;
|
|
19
27
|
logger = new Logger("ChainRouter");
|
|
20
|
-
constructor(zk, taskQueue, messageRouter, eventBus, leaderInstanceId, leaderName, runner) {
|
|
28
|
+
constructor(zk, taskQueue, messageRouter, eventBus, leaderInstanceId, leaderName, runner, mergeValidator = null) {
|
|
21
29
|
this.zk = zk;
|
|
22
30
|
this.taskQueue = taskQueue;
|
|
23
31
|
this.messageRouter = messageRouter;
|
|
@@ -25,6 +33,7 @@ export class ChainRouter {
|
|
|
25
33
|
this.leaderInstanceId = leaderInstanceId;
|
|
26
34
|
this.leaderName = leaderName;
|
|
27
35
|
this.runner = runner;
|
|
36
|
+
this.mergeValidator = mergeValidator;
|
|
28
37
|
}
|
|
29
38
|
async route(msg) {
|
|
30
39
|
const link = msg.link;
|
|
@@ -76,6 +85,7 @@ export class ChainRouter {
|
|
|
76
85
|
{ link: "review", def: chainDef.tasks.review },
|
|
77
86
|
{ link: "accept", def: chainDef.tasks.accept },
|
|
78
87
|
];
|
|
88
|
+
const createdTasks = new Map();
|
|
79
89
|
for (const { link, def } of taskLinks) {
|
|
80
90
|
if (!def)
|
|
81
91
|
continue;
|
|
@@ -87,6 +97,7 @@ export class ChainRouter {
|
|
|
87
97
|
`**Priority**: ${def.priority}\n\n` +
|
|
88
98
|
`## Description\n\n${def.description}\n\n` +
|
|
89
99
|
`## Completion Criteria\n\n${def.criteria}\n`);
|
|
100
|
+
createdTasks.set(link, { taskId: task.id, docPath, def });
|
|
90
101
|
this.eventBus.emit({
|
|
91
102
|
type: "task_created",
|
|
92
103
|
task: { ...task },
|
|
@@ -98,8 +109,39 @@ export class ChainRouter {
|
|
|
98
109
|
const linkCount = taskLinks.filter(t => t.def).length;
|
|
99
110
|
this.eventBus.emit({ type: "debug_info", message: `Chain ${chainDef.chain_id}: ${linkCount} tasks created` });
|
|
100
111
|
}
|
|
112
|
+
// Send message to the first worker in the chain to start processing
|
|
113
|
+
const firstLink = taskLinks.find(t => t.def)?.link;
|
|
114
|
+
if (firstLink && createdTasks.has(firstLink)) {
|
|
115
|
+
const role = LINK_TO_ROLE[firstLink];
|
|
116
|
+
const worker = await this.findWorkerByRole(role);
|
|
117
|
+
if (worker) {
|
|
118
|
+
const { docPath, def } = createdTasks.get(firstLink);
|
|
119
|
+
await this.sendTaskToWorker(worker, firstLink, def, docPath, chainDef.chain_id);
|
|
120
|
+
}
|
|
121
|
+
else {
|
|
122
|
+
this.logger.error(`No ${role} worker available. Chain ${chainDef.chain_id} waiting for worker.`);
|
|
123
|
+
}
|
|
124
|
+
}
|
|
101
125
|
}
|
|
102
126
|
async handleCompletionReport(msg) {
|
|
127
|
+
// Try merge validation if commit info is present
|
|
128
|
+
if (this.mergeValidator) {
|
|
129
|
+
try {
|
|
130
|
+
const parsed = JSON.parse(msg.content);
|
|
131
|
+
if (parsed.commit?.sha) {
|
|
132
|
+
this.mergeValidator.validate({
|
|
133
|
+
sha: parsed.commit.sha,
|
|
134
|
+
message: parsed.commit.message,
|
|
135
|
+
branch: parsed.commit.branch,
|
|
136
|
+
taskTitle: msg.task_title ?? "unknown",
|
|
137
|
+
taskLink: msg.link ?? "unknown",
|
|
138
|
+
}).catch(() => { });
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
catch {
|
|
142
|
+
// Content is not JSON, skip merge validation
|
|
143
|
+
}
|
|
144
|
+
}
|
|
103
145
|
let decision;
|
|
104
146
|
let parsed = true;
|
|
105
147
|
try {
|
|
@@ -127,12 +169,30 @@ export class ChainRouter {
|
|
|
127
169
|
const nextLink = decision.nextLink ?? NEXT_LINKS[msg.link];
|
|
128
170
|
if (!nextLink)
|
|
129
171
|
break;
|
|
130
|
-
const
|
|
172
|
+
const chainId = msg.chain_id ?? null;
|
|
173
|
+
const task = await this.taskQueue.push(`[${msg.reply_to ?? "chain"}] ${nextLink}`, "", 1, this.leaderInstanceId, undefined, this.leaderName, undefined, nextLink, chainId);
|
|
131
174
|
this.eventBus.emit({
|
|
132
175
|
type: "task_created",
|
|
133
176
|
task: { ...task },
|
|
134
177
|
taskId: task.id,
|
|
135
178
|
});
|
|
179
|
+
// Find worker and send message for the next link
|
|
180
|
+
const role = LINK_TO_ROLE[nextLink];
|
|
181
|
+
if (role) {
|
|
182
|
+
const worker = await this.findWorkerByRole(role);
|
|
183
|
+
if (worker) {
|
|
184
|
+
// Try to find pending task with full details from handleTaskDefinitions
|
|
185
|
+
const pending = await this.findPendingTaskByChainLink(chainId, nextLink);
|
|
186
|
+
const docPath = this.runner.taskDocPath(task.id);
|
|
187
|
+
const def = pending
|
|
188
|
+
? { title: pending.title, description: pending.description || "", criteria: "", priority: pending.priority ?? 1 }
|
|
189
|
+
: { title: task.title, description: task.description, criteria: "", priority: 1 };
|
|
190
|
+
await this.sendTaskToWorker(worker, nextLink, def, docPath, chainId ?? "");
|
|
191
|
+
}
|
|
192
|
+
else {
|
|
193
|
+
this.logger.info(`No ${role} worker available for ${nextLink}, task queued`);
|
|
194
|
+
}
|
|
195
|
+
}
|
|
136
196
|
break;
|
|
137
197
|
}
|
|
138
198
|
case "feedback": {
|
|
@@ -150,6 +210,17 @@ export class ChainRouter {
|
|
|
150
210
|
}
|
|
151
211
|
}
|
|
152
212
|
}
|
|
213
|
+
async findPendingTaskByChainLink(chainId, link) {
|
|
214
|
+
if (!chainId)
|
|
215
|
+
return null;
|
|
216
|
+
const pending = await this.taskQueue.listTasks("pending");
|
|
217
|
+
for (const t of pending) {
|
|
218
|
+
if (t.chain_id === chainId && t.link === link) {
|
|
219
|
+
return t;
|
|
220
|
+
}
|
|
221
|
+
}
|
|
222
|
+
return null;
|
|
223
|
+
}
|
|
153
224
|
async findWorkerByRole(role) {
|
|
154
225
|
const instances = await this.zk.listInstances();
|
|
155
226
|
for (const inst of instances) {
|
|
@@ -159,5 +230,22 @@ export class ChainRouter {
|
|
|
159
230
|
}
|
|
160
231
|
return null;
|
|
161
232
|
}
|
|
233
|
+
async sendTaskToWorker(worker, link, def, docPath, chainId) {
|
|
234
|
+
await this.zk.createMessage(worker.id, {
|
|
235
|
+
type: "direct",
|
|
236
|
+
from_instance: this.leaderInstanceId,
|
|
237
|
+
from_name: this.leaderName,
|
|
238
|
+
from_role: "leader",
|
|
239
|
+
to_instance: worker.id,
|
|
240
|
+
content: def.description,
|
|
241
|
+
link,
|
|
242
|
+
task_title: def.title,
|
|
243
|
+
task_description: def.description,
|
|
244
|
+
task_criteria: def.criteria,
|
|
245
|
+
task_doc_path: docPath,
|
|
246
|
+
chain_id: chainId,
|
|
247
|
+
});
|
|
248
|
+
this.logger.info(`Sent ${link} task to ${worker.name} (${worker.id.slice(0, 8)})`);
|
|
249
|
+
}
|
|
162
250
|
}
|
|
163
251
|
//# sourceMappingURL=chain-router.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chain-router.js","sourceRoot":"","sources":["../../src/leader/chain-router.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"chain-router.js","sourceRoot":"","sources":["../../src/leader/chain-router.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAM9B,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,OAAO,EAEL,aAAa,EACb,cAAc,EACd,kBAAkB,GAGnB,MAAM,sBAAsB,CAAC;AAE9B,MAAM,UAAU,GAAkC;IAChD,IAAI,EAAE,OAAO;IACb,KAAK,EAAE,QAAQ;IACf,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,IAAI;CACb,CAAC;AAEF,MAAM,YAAY,GAA2B;IAC3C,IAAI,EAAE,SAAS;IACf,KAAK,EAAE,SAAS;IAChB,MAAM,EAAE,UAAU;IAClB,MAAM,EAAE,UAAU;IAClB,MAAM,EAAE,UAAU;CACnB,CAAC;AAEF,MAAM,OAAO,WAAW;IAIZ;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IAVF,MAAM,GAAG,IAAI,MAAM,CAAC,aAAa,CAAC,CAAC;IAE3C,YACU,EAAY,EACZ,SAAoB,EACpB,aAA4B,EAC5B,QAAwB,EACxB,gBAAwB,EACxB,UAAkB,EAClB,MAAoB,EACpB,iBAAwC,IAAI;QAP5C,OAAE,GAAF,EAAE,CAAU;QACZ,cAAS,GAAT,SAAS,CAAW;QACpB,kBAAa,GAAb,aAAa,CAAe;QAC5B,aAAQ,GAAR,QAAQ,CAAgB;QACxB,qBAAgB,GAAhB,gBAAgB,CAAQ;QACxB,eAAU,GAAV,UAAU,CAAQ;QAClB,WAAM,GAAN,MAAM,CAAc;QACpB,mBAAc,GAAd,cAAc,CAA8B;IACnD,CAAC;IAEJ,KAAK,CAAC,KAAK,CAAC,GAAY;QACtB,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;QACtB,IAAI,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC;YACrB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,eAAe,GAAG,CAAC,EAAE,UAAU,IAAI,IAAI,MAAM,UAAU,GAAG,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QAC9H,CAAC;QACD,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;QACrC,CAAC;QACD,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC;QACzC,CAAC;QACD,OAAO,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;IAC1C,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAC,GAAY;QAC1C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;QACvD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yDAAyD,CAAC,CAAC;YAC7E,OAAO;QACT,CAAC;QAED,MAAM,GAAG,GAAG,aAAa,CAAC;YACxB,aAAa,EAAE,IAAI,CAAC,gBAAgB;YACpC,SAAS,EAAE,IAAI,CAAC,UAAU;YAC1B,SAAS,EAAE,QAAQ;YACnB,WAAW,EAAE,OAAO,CAAC,EAAE;YACvB,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,IAAI,EAAE,WAAW;YACjB,gBAAgB,EAAE,GAAG,CAAC,OAAO;SAC9B,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,EAAE,GAAyC,CAAC,CAAC;QACnF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oCAAoC,OAAO,CAAC,IAAI,KAAK,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC;QACjG,IAAI,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC;YACrB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,gBAAgB,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,eAAe,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC7H,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,qBAAqB,CAAC,GAAY;QAC9C,IAAI,QAAQ,CAAC;QACb,IAAI,CAAC;YACH,QAAQ,GAAG,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;QAC3D,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kCAAkC,EAAE,GAAG,CAAC,CAAC;YAC3D,OAAO;QACT,CAAC;QAED,MAAM,SAAS,GAAoH;YACjI,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE;YAC1C,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAC,KAAK,EAAE;YAC5C,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE;YAC9C,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE;YAC9C,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE;SAC/C,CAAC;QAEF,MAAM,YAAY,GAAG,IAAI,GAAG,EAAqF,CAAC;QAElH,KAAK,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,SAAS,EAAE,CAAC;YACtC,IAAI,CAAC,GAAG;gBAAE,SAAS;YACnB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CACpC,GAAG,CAAC,KAAK,EACT,GAAG,CAAC,WAAW,EACf,GAAG,CAAC,QAAQ,EACZ,IAAI,CAAC,gBAAgB,EACrB,SAAS,EACT,IAAI,CAAC,UAAU,EACf,SAAS,EACT,IAAI,EACJ,QAAQ,CAAC,QAAQ,CAClB,CAAC;YAEF,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACjD,MAAM,EAAE,CAAC,QAAQ,CAAC,SAAS,CACzB,OAAO,EACP,KAAK,GAAG,CAAC,KAAK,MAAM;gBACpB,aAAa,IAAI,IAAI;gBACrB,cAAc,QAAQ,CAAC,QAAQ,IAAI;gBACnC,iBAAiB,GAAG,CAAC,QAAQ,MAAM;gBACnC,qBAAqB,GAAG,CAAC,WAAW,MAAM;gBAC1C,6BAA6B,GAAG,CAAC,QAAQ,IAAI,CAC9C,CAAC;YAEF,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;YAE1D,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;gBACjB,IAAI,EAAE,cAAc;gBACpB,IAAI,EAAE,EAAE,GAAG,IAAI,EAAE;gBACjB,MAAM,EAAE,IAAI,CAAC,EAAE;aAChB,CAAC,CAAC;QACL,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC5E,IAAI,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC;YACrB,MAAM,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC;YACtD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,SAAS,QAAQ,CAAC,QAAQ,KAAK,SAAS,gBAAgB,EAAE,CAAC,CAAC;QAChH,CAAC;QAED,oEAAoE;QACpE,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC;QACnD,IAAI,SAAS,IAAI,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7C,MAAM,IAAI,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC;YACrC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;YACjD,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,YAAY,CAAC,GAAG,CAAC,SAAS,CAAE,CAAC;gBACtD,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,SAAS,EAAE,GAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;YACnF,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,IAAI,4BAA4B,QAAQ,CAAC,QAAQ,sBAAsB,CAAC,CAAC;YACnG,CAAC;QACH,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,sBAAsB,CAAC,GAAY;QAC/C,iDAAiD;QACjD,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBACvC,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC;oBACvB,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC;wBAC3B,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG;wBACtB,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO;wBAC9B,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM;wBAC5B,SAAS,EAAG,GAAG,CAAC,UAAqB,IAAI,SAAS;wBAClD,QAAQ,EAAG,GAAG,CAAC,IAAe,IAAI,SAAS;qBAC5C,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAqB,CAAC,CAAC,CAAC;gBACxC,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBACP,6CAA6C;YAC/C,CAAC;QACH,CAAC;QAED,IAAI,QAAsB,CAAC;QAC3B,IAAI,MAAM,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC;YACH,QAAQ,GAAG,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;QAC/D,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,GAAG,KAAK,CAAC;YACf,MAAM,WAAW,GAAG,GAAG,CAAC,IAAK,CAAC;YAC9B,MAAM,QAAQ,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;YACzC,IAAI,QAAQ,EAAE,CAAC;gBACb,QAAQ,GAAG,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,EAAE,uCAAuC,EAAE,QAAQ,EAAE,CAAC;YACtG,CAAC;iBAAM,IAAI,QAAQ,KAAK,IAAI,IAAI,WAAW,KAAK,QAAQ,EAAE,CAAC;gBACzD,QAAQ,GAAG,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,uBAAuB,EAAE,CAAC;YAC1E,CAAC;iBAAM,CAAC;gBACN,QAAQ,GAAG,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,UAAU,CAAC,WAAW,CAAC,IAAI,SAAS,EAAE,CAAC;YACnH,CAAC;QACH,CAAC;QAED,IAAI,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC;YACrB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,iBAAiB,QAAQ,CAAC,QAAQ,KAAK,QAAQ,CAAC,MAAM,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;QAC/I,CAAC;QAED,QAAQ,QAAQ,CAAC,QAAQ,EAAE,CAAC;YAC1B,KAAK,eAAe,CAAC,CAAC,CAAC;gBACrB,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,IAAI,UAAU,CAAC,GAAG,CAAC,IAAK,CAAC,CAAC;gBAC5D,IAAI,CAAC,QAAQ;oBAAE,MAAM;gBAErB,MAAM,OAAO,GAAI,GAA0C,CAAC,QAAkB,IAAI,IAAI,CAAC;gBAEvF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CACpC,IAAI,GAAG,CAAC,QAAQ,IAAI,OAAO,KAAK,QAAQ,EAAE,EAC1C,EAAE,EACF,CAAC,EACD,IAAI,CAAC,gBAAgB,EACrB,SAAS,EACT,IAAI,CAAC,UAAU,EACf,SAAS,EACT,QAAQ,EACR,OAAO,CACR,CAAC;gBAEF,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;oBACjB,IAAI,EAAE,cAAc;oBACpB,IAAI,EAAE,EAAE,GAAG,IAAI,EAAE;oBACjB,MAAM,EAAE,IAAI,CAAC,EAAE;iBAChB,CAAC,CAAC;gBAEH,iDAAiD;gBACjD,MAAM,IAAI,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC;gBACpC,IAAI,IAAI,EAAE,CAAC;oBACT,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;oBACjD,IAAI,MAAM,EAAE,CAAC;wBACX,wEAAwE;wBACxE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;wBACzE,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;wBACjD,MAAM,GAAG,GAAG,OAAO;4BACjB,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAe,EAAE,WAAW,EAAG,OAAO,CAAC,WAAsB,IAAI,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAG,OAAO,CAAC,QAAmB,IAAI,CAAC,EAAE;4BACnJ,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;wBACpF,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,IAAI,EAAE,CAAC,CAAC;oBAC7E,CAAC;yBAAM,CAAC;wBACN,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,IAAI,yBAAyB,QAAQ,eAAe,CAAC,CAAC;oBAC/E,CAAC;gBACH,CAAC;gBACD,MAAM;YACR,CAAC;YACD,KAAK,UAAU,CAAC,CAAC,CAAC;gBAChB,IAAI,GAAG,CAAC,aAAa,IAAI,QAAQ,CAAC,QAAQ,EAAE,CAAC;oBAC3C,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAC3B,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,UAAU,EACf,QAAQ,CAAC,QAAQ,EACjB,GAAG,CAAC,aAAa,CAClB,CAAC;gBACJ,CAAC;gBACD,MAAM;YACR,CAAC;YACD,KAAK,aAAa,CAAC,CAAC,CAAC;gBACnB,MAAM,OAAO,GAAI,GAA0C,CAAC,QAAkB,CAAC;gBAC/E,IAAI,OAAO,EAAE,CAAC;oBACZ,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,CAAC,CAAC;gBACxD,CAAC;gBACD,MAAM;YACR,CAAC;QACH,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,0BAA0B,CAAC,OAAsB,EAAE,IAAY;QAC3E,IAAI,CAAC,OAAO;YAAE,OAAO,IAAI,CAAC;QAC1B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAC1D,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;YACxB,IAAK,CAA6B,CAAC,QAAQ,KAAK,OAAO,IAAK,CAA6B,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;gBACxG,OAAO,CAAuC,CAAC;YACjD,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAC,IAAY;QACzC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,aAAa,EAAE,CAAC;QAChD,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;YAC7B,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;gBACjD,OAAO,EAAE,EAAE,EAAE,IAAI,CAAC,EAAY,EAAE,IAAI,EAAE,IAAI,CAAC,IAAc,EAAE,CAAC;YAC9D,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAC5B,MAAoC,EACpC,IAAY,EACZ,GAA+E,EAC/E,OAAe,EACf,OAAe;QAEf,MAAM,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,EAAE;YACrC,IAAI,EAAE,QAAQ;YACd,aAAa,EAAE,IAAI,CAAC,gBAAgB;YACpC,SAAS,EAAE,IAAI,CAAC,UAAU;YAC1B,SAAS,EAAE,QAAQ;YACnB,WAAW,EAAE,MAAM,CAAC,EAAE;YACtB,OAAO,EAAE,GAAG,CAAC,WAAW;YACxB,IAAI;YACJ,UAAU,EAAE,GAAG,CAAC,KAAK;YACrB,gBAAgB,EAAE,GAAG,CAAC,WAAW;YACjC,aAAa,EAAE,GAAG,CAAC,QAAQ;YAC3B,aAAa,EAAE,OAAO;YACtB,QAAQ,EAAE,OAAO;SACoB,CAAC,CAAC;QACzC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,IAAI,YAAY,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC;IACrF,CAAC;CACF"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export type LeaderEventType = "worker_joined" | "worker_left" | "worker_status_changed" | "task_created" | "task_claimed" | "task_completed" | "task_blocked" | "task_failed" | "task_recovered" | "message_received" | "message_processed" | "chain_activated" | "chain_closed" | "debug_info";
|
|
1
|
+
export type LeaderEventType = "worker_joined" | "worker_left" | "worker_status_changed" | "worker_message_received" | "task_created" | "task_claimed" | "task_completed" | "task_blocked" | "task_failed" | "task_recovered" | "message_received" | "message_processed" | "chain_activated" | "chain_closed" | "debug_info";
|
|
2
2
|
export interface LeaderEvent {
|
|
3
3
|
type: LeaderEventType;
|
|
4
4
|
[key: string]: unknown;
|
package/dist/leader/event-bus.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { EventEmitter } from "node:events";
|
|
2
2
|
const ALL_EVENT_TYPES = [
|
|
3
|
-
"worker_joined", "worker_left", "worker_status_changed",
|
|
3
|
+
"worker_joined", "worker_left", "worker_status_changed", "worker_message_received",
|
|
4
4
|
"task_created", "task_claimed", "task_completed", "task_blocked", "task_failed", "task_recovered",
|
|
5
5
|
"message_received", "message_processed", "chain_activated", "chain_closed", "debug_info",
|
|
6
6
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event-bus.js","sourceRoot":"","sources":["../../src/leader/event-bus.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"event-bus.js","sourceRoot":"","sources":["../../src/leader/event-bus.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAwB3C,MAAM,eAAe,GAAsB;IACzC,eAAe,EAAE,aAAa,EAAE,uBAAuB,EAAE,yBAAyB;IAClF,cAAc,EAAE,cAAc,EAAE,gBAAgB,EAAE,cAAc,EAAE,aAAa,EAAE,gBAAgB;IACjG,kBAAkB,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,cAAc,EAAE,YAAY;CACzF,CAAC;AAEF,MAAM,OAAO,cAAc;IACjB,OAAO,GAAG,IAAI,YAAY,EAAE,CAAC;IAErC,KAAK,CAAC,OAAqC;QACzC,KAAK,MAAM,CAAC,IAAI,eAAe,EAAE,CAAC;YAChC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC;IAED,IAAI,CAAC,KAAkB;QACrB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACvC,CAAC;IAED,EAAE,CAAC,IAAqB,EAAE,OAAqC;QAC7D,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACjC,CAAC;CACF"}
|
package/dist/leader/index.d.ts
CHANGED
package/dist/leader/index.js
CHANGED
|
@@ -8,6 +8,7 @@ import { TaskOrchestrator } from "./orchestrator.js";
|
|
|
8
8
|
import { TaskRecovery } from "./recovery.js";
|
|
9
9
|
import { LeaderWatcher } from "./watcher.js";
|
|
10
10
|
import { ChainRouter } from "./chain-router.js";
|
|
11
|
+
import { MergeValidator } from "./merge-validator.js";
|
|
11
12
|
import { TaskQueue } from "../modules/task-queue.js";
|
|
12
13
|
import { MessageRouter } from "../modules/message-router.js";
|
|
13
14
|
import { ClaudeRunner } from "../executor/runner.js";
|
|
@@ -30,7 +31,7 @@ export async function startLeader(config) {
|
|
|
30
31
|
started_at: new Date().toISOString(),
|
|
31
32
|
host: os.hostname(),
|
|
32
33
|
pid: process.pid,
|
|
33
|
-
version: "0.
|
|
34
|
+
version: "0.4.0",
|
|
34
35
|
});
|
|
35
36
|
}
|
|
36
37
|
catch (err) {
|
|
@@ -57,7 +58,9 @@ export async function startLeader(config) {
|
|
|
57
58
|
// Initialize TaskQueue, MessageRouter, and ChainRouter
|
|
58
59
|
const taskQueue = new TaskQueue(zk);
|
|
59
60
|
const messageRouter = new MessageRouter(zk);
|
|
60
|
-
|
|
61
|
+
// Initialize MergeValidator
|
|
62
|
+
const mergeValidator = new MergeValidator(process.cwd(), cacheRunner, eventBus);
|
|
63
|
+
const chainRouter = new ChainRouter(zk, taskQueue, messageRouter, eventBus, instance.id, leaderName, cacheRunner, mergeValidator);
|
|
61
64
|
// Start subsystems
|
|
62
65
|
const leaderWatcher = new LeaderWatcher(zk, eventBus, instance.id, chainRouter);
|
|
63
66
|
await leaderWatcher.start();
|
package/dist/leader/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/leader/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAClE,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/leader/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import type { ClaudeRunner } from "../executor/runner.js";
|
|
2
|
+
import type { LeaderEventBus } from "./event-bus.js";
|
|
3
|
+
export interface MergeDecision {
|
|
4
|
+
decision: "merge" | "skip" | "review_first";
|
|
5
|
+
reason: string;
|
|
6
|
+
}
|
|
7
|
+
export declare class MergeValidator {
|
|
8
|
+
private projectRoot;
|
|
9
|
+
private runner;
|
|
10
|
+
private eventBus;
|
|
11
|
+
private logger;
|
|
12
|
+
constructor(projectRoot: string, runner: ClaudeRunner, eventBus: LeaderEventBus);
|
|
13
|
+
validate(commitInfo: {
|
|
14
|
+
sha: string;
|
|
15
|
+
message: string;
|
|
16
|
+
branch: string;
|
|
17
|
+
taskTitle: string;
|
|
18
|
+
taskLink: string;
|
|
19
|
+
}): Promise<MergeDecision>;
|
|
20
|
+
private getMainBranch;
|
|
21
|
+
private isCommitMerged;
|
|
22
|
+
private askMergeDecision;
|
|
23
|
+
private execGit;
|
|
24
|
+
}
|
|
@@ -0,0 +1,112 @@
|
|
|
1
|
+
import * as fs from "node:fs";
|
|
2
|
+
import { execSync } from "node:child_process";
|
|
3
|
+
import { Logger } from "../utils/logger.js";
|
|
4
|
+
export class MergeValidator {
|
|
5
|
+
projectRoot;
|
|
6
|
+
runner;
|
|
7
|
+
eventBus;
|
|
8
|
+
logger = new Logger("MergeValidator");
|
|
9
|
+
constructor(projectRoot, runner, eventBus) {
|
|
10
|
+
this.projectRoot = projectRoot;
|
|
11
|
+
this.runner = runner;
|
|
12
|
+
this.eventBus = eventBus;
|
|
13
|
+
}
|
|
14
|
+
async validate(commitInfo) {
|
|
15
|
+
const mainBranch = this.getMainBranch();
|
|
16
|
+
const merged = this.isCommitMerged(commitInfo.sha, mainBranch);
|
|
17
|
+
if (merged)
|
|
18
|
+
return { decision: "skip", reason: "Already merged" };
|
|
19
|
+
try {
|
|
20
|
+
const decision = await this.askMergeDecision(commitInfo, mainBranch);
|
|
21
|
+
if (decision.decision === "merge") {
|
|
22
|
+
try {
|
|
23
|
+
const currentBranch = this.execGit("rev-parse --abbrev-ref HEAD");
|
|
24
|
+
this.execGit(`checkout ${mainBranch}`);
|
|
25
|
+
this.execGit(`merge ${commitInfo.branch} --no-ff -m "Merge ${commitInfo.branch}: ${commitInfo.message}"`);
|
|
26
|
+
this.eventBus.emit({
|
|
27
|
+
type: "debug_info",
|
|
28
|
+
message: `Merged: ${commitInfo.branch} -> ${mainBranch}`,
|
|
29
|
+
});
|
|
30
|
+
// Switch back
|
|
31
|
+
try {
|
|
32
|
+
this.execGit(`checkout ${currentBranch}`);
|
|
33
|
+
}
|
|
34
|
+
catch { /* ok */ }
|
|
35
|
+
}
|
|
36
|
+
catch {
|
|
37
|
+
try {
|
|
38
|
+
this.execGit("merge --abort");
|
|
39
|
+
}
|
|
40
|
+
catch { /* ok */ }
|
|
41
|
+
return { decision: "review_first", reason: "Merge conflict, manual review needed" };
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
return decision;
|
|
45
|
+
}
|
|
46
|
+
catch {
|
|
47
|
+
return { decision: "review_first", reason: "Merge decision failed, manual review needed" };
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
getMainBranch() {
|
|
51
|
+
try {
|
|
52
|
+
return this.execGit("rev-parse --abbrev-ref HEAD");
|
|
53
|
+
}
|
|
54
|
+
catch {
|
|
55
|
+
return "main";
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
isCommitMerged(sha, _mainBranch) {
|
|
59
|
+
try {
|
|
60
|
+
const result = this.execGit(`branch --contains ${sha}`);
|
|
61
|
+
return result.length > 0;
|
|
62
|
+
}
|
|
63
|
+
catch {
|
|
64
|
+
return false;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
async askMergeDecision(commit, mainBranch) {
|
|
68
|
+
const prompt = [
|
|
69
|
+
`Branch \`${commit.branch}\` has unmerged commits.`,
|
|
70
|
+
"",
|
|
71
|
+
`- SHA: ${commit.sha}`,
|
|
72
|
+
`- Message: ${commit.message}`,
|
|
73
|
+
`- Task: ${commit.taskTitle} (${commit.taskLink})`,
|
|
74
|
+
"",
|
|
75
|
+
`Options:`,
|
|
76
|
+
`- merge: merge into ${mainBranch}`,
|
|
77
|
+
`- skip: leave unmerged`,
|
|
78
|
+
`- review_first: flag for human review`,
|
|
79
|
+
"",
|
|
80
|
+
`Respond with JSON: {"decision": "merge|skip|review_first", "reason": "..."}`,
|
|
81
|
+
].join("\n");
|
|
82
|
+
const uniqueKey = `merge-decision-${Date.now().toString(36)}`;
|
|
83
|
+
const logPath = this.runner.logPath(uniqueKey);
|
|
84
|
+
await this.runner.run(prompt, logPath);
|
|
85
|
+
try {
|
|
86
|
+
const output = await fs.promises.readFile(logPath, "utf-8");
|
|
87
|
+
const cleaned = output.trim()
|
|
88
|
+
.replace(/```json\s*/g, "")
|
|
89
|
+
.replace(/```\s*/g, "")
|
|
90
|
+
.trim();
|
|
91
|
+
return JSON.parse(cleaned);
|
|
92
|
+
}
|
|
93
|
+
catch {
|
|
94
|
+
// Fallback: merge if no conflict expected
|
|
95
|
+
return { decision: "merge", reason: "Auto-merge (no decision available)" };
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
execGit(args) {
|
|
99
|
+
try {
|
|
100
|
+
return execSync(`git ${args}`, {
|
|
101
|
+
cwd: this.projectRoot,
|
|
102
|
+
encoding: "utf-8",
|
|
103
|
+
stdio: ["pipe", "pipe", "pipe"],
|
|
104
|
+
}).trim();
|
|
105
|
+
}
|
|
106
|
+
catch (err) {
|
|
107
|
+
const msg = err instanceof Error ? err.message : String(err);
|
|
108
|
+
throw new Error(`git ${args} failed: ${msg}`);
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
//# sourceMappingURL=merge-validator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"merge-validator.js","sourceRoot":"","sources":["../../src/leader/merge-validator.ts"],"names":[],"mappings":"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"}
|
package/dist/leader/state.d.ts
CHANGED
|
@@ -1,4 +1,11 @@
|
|
|
1
1
|
import type { LeaderEvent } from "./event-bus.js";
|
|
2
|
+
export interface WorkerMessageEntry {
|
|
3
|
+
timestamp: string;
|
|
4
|
+
content: string;
|
|
5
|
+
contentFull: string;
|
|
6
|
+
link: string | null;
|
|
7
|
+
messageId: string;
|
|
8
|
+
}
|
|
2
9
|
export interface WorkerInfo {
|
|
3
10
|
id: string;
|
|
4
11
|
name: string;
|
|
@@ -6,6 +13,15 @@ export interface WorkerInfo {
|
|
|
6
13
|
currentRole: string | null;
|
|
7
14
|
status: string;
|
|
8
15
|
currentTaskId: string | null;
|
|
16
|
+
worktreeName: string | null;
|
|
17
|
+
worktreePath: string | null;
|
|
18
|
+
worktreeBranch: string | null;
|
|
19
|
+
pid: number | null;
|
|
20
|
+
currentMessage: string | null;
|
|
21
|
+
currentMessageLink: string | null;
|
|
22
|
+
currentMessageTime: string | null;
|
|
23
|
+
messageHistory: WorkerMessageEntry[];
|
|
24
|
+
lastCompletedTask: string | null;
|
|
9
25
|
}
|
|
10
26
|
export interface EventLogEntry {
|
|
11
27
|
timestamp: string;
|
|
@@ -20,5 +36,6 @@ export declare class LeaderState {
|
|
|
20
36
|
leaderName: string;
|
|
21
37
|
leaderInstanceId: string;
|
|
22
38
|
cacheDir: string;
|
|
39
|
+
selectedWorkerIndex: number;
|
|
23
40
|
apply(event: LeaderEvent): void;
|
|
24
41
|
}
|
package/dist/leader/state.js
CHANGED
|
@@ -17,6 +17,7 @@ export class LeaderState {
|
|
|
17
17
|
leaderName = "";
|
|
18
18
|
leaderInstanceId = "";
|
|
19
19
|
cacheDir = "";
|
|
20
|
+
selectedWorkerIndex = 0;
|
|
20
21
|
apply(event) {
|
|
21
22
|
const time = new Date().toLocaleTimeString();
|
|
22
23
|
switch (event.type) {
|
|
@@ -31,14 +32,56 @@ export class LeaderState {
|
|
|
31
32
|
currentRole: null,
|
|
32
33
|
status: inst.status,
|
|
33
34
|
currentTaskId: inst.current_task_id ?? null,
|
|
35
|
+
worktreeName: inst.worktree_name ?? null,
|
|
36
|
+
worktreePath: inst.worktree_path ?? null,
|
|
37
|
+
worktreeBranch: inst.worktree_branch ?? null,
|
|
38
|
+
pid: inst.pid ?? null,
|
|
39
|
+
currentMessage: null,
|
|
40
|
+
currentMessageLink: null,
|
|
41
|
+
currentMessageTime: null,
|
|
42
|
+
messageHistory: [],
|
|
43
|
+
lastCompletedTask: null,
|
|
34
44
|
});
|
|
35
45
|
this.events.push({ timestamp: time, message: `${inst.name} joined (${inst.role})` });
|
|
36
46
|
break;
|
|
37
47
|
}
|
|
38
|
-
case "worker_left":
|
|
48
|
+
case "worker_left": {
|
|
49
|
+
const leftIdx = this.workers.findIndex(w => w.id === event.instanceId);
|
|
39
50
|
this.workers = this.workers.filter(w => w.id !== event.instanceId);
|
|
51
|
+
if (leftIdx === this.selectedWorkerIndex) {
|
|
52
|
+
this.selectedWorkerIndex = Math.min(this.selectedWorkerIndex, this.workers.length - 1);
|
|
53
|
+
if (this.selectedWorkerIndex < 0)
|
|
54
|
+
this.selectedWorkerIndex = 0;
|
|
55
|
+
}
|
|
56
|
+
else if (leftIdx < this.selectedWorkerIndex && this.selectedWorkerIndex > 0) {
|
|
57
|
+
this.selectedWorkerIndex--;
|
|
58
|
+
}
|
|
40
59
|
this.events.push({ timestamp: time, message: `${event.name} left` });
|
|
41
60
|
break;
|
|
61
|
+
}
|
|
62
|
+
case "worker_message_received": {
|
|
63
|
+
const w = this.workers.find(w => w.id === event.instanceId);
|
|
64
|
+
if (w) {
|
|
65
|
+
const rawContent = event.content ?? "";
|
|
66
|
+
const timestamp = event.timestamp ?? time;
|
|
67
|
+
w.currentMessage = rawContent;
|
|
68
|
+
w.currentMessageLink = event.link ?? null;
|
|
69
|
+
w.currentMessageTime = timestamp;
|
|
70
|
+
w.messageHistory.push({
|
|
71
|
+
timestamp,
|
|
72
|
+
content: rawContent.slice(0, 200),
|
|
73
|
+
contentFull: rawContent,
|
|
74
|
+
link: event.link ?? null,
|
|
75
|
+
messageId: event.messageId ?? "",
|
|
76
|
+
});
|
|
77
|
+
if (w.messageHistory.length > 20) {
|
|
78
|
+
w.messageHistory = w.messageHistory.slice(-20);
|
|
79
|
+
}
|
|
80
|
+
w.status = "busy";
|
|
81
|
+
}
|
|
82
|
+
this.events.push({ timestamp: time, message: `${event.name} received message: ${event.content?.slice(0, 60)}...` });
|
|
83
|
+
break;
|
|
84
|
+
}
|
|
42
85
|
case "worker_status_changed": {
|
|
43
86
|
const w = this.workers.find(w => w.id === event.instanceId);
|
|
44
87
|
if (w) {
|
|
@@ -79,12 +122,15 @@ export class LeaderState {
|
|
|
79
122
|
this.claimedTasks = this.claimedTasks.filter(t => t.id !== event.taskId);
|
|
80
123
|
if (event.task)
|
|
81
124
|
this.completedTasks.push(event.task);
|
|
82
|
-
// Clear currentRole for the worker
|
|
83
125
|
const w = this.workers.find(w => w.id === event.instanceId);
|
|
84
126
|
if (w) {
|
|
85
127
|
w.currentRole = null;
|
|
86
128
|
w.status = "idle";
|
|
87
129
|
w.currentTaskId = null;
|
|
130
|
+
w.lastCompletedTask = event.task?.title ?? null;
|
|
131
|
+
w.currentMessage = null;
|
|
132
|
+
w.currentMessageLink = null;
|
|
133
|
+
w.currentMessageTime = null;
|
|
88
134
|
}
|
|
89
135
|
this.events.push({ timestamp: time, message: `Task ${event.taskId} completed` });
|
|
90
136
|
break;
|
package/dist/leader/state.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../src/leader/state.ts"],"names":[],"mappings":"AAEA,SAAS,cAAc,CAAC,IAAY;IAClC,MAAM,GAAG,GAA2B;QAClC,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,SAAS;QAChB,MAAM,EAAE,UAAU;QAClB,MAAM,EAAE,UAAU;QAClB,MAAM,EAAE,UAAU;KACnB,CAAC;IACF,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC;AAC3B,CAAC;
|
|
1
|
+
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../src/leader/state.ts"],"names":[],"mappings":"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"}
|
package/dist/leader/tui.d.ts
CHANGED
|
@@ -3,10 +3,12 @@ export declare class LeaderTui {
|
|
|
3
3
|
private inputBuffer;
|
|
4
4
|
private inputCallback;
|
|
5
5
|
private rawMode;
|
|
6
|
+
private state;
|
|
6
7
|
constructor();
|
|
7
8
|
onInput(cb: (text: string) => void): void;
|
|
8
9
|
private enableRawMode;
|
|
9
10
|
private disableRawMode;
|
|
11
|
+
private rerender;
|
|
10
12
|
private setupInput;
|
|
11
13
|
render(state: LeaderState): void;
|
|
12
14
|
destroy(): void;
|