@adamancyzhang/claude-orchestrator 0.4.0 → 0.4.1
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 +19 -13
- package/dist/config.d.ts +17 -0
- package/dist/config.js +20 -2
- package/dist/config.js.map +1 -1
- package/dist/email-validator/__tests__/domain.test.d.ts +1 -0
- package/dist/email-validator/__tests__/domain.test.js +128 -0
- package/dist/email-validator/__tests__/domain.test.js.map +1 -0
- package/dist/email-validator/__tests__/local-part.test.d.ts +1 -0
- package/dist/email-validator/__tests__/local-part.test.js +110 -0
- package/dist/email-validator/__tests__/local-part.test.js.map +1 -0
- package/dist/email-validator/__tests__/parser.test.d.ts +1 -0
- package/dist/email-validator/__tests__/parser.test.js +161 -0
- package/dist/email-validator/__tests__/parser.test.js.map +1 -0
- package/dist/email-validator/__tests__/validator.test.d.ts +1 -0
- package/dist/email-validator/__tests__/validator.test.js +152 -0
- package/dist/email-validator/__tests__/validator.test.js.map +1 -0
- package/dist/email-validator/diagnostics.d.ts +3 -0
- package/dist/email-validator/diagnostics.js +34 -0
- package/dist/email-validator/diagnostics.js.map +1 -0
- package/dist/email-validator/domain.d.ts +2 -0
- package/dist/email-validator/domain.js +119 -0
- package/dist/email-validator/domain.js.map +1 -0
- package/dist/email-validator/index.d.ts +2 -0
- package/dist/email-validator/index.js +2 -0
- package/dist/email-validator/index.js.map +1 -0
- package/dist/email-validator/local-part.d.ts +2 -0
- package/dist/email-validator/local-part.js +67 -0
- package/dist/email-validator/local-part.js.map +1 -0
- package/dist/email-validator/parser.d.ts +9 -0
- package/dist/email-validator/parser.js +120 -0
- package/dist/email-validator/parser.js.map +1 -0
- package/dist/email-validator/types.d.ts +24 -0
- package/dist/email-validator/types.js +2 -0
- package/dist/email-validator/types.js.map +1 -0
- package/dist/email-validator/validator.d.ts +9 -0
- package/dist/email-validator/validator.js +51 -0
- package/dist/email-validator/validator.js.map +1 -0
- package/dist/executor/runner.d.ts +19 -2
- package/dist/executor/runner.js +29 -4
- package/dist/executor/runner.js.map +1 -1
- package/dist/executor/template.d.ts +3 -1
- package/dist/executor/template.js +17 -32
- package/dist/executor/template.js.map +1 -1
- package/dist/index.js +3 -1
- package/dist/index.js.map +1 -1
- package/dist/leader/chain-router.d.ts +6 -2
- package/dist/leader/chain-router.js +81 -12
- 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 -0
- package/dist/leader/event-bus.js.map +1 -1
- package/dist/leader/index.js +97 -9
- package/dist/leader/index.js.map +1 -1
- package/dist/leader/merge-validator.d.ts +2 -1
- package/dist/leader/merge-validator.js +13 -20
- package/dist/leader/merge-validator.js.map +1 -1
- package/dist/leader/state.d.ts +3 -0
- package/dist/leader/state.js +30 -1
- package/dist/leader/state.js.map +1 -1
- package/dist/leader/stream-tailer.d.ts +12 -0
- package/dist/leader/stream-tailer.js +58 -0
- package/dist/leader/stream-tailer.js.map +1 -0
- package/dist/leader/tui.d.ts +6 -0
- package/dist/leader/tui.js +131 -27
- package/dist/leader/tui.js.map +1 -1
- package/dist/models/schemas.d.ts +13 -6
- package/dist/models/schemas.js +3 -0
- package/dist/models/schemas.js.map +1 -1
- package/dist/modules/task-queue.js +4 -0
- package/dist/modules/task-queue.js.map +1 -1
- package/dist/orchestrator/init-checker.d.ts +33 -0
- package/dist/orchestrator/init-checker.js +297 -0
- package/dist/orchestrator/init-checker.js.map +1 -0
- package/dist/orchestrator/run.d.ts +1 -0
- package/dist/orchestrator/run.js +26 -81
- package/dist/orchestrator/run.js.map +1 -1
- package/dist/templates/agents/worker-commit-message.md +12 -0
- package/dist/templates/agents/worker-evaluate-format-hint.md +7 -0
- package/dist/templates/agents/worker-identity.md +7 -0
- package/dist/templates/agents/worker-merge-decision.md +12 -0
- package/dist/templates/agents/worker-task-doc.md +13 -0
- package/dist/templates/user-global-claude.md +65 -0
- package/dist/utils/console-capture.d.ts +2 -0
- package/dist/utils/console-capture.js +42 -0
- package/dist/utils/console-capture.js.map +1 -0
- package/dist/utils/exec.d.ts +2 -6
- package/dist/utils/exec.js +48 -29
- package/dist/utils/exec.js.map +1 -1
- package/dist/utils/json.d.ts +5 -0
- package/dist/utils/json.js +17 -0
- package/dist/utils/json.js.map +1 -0
- package/dist/worker/child-runner.js +19 -3
- package/dist/worker/child-runner.js.map +1 -1
- package/dist/worker/commit-checker.d.ts +3 -2
- package/dist/worker/commit-checker.js +13 -19
- package/dist/worker/commit-checker.js.map +1 -1
- package/dist/worker/evaluator.d.ts +3 -4
- package/dist/worker/evaluator.js +15 -50
- package/dist/worker/evaluator.js.map +1 -1
- package/dist/worker/watcher.js +9 -11
- package/dist/worker/watcher.js.map +1 -1
- package/dist/worker/worktree-initializer.js +3 -0
- package/dist/worker/worktree-initializer.js.map +1 -1
- package/package.json +1 -1
package/dist/leader/index.js
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
|
+
import * as fs from "node:fs";
|
|
1
2
|
import * as os from "node:os";
|
|
3
|
+
import * as path from "node:path";
|
|
2
4
|
import { ZkClient, isNodeExists } from "../zk/client.js";
|
|
3
5
|
import { InstanceRegistry } from "../modules/registry.js";
|
|
4
6
|
import { LeaderEventBus } from "./event-bus.js";
|
|
@@ -12,9 +14,12 @@ import { MergeValidator } from "./merge-validator.js";
|
|
|
12
14
|
import { TaskQueue } from "../modules/task-queue.js";
|
|
13
15
|
import { MessageRouter } from "../modules/message-router.js";
|
|
14
16
|
import { ClaudeRunner } from "../executor/runner.js";
|
|
15
|
-
import {
|
|
17
|
+
import { TemplateEngine } from "../executor/template.js";
|
|
18
|
+
import { loadInstanceConfig, saveInstanceId, loadConfig } from "../config.js";
|
|
16
19
|
import { Logger } from "../utils/logger.js";
|
|
20
|
+
import { captureConsoleToFile, restoreConsole } from "../utils/console-capture.js";
|
|
17
21
|
import { LeaderTui } from "./tui.js";
|
|
22
|
+
import { StreamTailer } from "./stream-tailer.js";
|
|
18
23
|
export async function startLeader(config) {
|
|
19
24
|
const logger = new Logger("Leader");
|
|
20
25
|
const zk = new ZkClient(config.zkHosts);
|
|
@@ -31,7 +36,7 @@ export async function startLeader(config) {
|
|
|
31
36
|
started_at: new Date().toISOString(),
|
|
32
37
|
host: os.hostname(),
|
|
33
38
|
pid: process.pid,
|
|
34
|
-
version: "0.4.
|
|
39
|
+
version: "0.4.1",
|
|
35
40
|
});
|
|
36
41
|
}
|
|
37
42
|
catch (err) {
|
|
@@ -45,22 +50,85 @@ export async function startLeader(config) {
|
|
|
45
50
|
const registry = new InstanceRegistry(zk);
|
|
46
51
|
const instance = await registry.register(leaderName, "leader", leaderId);
|
|
47
52
|
saveInstanceId(instance.id);
|
|
48
|
-
//
|
|
49
|
-
const
|
|
50
|
-
|
|
53
|
+
// Resolve cache dir from config (defaults to project-local .claude-orchestrator/sessions)
|
|
54
|
+
const resolvedConfig = loadConfig({ zookeeper: config.zkHosts });
|
|
55
|
+
// Redirect all console output to file so TUI controls the screen
|
|
56
|
+
captureConsoleToFile(resolvedConfig.cacheDir);
|
|
51
57
|
// Initialize EventBus + State
|
|
52
58
|
const eventBus = new LeaderEventBus();
|
|
53
59
|
const state = new LeaderState();
|
|
54
60
|
state.leaderName = leaderName;
|
|
55
61
|
state.leaderInstanceId = instance.id;
|
|
56
|
-
state.cacheDir =
|
|
62
|
+
state.cacheDir = resolvedConfig.cacheDir;
|
|
57
63
|
eventBus.onAll((event) => state.apply(event));
|
|
64
|
+
// Initialize TemplateEngine first — needed for identity and merge templates
|
|
65
|
+
const projectRoot = process.cwd();
|
|
66
|
+
const distTemplateDir = path.join(projectRoot, "dist", "templates");
|
|
67
|
+
const srcTemplateDir = path.join(projectRoot, "templates");
|
|
68
|
+
const templateDir = fs.existsSync(distTemplateDir) ? distTemplateDir : srcTemplateDir;
|
|
69
|
+
const agentsDir = path.join(templateDir, "agents");
|
|
70
|
+
const templateEngine = new TemplateEngine(agentsDir);
|
|
71
|
+
await templateEngine.loadAll();
|
|
72
|
+
const identityTemplate = await templateEngine.loadFile("worker-identity.md");
|
|
73
|
+
const mergeDecisionTemplate = await templateEngine.loadFile("worker-merge-decision.md");
|
|
74
|
+
// Initialize ClaudeRunner with streaming callback for TUI
|
|
75
|
+
const leaderIdentity = {
|
|
76
|
+
name: leaderName,
|
|
77
|
+
role: "leader",
|
|
78
|
+
worktreePath: process.cwd(),
|
|
79
|
+
worktreeBranch: "",
|
|
80
|
+
instanceId: instance.id,
|
|
81
|
+
};
|
|
82
|
+
const cacheRunner = new ClaudeRunner(resolvedConfig.cliCommand, resolvedConfig.cacheDir, instance.id, process.cwd(), leaderIdentity, identityTemplate, (line) => {
|
|
83
|
+
eventBus.emit({
|
|
84
|
+
type: "stream_chunk",
|
|
85
|
+
instanceId: instance.id,
|
|
86
|
+
line,
|
|
87
|
+
timestamp: new Date().toLocaleTimeString(),
|
|
88
|
+
});
|
|
89
|
+
});
|
|
90
|
+
// StreamTailer for cross-process file-based streaming
|
|
91
|
+
const streamTailer = new StreamTailer();
|
|
92
|
+
// When a worker claims a task, start tailing its log file
|
|
93
|
+
eventBus.on("task_claimed", (event) => {
|
|
94
|
+
const workerId = event.instanceId;
|
|
95
|
+
const taskId = event.taskId;
|
|
96
|
+
if (!workerId || !taskId)
|
|
97
|
+
return;
|
|
98
|
+
const logPath = cacheRunner.logPath(taskId);
|
|
99
|
+
eventBus.emit({
|
|
100
|
+
type: "stream_start",
|
|
101
|
+
instanceId: workerId,
|
|
102
|
+
logPath,
|
|
103
|
+
taskId,
|
|
104
|
+
});
|
|
105
|
+
streamTailer.start(logPath, (line) => {
|
|
106
|
+
eventBus.emit({
|
|
107
|
+
type: "stream_chunk",
|
|
108
|
+
instanceId: workerId,
|
|
109
|
+
line,
|
|
110
|
+
timestamp: new Date().toLocaleTimeString(),
|
|
111
|
+
});
|
|
112
|
+
});
|
|
113
|
+
});
|
|
114
|
+
// When a task completes, stop tailing
|
|
115
|
+
eventBus.on("task_completed", (event) => {
|
|
116
|
+
const workerId = event.instanceId;
|
|
117
|
+
if (workerId && streamTailer.isActive) {
|
|
118
|
+
streamTailer.stop();
|
|
119
|
+
eventBus.emit({
|
|
120
|
+
type: "stream_end",
|
|
121
|
+
instanceId: workerId,
|
|
122
|
+
logPath: "",
|
|
123
|
+
});
|
|
124
|
+
}
|
|
125
|
+
});
|
|
58
126
|
// Initialize TaskQueue, MessageRouter, and ChainRouter
|
|
59
127
|
const taskQueue = new TaskQueue(zk);
|
|
60
128
|
const messageRouter = new MessageRouter(zk);
|
|
61
129
|
// 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);
|
|
130
|
+
const mergeValidator = new MergeValidator(process.cwd(), cacheRunner, eventBus, mergeDecisionTemplate);
|
|
131
|
+
const chainRouter = new ChainRouter(zk, taskQueue, messageRouter, eventBus, instance.id, leaderName, cacheRunner, templateEngine, mergeValidator);
|
|
64
132
|
// Start subsystems
|
|
65
133
|
const leaderWatcher = new LeaderWatcher(zk, eventBus, instance.id, chainRouter);
|
|
66
134
|
await leaderWatcher.start();
|
|
@@ -71,9 +139,28 @@ export async function startLeader(config) {
|
|
|
71
139
|
const recovery = new TaskRecovery(zk, eventBus);
|
|
72
140
|
recovery.start();
|
|
73
141
|
await recovery.scanOrphans();
|
|
142
|
+
// Add leader as visible worker for in-process streaming display
|
|
143
|
+
eventBus.emit({
|
|
144
|
+
type: "worker_joined",
|
|
145
|
+
instance: {
|
|
146
|
+
id: instance.id,
|
|
147
|
+
name: leaderName,
|
|
148
|
+
role: "leader",
|
|
149
|
+
status: "idle",
|
|
150
|
+
},
|
|
151
|
+
instanceId: instance.id,
|
|
152
|
+
name: leaderName,
|
|
153
|
+
});
|
|
74
154
|
// Initialize TUI
|
|
75
155
|
const tui = new LeaderTui();
|
|
76
|
-
eventBus.onAll(() =>
|
|
156
|
+
eventBus.onAll((event) => {
|
|
157
|
+
if (event.type === "stream_chunk") {
|
|
158
|
+
tui.requestRender();
|
|
159
|
+
}
|
|
160
|
+
else {
|
|
161
|
+
tui.render(state);
|
|
162
|
+
}
|
|
163
|
+
});
|
|
77
164
|
tui.render(state);
|
|
78
165
|
// Wire TUI input to send messages to leader's own queue for processing
|
|
79
166
|
tui.onInput(async (text) => {
|
|
@@ -96,6 +183,7 @@ export async function startLeader(config) {
|
|
|
96
183
|
await new Promise((resolve) => {
|
|
97
184
|
const cleanup = () => {
|
|
98
185
|
tui.destroy();
|
|
186
|
+
restoreConsole();
|
|
99
187
|
resolve();
|
|
100
188
|
};
|
|
101
189
|
process.once("SIGINT", cleanup);
|
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,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,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;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/leader/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,8 +8,9 @@ export declare class MergeValidator {
|
|
|
8
8
|
private projectRoot;
|
|
9
9
|
private runner;
|
|
10
10
|
private eventBus;
|
|
11
|
+
private mergeDecisionTemplate?;
|
|
11
12
|
private logger;
|
|
12
|
-
constructor(projectRoot: string, runner: ClaudeRunner, eventBus: LeaderEventBus);
|
|
13
|
+
constructor(projectRoot: string, runner: ClaudeRunner, eventBus: LeaderEventBus, mergeDecisionTemplate?: string | undefined);
|
|
13
14
|
validate(commitInfo: {
|
|
14
15
|
sha: string;
|
|
15
16
|
message: string;
|
|
@@ -1,15 +1,18 @@
|
|
|
1
1
|
import * as fs from "node:fs";
|
|
2
2
|
import { execSync } from "node:child_process";
|
|
3
3
|
import { Logger } from "../utils/logger.js";
|
|
4
|
+
import { extractJson } from "../utils/json.js";
|
|
4
5
|
export class MergeValidator {
|
|
5
6
|
projectRoot;
|
|
6
7
|
runner;
|
|
7
8
|
eventBus;
|
|
9
|
+
mergeDecisionTemplate;
|
|
8
10
|
logger = new Logger("MergeValidator");
|
|
9
|
-
constructor(projectRoot, runner, eventBus) {
|
|
11
|
+
constructor(projectRoot, runner, eventBus, mergeDecisionTemplate) {
|
|
10
12
|
this.projectRoot = projectRoot;
|
|
11
13
|
this.runner = runner;
|
|
12
14
|
this.eventBus = eventBus;
|
|
15
|
+
this.mergeDecisionTemplate = mergeDecisionTemplate;
|
|
13
16
|
}
|
|
14
17
|
async validate(commitInfo) {
|
|
15
18
|
const mainBranch = this.getMainBranch();
|
|
@@ -65,30 +68,20 @@ export class MergeValidator {
|
|
|
65
68
|
}
|
|
66
69
|
}
|
|
67
70
|
async askMergeDecision(commit, mainBranch) {
|
|
68
|
-
const
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
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");
|
|
71
|
+
const template = this.mergeDecisionTemplate ?? "";
|
|
72
|
+
const prompt = template
|
|
73
|
+
.replace(/\{\{branch\}\}/g, commit.branch)
|
|
74
|
+
.replace(/\{\{sha\}\}/g, commit.sha)
|
|
75
|
+
.replace(/\{\{message\}\}/g, commit.message)
|
|
76
|
+
.replace(/\{\{task_title\}\}/g, commit.taskTitle)
|
|
77
|
+
.replace(/\{\{task_link\}\}/g, commit.taskLink)
|
|
78
|
+
.replace(/\{\{main_branch\}\}/g, mainBranch);
|
|
82
79
|
const uniqueKey = `merge-decision-${Date.now().toString(36)}`;
|
|
83
80
|
const logPath = this.runner.logPath(uniqueKey);
|
|
84
81
|
await this.runner.run(prompt, logPath);
|
|
85
82
|
try {
|
|
86
83
|
const output = await fs.promises.readFile(logPath, "utf-8");
|
|
87
|
-
|
|
88
|
-
.replace(/```json\s*/g, "")
|
|
89
|
-
.replace(/```\s*/g, "")
|
|
90
|
-
.trim();
|
|
91
|
-
return JSON.parse(cleaned);
|
|
84
|
+
return JSON.parse(extractJson(output));
|
|
92
85
|
}
|
|
93
86
|
catch {
|
|
94
87
|
// Fallback: merge if no conflict expected
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-validator.js","sourceRoot":"","sources":["../../src/leader/merge-validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"merge-validator.js","sourceRoot":"","sources":["../../src/leader/merge-validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAS/C,MAAM,OAAO,cAAc;IAIf;IACA;IACA;IACA;IANF,MAAM,GAAG,IAAI,MAAM,CAAC,gBAAgB,CAAC,CAAC;IAE9C,YACU,WAAmB,EACnB,MAAoB,EACpB,QAAwB,EACxB,qBAA8B;QAH9B,gBAAW,GAAX,WAAW,CAAQ;QACnB,WAAM,GAAN,MAAM,CAAc;QACpB,aAAQ,GAAR,QAAQ,CAAgB;QACxB,0BAAqB,GAArB,qBAAqB,CAAS;IACrC,CAAC;IAEJ,KAAK,CAAC,QAAQ,CAAC,UAMd;QACC,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;QACxC,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QAC/D,IAAI,MAAM;YAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC;QAElE,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;YAErE,IAAI,QAAQ,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;gBAClC,IAAI,CAAC;oBACH,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,6BAA6B,CAAC,CAAC;oBAClE,IAAI,CAAC,OAAO,CAAC,YAAY,UAAU,EAAE,CAAC,CAAC;oBACvC,IAAI,CAAC,OAAO,CACV,SAAS,UAAU,CAAC,MAAM,sBAAsB,UAAU,CAAC,MAAM,KAAK,UAAU,CAAC,OAAO,GAAG,CAC5F,CAAC;oBACF,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;wBACjB,IAAI,EAAE,YAAY;wBAClB,OAAO,EAAE,WAAW,UAAU,CAAC,MAAM,OAAO,UAAU,EAAE;qBACzD,CAAC,CAAC;oBACH,cAAc;oBACd,IAAI,CAAC;wBAAC,IAAI,CAAC,OAAO,CAAC,YAAY,aAAa,EAAE,CAAC,CAAC;oBAAC,CAAC;oBAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC;gBACvE,CAAC;gBAAC,MAAM,CAAC;oBACP,IAAI,CAAC;wBAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;oBAAC,CAAC;oBAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC;oBACzD,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,EAAE,sCAAsC,EAAE,CAAC;gBACtF,CAAC;YACH,CAAC;YAED,OAAO,QAAQ,CAAC;QAClB,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,EAAE,6CAA6C,EAAE,CAAC;QAC7F,CAAC;IACH,CAAC;IAEO,aAAa;QACnB,IAAI,CAAC;YACH,OAAO,IAAI,CAAC,OAAO,CAAC,6BAA6B,CAAC,CAAC;QACrD,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,MAAM,CAAC;QAChB,CAAC;IACH,CAAC;IAEO,cAAc,CAAC,GAAW,EAAE,WAAmB;QACrD,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,qBAAqB,GAAG,EAAE,CAAC,CAAC;YACxD,OAAO,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;QAC3B,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAC5B,MAA6F,EAC7F,UAAkB;QAElB,MAAM,QAAQ,GAAG,IAAI,CAAC,qBAAqB,IAAI,EAAE,CAAC;QAClD,MAAM,MAAM,GAAG,QAAQ;aACpB,OAAO,CAAC,iBAAiB,EAAE,MAAM,CAAC,MAAM,CAAC;aACzC,OAAO,CAAC,cAAc,EAAE,MAAM,CAAC,GAAG,CAAC;aACnC,OAAO,CAAC,kBAAkB,EAAE,MAAM,CAAC,OAAO,CAAC;aAC3C,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,SAAS,CAAC;aAChD,OAAO,CAAC,oBAAoB,EAAE,MAAM,CAAC,QAAQ,CAAC;aAC9C,OAAO,CAAC,sBAAsB,EAAE,UAAU,CAAC,CAAC;QAE/C,MAAM,SAAS,GAAG,kBAAkB,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;QAC9D,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC/C,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAEvC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAC5D,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;QACzC,CAAC;QAAC,MAAM,CAAC;YACP,0CAA0C;YAC1C,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,oCAAoC,EAAE,CAAC;QAC7E,CAAC;IACH,CAAC;IAEO,OAAO,CAAC,IAAY;QAC1B,IAAI,CAAC;YACH,OAAO,QAAQ,CAAC,OAAO,IAAI,EAAE,EAAE;gBAC7B,GAAG,EAAE,IAAI,CAAC,WAAW;gBACrB,QAAQ,EAAE,OAAO;gBACjB,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;aAChC,CAAC,CAAC,IAAI,EAAE,CAAC;QACZ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,GAAG,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC7D,MAAM,IAAI,KAAK,CAAC,OAAO,IAAI,YAAY,GAAG,EAAE,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;CACF"}
|
package/dist/leader/state.d.ts
CHANGED
|
@@ -22,6 +22,9 @@ export interface WorkerInfo {
|
|
|
22
22
|
currentMessageTime: string | null;
|
|
23
23
|
messageHistory: WorkerMessageEntry[];
|
|
24
24
|
lastCompletedTask: string | null;
|
|
25
|
+
streamBuffer: string[];
|
|
26
|
+
streamActive: boolean;
|
|
27
|
+
streamLogPath: string | null;
|
|
25
28
|
}
|
|
26
29
|
export interface EventLogEntry {
|
|
27
30
|
timestamp: string;
|
package/dist/leader/state.js
CHANGED
|
@@ -41,6 +41,9 @@ export class LeaderState {
|
|
|
41
41
|
currentMessageTime: null,
|
|
42
42
|
messageHistory: [],
|
|
43
43
|
lastCompletedTask: null,
|
|
44
|
+
streamBuffer: [],
|
|
45
|
+
streamActive: false,
|
|
46
|
+
streamLogPath: null,
|
|
44
47
|
});
|
|
45
48
|
this.events.push({ timestamp: time, message: `${inst.name} joined (${inst.role})` });
|
|
46
49
|
break;
|
|
@@ -69,7 +72,7 @@ export class LeaderState {
|
|
|
69
72
|
w.currentMessageTime = timestamp;
|
|
70
73
|
w.messageHistory.push({
|
|
71
74
|
timestamp,
|
|
72
|
-
content: rawContent
|
|
75
|
+
content: rawContent,
|
|
73
76
|
contentFull: rawContent,
|
|
74
77
|
link: event.link ?? null,
|
|
75
78
|
messageId: event.messageId ?? "",
|
|
@@ -168,6 +171,32 @@ export class LeaderState {
|
|
|
168
171
|
case "debug_info":
|
|
169
172
|
this.events.push({ timestamp: time, message: `[DEBUG] ${event.message}` });
|
|
170
173
|
break;
|
|
174
|
+
case "stream_start": {
|
|
175
|
+
const w = this.workers.find(w => w.id === event.instanceId);
|
|
176
|
+
if (w) {
|
|
177
|
+
w.streamBuffer = [];
|
|
178
|
+
w.streamActive = true;
|
|
179
|
+
w.streamLogPath = event.logPath ?? null;
|
|
180
|
+
}
|
|
181
|
+
break;
|
|
182
|
+
}
|
|
183
|
+
case "stream_chunk": {
|
|
184
|
+
const w = this.workers.find(w => w.id === event.instanceId);
|
|
185
|
+
if (w && w.streamActive) {
|
|
186
|
+
w.streamBuffer.push(event.line);
|
|
187
|
+
if (w.streamBuffer.length > 200) {
|
|
188
|
+
w.streamBuffer = w.streamBuffer.slice(-200);
|
|
189
|
+
}
|
|
190
|
+
}
|
|
191
|
+
break;
|
|
192
|
+
}
|
|
193
|
+
case "stream_end": {
|
|
194
|
+
const w = this.workers.find(w => w.id === event.instanceId);
|
|
195
|
+
if (w) {
|
|
196
|
+
w.streamActive = false;
|
|
197
|
+
}
|
|
198
|
+
break;
|
|
199
|
+
}
|
|
171
200
|
}
|
|
172
201
|
// Keep event log to last 100 entries
|
|
173
202
|
if (this.events.length > 100)
|
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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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
export declare class StreamTailer {
|
|
2
|
+
private pollIntervalMs;
|
|
3
|
+
private activeFile;
|
|
4
|
+
private lastPosition;
|
|
5
|
+
private pollTimer;
|
|
6
|
+
private onLine;
|
|
7
|
+
constructor(pollIntervalMs?: number);
|
|
8
|
+
start(filePath: string, onLine: (line: string) => void): void;
|
|
9
|
+
stop(): void;
|
|
10
|
+
get isActive(): boolean;
|
|
11
|
+
private poll;
|
|
12
|
+
}
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
import * as fs from "node:fs";
|
|
2
|
+
export class StreamTailer {
|
|
3
|
+
pollIntervalMs;
|
|
4
|
+
activeFile = null;
|
|
5
|
+
lastPosition = 0;
|
|
6
|
+
pollTimer = null;
|
|
7
|
+
onLine = null;
|
|
8
|
+
constructor(pollIntervalMs = 200) {
|
|
9
|
+
this.pollIntervalMs = pollIntervalMs;
|
|
10
|
+
}
|
|
11
|
+
start(filePath, onLine) {
|
|
12
|
+
this.stop();
|
|
13
|
+
this.activeFile = filePath;
|
|
14
|
+
this.lastPosition = 0;
|
|
15
|
+
this.onLine = onLine;
|
|
16
|
+
this.pollTimer = setInterval(() => this.poll(), this.pollIntervalMs);
|
|
17
|
+
}
|
|
18
|
+
stop() {
|
|
19
|
+
if (this.pollTimer) {
|
|
20
|
+
clearInterval(this.pollTimer);
|
|
21
|
+
this.pollTimer = null;
|
|
22
|
+
}
|
|
23
|
+
this.activeFile = null;
|
|
24
|
+
this.lastPosition = 0;
|
|
25
|
+
this.onLine = null;
|
|
26
|
+
}
|
|
27
|
+
get isActive() {
|
|
28
|
+
return this.pollTimer !== null;
|
|
29
|
+
}
|
|
30
|
+
poll() {
|
|
31
|
+
if (!this.activeFile || !this.onLine)
|
|
32
|
+
return;
|
|
33
|
+
try {
|
|
34
|
+
const stat = fs.statSync(this.activeFile);
|
|
35
|
+
if (stat.size <= this.lastPosition) {
|
|
36
|
+
if (stat.size < this.lastPosition) {
|
|
37
|
+
this.lastPosition = 0;
|
|
38
|
+
}
|
|
39
|
+
return;
|
|
40
|
+
}
|
|
41
|
+
const fd = fs.openSync(this.activeFile, "r");
|
|
42
|
+
const buf = Buffer.alloc(stat.size - this.lastPosition);
|
|
43
|
+
fs.readSync(fd, buf, 0, buf.length, this.lastPosition);
|
|
44
|
+
fs.closeSync(fd);
|
|
45
|
+
this.lastPosition = stat.size;
|
|
46
|
+
const content = buf.toString("utf-8");
|
|
47
|
+
const lines = content.split("\n");
|
|
48
|
+
for (const line of lines) {
|
|
49
|
+
if (line.length > 0)
|
|
50
|
+
this.onLine(line);
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
catch {
|
|
54
|
+
// file not created yet — retry on next poll
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
//# sourceMappingURL=stream-tailer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stream-tailer.js","sourceRoot":"","sources":["../../src/leader/stream-tailer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAE9B,MAAM,OAAO,YAAY;IAMH;IALZ,UAAU,GAAkB,IAAI,CAAC;IACjC,YAAY,GAAG,CAAC,CAAC;IACjB,SAAS,GAA0C,IAAI,CAAC;IACxD,MAAM,GAAoC,IAAI,CAAC;IAEvD,YAAoB,iBAAiB,GAAG;QAApB,mBAAc,GAAd,cAAc,CAAM;IAAG,CAAC;IAE5C,KAAK,CAAC,QAAgB,EAAE,MAA8B;QACpD,IAAI,CAAC,IAAI,EAAE,CAAC;QACZ,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC;QAC3B,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC;QACtB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IACvE,CAAC;IAED,IAAI;QACF,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC9B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACxB,CAAC;QACD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC;QACtB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;IACrB,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,SAAS,KAAK,IAAI,CAAC;IACjC,CAAC;IAEO,IAAI;QACV,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,MAAM;YAAE,OAAO;QAC7C,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC1C,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;gBACnC,IAAI,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;oBAClC,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC;gBACxB,CAAC;gBACD,OAAO;YACT,CAAC;YACD,MAAM,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;YAC7C,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC;YACxD,EAAE,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;YACvD,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;YACjB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC;YAE9B,MAAM,OAAO,GAAG,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YACtC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAClC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC;oBAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACzC,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,4CAA4C;QAC9C,CAAC;IACH,CAAC;CACF"}
|
package/dist/leader/tui.d.ts
CHANGED
|
@@ -4,11 +4,17 @@ export declare class LeaderTui {
|
|
|
4
4
|
private inputCallback;
|
|
5
5
|
private rawMode;
|
|
6
6
|
private state;
|
|
7
|
+
private refreshTimer;
|
|
8
|
+
private renderQueued;
|
|
9
|
+
private renderDebounceMs;
|
|
7
10
|
constructor();
|
|
8
11
|
onInput(cb: (text: string) => void): void;
|
|
9
12
|
private enableRawMode;
|
|
10
13
|
private disableRawMode;
|
|
11
14
|
private rerender;
|
|
15
|
+
requestRender(): void;
|
|
16
|
+
private setupResizeHandler;
|
|
17
|
+
private startRefreshTimer;
|
|
12
18
|
private setupInput;
|
|
13
19
|
render(state: LeaderState): void;
|
|
14
20
|
destroy(): void;
|