@adamancyzhang/claude-orchestrator 0.3.3 → 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 +203 -269
- 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 +39 -0
- package/dist/config.js +43 -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 +19 -16
- package/dist/executor/template.js.map +1 -1
- package/dist/index.js +11 -34
- package/dist/index.js.map +1 -1
- package/dist/leader/chain-router.d.ts +10 -2
- package/dist/leader/chain-router.js +167 -10
- package/dist/leader/chain-router.js.map +1 -1
- package/dist/leader/event-bus.d.ts +1 -1
- package/dist/leader/event-bus.js +2 -1
- package/dist/leader/event-bus.js.map +1 -1
- package/dist/leader/index.d.ts +7 -0
- package/dist/leader/index.js +99 -8
- package/dist/leader/index.js.map +1 -1
- package/dist/leader/merge-validator.d.ts +25 -0
- package/dist/leader/merge-validator.js +105 -0
- package/dist/leader/merge-validator.js.map +1 -0
- package/dist/leader/state.d.ts +20 -0
- package/dist/leader/state.js +77 -2
- 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 +8 -0
- package/dist/leader/tui.js +245 -17
- 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 +28 -6
- package/dist/models/schemas.js +8 -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 +7 -0
- package/dist/orchestrator/run.js +126 -0
- package/dist/orchestrator/run.js.map +1 -0
- 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-commit-message.md +12 -0
- package/dist/templates/agents/worker-decompose.md +40 -0
- package/dist/templates/agents/worker-evaluate-format-hint.md +7 -0
- package/dist/templates/agents/worker-evaluate.md +49 -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-plan.md +36 -0
- package/dist/templates/agents/worker-review.md +42 -0
- package/dist/templates/agents/worker-task-doc.md +13 -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/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/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 +115 -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 +21 -0
- package/dist/worker/commit-checker.js +81 -0
- package/dist/worker/commit-checker.js.map +1 -0
- 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.d.ts +5 -1
- package/dist/worker/watcher.js +44 -9
- package/dist/worker/watcher.js.map +1 -1
- package/dist/worker/worktree-initializer.d.ts +10 -0
- package/dist/worker/worktree-initializer.js +238 -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
package/dist/cli/commands.js
CHANGED
|
@@ -1,19 +1,9 @@
|
|
|
1
|
-
import * as fs from "node:fs";
|
|
2
|
-
import * as path from "node:path";
|
|
3
|
-
import { fileURLToPath } from "node:url";
|
|
4
1
|
import { ZkClient } from "../zk/client.js";
|
|
5
2
|
import { InstanceRegistry } from "../modules/registry.js";
|
|
6
3
|
import { TaskQueue } from "../modules/task-queue.js";
|
|
7
4
|
import { MessageRouter } from "../modules/message-router.js";
|
|
8
|
-
import {
|
|
5
|
+
import { loadInstanceId, resolveInstanceId } from "../config.js";
|
|
9
6
|
import { output } from "../utils/output.js";
|
|
10
|
-
import { Logger } from "../utils/logger.js";
|
|
11
|
-
import { HookEngine } from "../hooks/engine.js";
|
|
12
|
-
import { WorkerWatcher } from "../worker/watcher.js";
|
|
13
|
-
import { TemplateEngine } from "../executor/template.js";
|
|
14
|
-
import { ClaudeRunner } from "../executor/runner.js";
|
|
15
|
-
import { SelfEvaluator } from "../worker/evaluator.js";
|
|
16
|
-
const VALID_ROLES = ["planner", "builder", "verifier", "reviewer", "accepter"];
|
|
17
7
|
async function withZk(hosts, fn) {
|
|
18
8
|
const zk = new ZkClient(hosts);
|
|
19
9
|
await zk.connect();
|
|
@@ -27,65 +17,6 @@ async function withZk(hosts, fn) {
|
|
|
27
17
|
await zk.disconnect();
|
|
28
18
|
}
|
|
29
19
|
}
|
|
30
|
-
export async function cmdRegister(zkHosts, debug = false) {
|
|
31
|
-
if (debug)
|
|
32
|
-
Logger.enableDebug();
|
|
33
|
-
// Read from project config only — no CLI args, no global fallback
|
|
34
|
-
const projectConfig = loadInstanceConfig();
|
|
35
|
-
const name = projectConfig.name;
|
|
36
|
-
const role = projectConfig.role;
|
|
37
|
-
if (!name) {
|
|
38
|
-
output({ error: "name is required in .claude-orchestrator/config.json" }, true);
|
|
39
|
-
return;
|
|
40
|
-
}
|
|
41
|
-
if (!role || !VALID_ROLES.includes(role)) {
|
|
42
|
-
output({
|
|
43
|
-
error: `invalid role '${role || "(missing)"}', must be one of: ${VALID_ROLES.join(", ")}`,
|
|
44
|
-
}, true);
|
|
45
|
-
return;
|
|
46
|
-
}
|
|
47
|
-
const resolvedConfig = loadConfig({});
|
|
48
|
-
const instanceId = projectConfig.instance_id || undefined;
|
|
49
|
-
const zk = new ZkClient(zkHosts);
|
|
50
|
-
await zk.connect();
|
|
51
|
-
const registry = new InstanceRegistry(zk);
|
|
52
|
-
const instance = await registry.register(name, role, instanceId);
|
|
53
|
-
saveInstanceId(instance.id);
|
|
54
|
-
if (!projectConfig.instance_id) {
|
|
55
|
-
saveInstanceConfig({ name, role, instance_id: instance.id });
|
|
56
|
-
}
|
|
57
|
-
output(instance);
|
|
58
|
-
// Resolve leader instance ID for CACHE_DIR path
|
|
59
|
-
const leaderData = await zk.getLeader();
|
|
60
|
-
const leaderInstanceId = leaderData?.instance_id ?? instance.id;
|
|
61
|
-
const workDir = process.cwd();
|
|
62
|
-
const agentsDir = path.join(workDir, ".claude-orchestrator", "agents");
|
|
63
|
-
const hooks = new HookEngine();
|
|
64
|
-
hooks.load(resolvedConfig.hooks);
|
|
65
|
-
const templateEngine = new TemplateEngine(agentsDir);
|
|
66
|
-
const runner = new ClaudeRunner(resolvedConfig.cliCommand, resolvedConfig.cacheDir, leaderInstanceId, workDir);
|
|
67
|
-
const evaluator = new SelfEvaluator(templateEngine, runner, name, role);
|
|
68
|
-
const watcher = new WorkerWatcher(zk, instance.id, leaderInstanceId, hooks, templateEngine, runner, evaluator);
|
|
69
|
-
const onSigint = () => {
|
|
70
|
-
watcher.stop();
|
|
71
|
-
};
|
|
72
|
-
process.on("SIGINT", onSigint);
|
|
73
|
-
await watcher.start();
|
|
74
|
-
// Block until stopped
|
|
75
|
-
await new Promise((resolve) => {
|
|
76
|
-
const check = setInterval(() => {
|
|
77
|
-
if (watcher.stopped) {
|
|
78
|
-
clearInterval(check);
|
|
79
|
-
resolve();
|
|
80
|
-
}
|
|
81
|
-
}, 200);
|
|
82
|
-
});
|
|
83
|
-
const logger = new Logger("CLI");
|
|
84
|
-
await registry.unregister(instance.id);
|
|
85
|
-
await zk.disconnect();
|
|
86
|
-
process.removeListener("SIGINT", onSigint);
|
|
87
|
-
logger.info("Unregistered. Goodbye.");
|
|
88
|
-
}
|
|
89
20
|
export async function cmdPushTask(zkHosts, cliInstanceId, title, description, priority, assignee, link, chainId, dependsOn, blockedBy) {
|
|
90
21
|
await withZk(zkHosts, async ({ taskQueue }) => {
|
|
91
22
|
const instanceId = cliInstanceId ?? "";
|
|
@@ -161,120 +92,6 @@ export async function cmdUnregister(zkHosts, cliInstanceId) {
|
|
|
161
92
|
output({ status: "unregistered", instance_id: instanceId });
|
|
162
93
|
});
|
|
163
94
|
}
|
|
164
|
-
const __dirname = path.dirname(fileURLToPath(import.meta.url));
|
|
165
|
-
export async function cmdSetup(options) {
|
|
166
|
-
const { leader, name, role, cacheDir, command, global: isGlobal } = options;
|
|
167
|
-
const resolvedRole = leader ? "leader" : (role || "builder");
|
|
168
|
-
const resolvedName = name || (leader ? "Leader" : undefined);
|
|
169
|
-
const defaultCliCommand = "claude --dangerously-skip-permissions --permission-mode dontAsk";
|
|
170
|
-
const defaultCacheDir = "~/.claude-orchestrator/sessions";
|
|
171
|
-
// ── Write global config ──
|
|
172
|
-
const existingGlobal = loadGlobalConfig();
|
|
173
|
-
const globalZk = existingGlobal.zookeeper || { url: "127.0.0.1:2181", root_path: "/claude-orchestrator", auth: null };
|
|
174
|
-
const prevCommands = existingGlobal.commands;
|
|
175
|
-
const prevHooks = existingGlobal.hooks;
|
|
176
|
-
saveInstanceConfig({
|
|
177
|
-
commands: {
|
|
178
|
-
"claude-cli": command || prevCommands?.["claude-cli"] || defaultCliCommand,
|
|
179
|
-
},
|
|
180
|
-
hooks: prevHooks || {
|
|
181
|
-
leader_message_start: null,
|
|
182
|
-
leader_message_end: null,
|
|
183
|
-
worker_message_start: null,
|
|
184
|
-
worker_message_end: null,
|
|
185
|
-
},
|
|
186
|
-
cache_dir: cacheDir || existingGlobal.cache_dir || defaultCacheDir,
|
|
187
|
-
zookeeper: {
|
|
188
|
-
url: globalZk.url || "127.0.0.1:2181",
|
|
189
|
-
root_path: globalZk.root_path || "/claude-orchestrator",
|
|
190
|
-
auth: globalZk.auth ?? null,
|
|
191
|
-
},
|
|
192
|
-
}, true);
|
|
193
|
-
if (isGlobal) {
|
|
194
|
-
output({
|
|
195
|
-
status: "configured",
|
|
196
|
-
global: true,
|
|
197
|
-
config: loadGlobalConfig(),
|
|
198
|
-
message: "Global config written. Run with --leader or in a project to create templates and project config.",
|
|
199
|
-
});
|
|
200
|
-
return;
|
|
201
|
-
}
|
|
202
|
-
// ── Write project config ──
|
|
203
|
-
const projectConfig = {};
|
|
204
|
-
if (resolvedName)
|
|
205
|
-
projectConfig["name"] = resolvedName;
|
|
206
|
-
projectConfig["role"] = resolvedRole;
|
|
207
|
-
saveInstanceConfig(projectConfig, false);
|
|
208
|
-
// ── Copy templates to .claude-orchestrator/agents/ ──
|
|
209
|
-
const templateDir = path.join(__dirname, "..", "templates");
|
|
210
|
-
const agentsDir = path.join(process.cwd(), ".claude-orchestrator", "agents");
|
|
211
|
-
const templates = {
|
|
212
|
-
"worker-decompose.md": path.join(templateDir, "worker-decompose.md"),
|
|
213
|
-
"worker-evaluate.md": path.join(templateDir, "worker-evaluate.md"),
|
|
214
|
-
"worker-plan.md": path.join(templateDir, "worker-plan.md"),
|
|
215
|
-
"worker-build.md": path.join(templateDir, "worker-build.md"),
|
|
216
|
-
"worker-verify.md": path.join(templateDir, "worker-verify.md"),
|
|
217
|
-
"worker-review.md": path.join(templateDir, "worker-review.md"),
|
|
218
|
-
"worker-accept.md": path.join(templateDir, "worker-accept.md"),
|
|
219
|
-
};
|
|
220
|
-
const written = [];
|
|
221
|
-
const skipped = [];
|
|
222
|
-
for (const [filename, srcPath] of Object.entries(templates)) {
|
|
223
|
-
const destPath = path.join(agentsDir, filename);
|
|
224
|
-
fs.mkdirSync(agentsDir, { recursive: true });
|
|
225
|
-
if (fs.existsSync(destPath)) {
|
|
226
|
-
skipped.push(filename);
|
|
227
|
-
}
|
|
228
|
-
else {
|
|
229
|
-
const content = fs.readFileSync(srcPath, "utf-8");
|
|
230
|
-
fs.writeFileSync(destPath, content);
|
|
231
|
-
written.push(filename);
|
|
232
|
-
}
|
|
233
|
-
}
|
|
234
|
-
// ── Copy skills to .claude/skills/ ──
|
|
235
|
-
const skillsSrcDir = path.join(__dirname, "..", "skills");
|
|
236
|
-
const skillsDstDir = path.join(process.cwd(), ".claude", "skills");
|
|
237
|
-
const SKILLS_TO_COPY = [
|
|
238
|
-
"task-planning",
|
|
239
|
-
"task-execution",
|
|
240
|
-
"task-verification",
|
|
241
|
-
"task-review",
|
|
242
|
-
"task-acceptance",
|
|
243
|
-
"task-traceability",
|
|
244
|
-
];
|
|
245
|
-
const skillsWritten = [];
|
|
246
|
-
if (fs.existsSync(skillsSrcDir)) {
|
|
247
|
-
for (const skillName of SKILLS_TO_COPY) {
|
|
248
|
-
const srcSkillPath = path.join(skillsSrcDir, skillName, "SKILL.md");
|
|
249
|
-
const dstSkillDir = path.join(skillsDstDir, skillName);
|
|
250
|
-
const dstSkillPath = path.join(dstSkillDir, "SKILL.md");
|
|
251
|
-
if (!fs.existsSync(srcSkillPath))
|
|
252
|
-
continue;
|
|
253
|
-
if (fs.existsSync(dstSkillDir)) {
|
|
254
|
-
fs.rmSync(dstSkillDir, { recursive: true, force: true });
|
|
255
|
-
}
|
|
256
|
-
fs.mkdirSync(dstSkillDir, { recursive: true });
|
|
257
|
-
const content = fs.readFileSync(srcSkillPath, "utf-8");
|
|
258
|
-
fs.writeFileSync(dstSkillPath, content);
|
|
259
|
-
skillsWritten.push(skillName);
|
|
260
|
-
}
|
|
261
|
-
}
|
|
262
|
-
const result = {
|
|
263
|
-
status: "configured",
|
|
264
|
-
project_config: path.join(process.cwd(), ".claude-orchestrator", "config.json"),
|
|
265
|
-
templates_dir: agentsDir,
|
|
266
|
-
skills_dir: skillsDstDir,
|
|
267
|
-
};
|
|
268
|
-
if (written.length > 0)
|
|
269
|
-
result["templates_written"] = written;
|
|
270
|
-
if (skipped.length > 0)
|
|
271
|
-
result["templates_skipped"] = skipped;
|
|
272
|
-
if (skillsWritten.length > 0)
|
|
273
|
-
result["skills_written"] = skillsWritten;
|
|
274
|
-
if (!resolvedName)
|
|
275
|
-
result["warning"] = "No name provided. Use --name to set instance name.";
|
|
276
|
-
output(result);
|
|
277
|
-
}
|
|
278
95
|
export async function cmdTaskBlock(zkHosts, cliInstanceId, taskId, reason) {
|
|
279
96
|
await withZk(zkHosts, async ({ taskQueue }) => {
|
|
280
97
|
const instanceId = resolveInstanceId(cliInstanceId);
|
package/dist/cli/commands.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../src/cli/commands.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../src/cli/commands.ts"],"names":[],"mappings":"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"}
|
package/dist/config.d.ts
CHANGED
|
@@ -14,6 +14,20 @@ export interface HooksConfig {
|
|
|
14
14
|
worker_message_start?: string | null;
|
|
15
15
|
worker_message_end?: string | null;
|
|
16
16
|
}
|
|
17
|
+
export type StepAction = "created" | "updated" | "replaced" | "skipped" | "rejected" | "completed" | "failed";
|
|
18
|
+
export interface StepRecord {
|
|
19
|
+
action: StepAction;
|
|
20
|
+
timestamp: string;
|
|
21
|
+
reason?: string;
|
|
22
|
+
}
|
|
23
|
+
export interface InitStatus {
|
|
24
|
+
global_config?: StepRecord;
|
|
25
|
+
user_claude_md?: StepRecord;
|
|
26
|
+
team_claude_md?: StepRecord;
|
|
27
|
+
skills?: Record<string, StepRecord>;
|
|
28
|
+
worktrees?: Record<string, StepRecord>;
|
|
29
|
+
npm_install?: Record<string, StepRecord>;
|
|
30
|
+
}
|
|
17
31
|
export interface InstanceConfig {
|
|
18
32
|
instance_id?: string;
|
|
19
33
|
name?: string;
|
|
@@ -22,6 +36,14 @@ export interface InstanceConfig {
|
|
|
22
36
|
hooks?: HooksConfig;
|
|
23
37
|
cache_dir?: string;
|
|
24
38
|
zookeeper?: ZkConfig;
|
|
39
|
+
worktree?: Record<string, {
|
|
40
|
+
name: string;
|
|
41
|
+
role: string;
|
|
42
|
+
path: string;
|
|
43
|
+
branch: string;
|
|
44
|
+
instance_id: string;
|
|
45
|
+
}>;
|
|
46
|
+
init_status?: InitStatus;
|
|
25
47
|
}
|
|
26
48
|
export interface ResolvedConfig {
|
|
27
49
|
zk: ZkConfig;
|
|
@@ -41,4 +63,21 @@ export declare function loadGlobalConfig(): InstanceConfig;
|
|
|
41
63
|
export declare function saveInstanceId(instanceId: string): void;
|
|
42
64
|
export declare function loadInstanceId(): string | null;
|
|
43
65
|
export declare function resolveInstanceId(cliInstanceId?: string): string;
|
|
66
|
+
export interface WorktreeEntry {
|
|
67
|
+
name: string;
|
|
68
|
+
role: string;
|
|
69
|
+
path: string;
|
|
70
|
+
branch: string;
|
|
71
|
+
instance_id: string;
|
|
72
|
+
}
|
|
73
|
+
export declare function loadProjectWorktreeConfig(): Record<string, WorktreeEntry>;
|
|
74
|
+
export declare function saveProjectWorktreeConfig(entries: Record<string, WorktreeEntry> | Array<{
|
|
75
|
+
name: string;
|
|
76
|
+
role: string;
|
|
77
|
+
relativePath: string;
|
|
78
|
+
branch: string;
|
|
79
|
+
instanceId: string;
|
|
80
|
+
}>): void;
|
|
81
|
+
export declare function loadInitStatus(): InitStatus;
|
|
82
|
+
export declare function saveInitStatusStep(stepId: string, record: StepRecord, subId?: string): void;
|
|
44
83
|
export declare function expandHomeDir(p: string): string;
|
package/dist/config.js
CHANGED
|
@@ -13,7 +13,7 @@ function defaultZkConfig() {
|
|
|
13
13
|
return { url: "127.0.0.1:2181", root_path: "/claude-orchestrator", auth: null };
|
|
14
14
|
}
|
|
15
15
|
function defaultCacheDir() {
|
|
16
|
-
return "
|
|
16
|
+
return ".claude-orchestrator/sessions";
|
|
17
17
|
}
|
|
18
18
|
function defaultCliCommand() {
|
|
19
19
|
return "claude --dangerously-skip-permissions --permission-mode dontAsk";
|
|
@@ -32,7 +32,7 @@ export function loadConfig(cliOpts) {
|
|
|
32
32
|
else if (process.env.ZK_HOSTS) {
|
|
33
33
|
zk.url = process.env.ZK_HOSTS;
|
|
34
34
|
}
|
|
35
|
-
const cacheDir = global.cache_dir || defaultCacheDir();
|
|
35
|
+
const cacheDir = path.resolve(process.cwd(), expandHomeDir(global.cache_dir || defaultCacheDir()));
|
|
36
36
|
// Command: project overrides global
|
|
37
37
|
const mergedCommands = project.commands || global.commands;
|
|
38
38
|
const cliCommand = mergedCommands?.["claude-cli"] || defaultCliCommand();
|
|
@@ -93,6 +93,47 @@ export function resolveInstanceId(cliInstanceId) {
|
|
|
93
93
|
}
|
|
94
94
|
return resolved;
|
|
95
95
|
}
|
|
96
|
+
export function loadProjectWorktreeConfig() {
|
|
97
|
+
const config = loadProjectConfig();
|
|
98
|
+
return config.worktree ?? {};
|
|
99
|
+
}
|
|
100
|
+
export function saveProjectWorktreeConfig(entries) {
|
|
101
|
+
let record;
|
|
102
|
+
if (Array.isArray(entries)) {
|
|
103
|
+
record = {};
|
|
104
|
+
for (const c of entries) {
|
|
105
|
+
record[c.name] = {
|
|
106
|
+
name: c.name,
|
|
107
|
+
role: c.role,
|
|
108
|
+
path: c.relativePath,
|
|
109
|
+
branch: c.branch,
|
|
110
|
+
instance_id: c.instanceId,
|
|
111
|
+
};
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
else {
|
|
115
|
+
record = entries;
|
|
116
|
+
}
|
|
117
|
+
saveInstanceConfig({ worktree: record }, false);
|
|
118
|
+
}
|
|
119
|
+
export function loadInitStatus() {
|
|
120
|
+
const global = loadGlobalConfig();
|
|
121
|
+
return global.init_status ?? {};
|
|
122
|
+
}
|
|
123
|
+
export function saveInitStatusStep(stepId, record, subId) {
|
|
124
|
+
const global = loadGlobalConfig();
|
|
125
|
+
const status = global.init_status ?? {};
|
|
126
|
+
if (subId) {
|
|
127
|
+
status[stepId] = {
|
|
128
|
+
...status[stepId],
|
|
129
|
+
[subId]: record,
|
|
130
|
+
};
|
|
131
|
+
}
|
|
132
|
+
else {
|
|
133
|
+
status[stepId] = record;
|
|
134
|
+
}
|
|
135
|
+
saveInstanceConfig({ init_status: status }, true);
|
|
136
|
+
}
|
|
96
137
|
export function expandHomeDir(p) {
|
|
97
138
|
if (p.startsWith("~")) {
|
|
98
139
|
return path.join(os.homedir(), p.slice(1));
|
package/dist/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAE9B,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,sBAAsB,CAAC,CAAC;AACjF,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,128 @@
|
|
|
1
|
+
import { describe, it, expect } from "vitest";
|
|
2
|
+
import { validateDomain } from "../domain.js";
|
|
3
|
+
describe("validateDomain", () => {
|
|
4
|
+
describe("valid hostnames", () => {
|
|
5
|
+
it("accepts example.com", () => {
|
|
6
|
+
expect(validateDomain("example.com", false, false)).toEqual([]);
|
|
7
|
+
});
|
|
8
|
+
it("accepts subdomain", () => {
|
|
9
|
+
expect(validateDomain("mail.example.com", false, false)).toEqual([]);
|
|
10
|
+
});
|
|
11
|
+
it("accepts multi-level domain", () => {
|
|
12
|
+
expect(validateDomain("a.b.c.d.e.com", false, false)).toEqual([]);
|
|
13
|
+
});
|
|
14
|
+
it("accepts hyphen in middle of label", () => {
|
|
15
|
+
expect(validateDomain("my-domain.com", false, false)).toEqual([]);
|
|
16
|
+
});
|
|
17
|
+
it("accepts digits in labels", () => {
|
|
18
|
+
expect(validateDomain("example123.com", false, false)).toEqual([]);
|
|
19
|
+
});
|
|
20
|
+
it("accepts single-char labels", () => {
|
|
21
|
+
expect(validateDomain("a.b", false, false)).toEqual([]);
|
|
22
|
+
});
|
|
23
|
+
it("accepts 63-char label (boundary)", () => {
|
|
24
|
+
const label = "a".repeat(63);
|
|
25
|
+
expect(validateDomain(`${label}.com`, false, false)).toEqual([]);
|
|
26
|
+
});
|
|
27
|
+
});
|
|
28
|
+
describe("valid IP literals", () => {
|
|
29
|
+
it("accepts IPv4 literal", () => {
|
|
30
|
+
expect(validateDomain("192.168.1.1", true, false)).toEqual([]);
|
|
31
|
+
});
|
|
32
|
+
it("accepts IPv4 with boundary values", () => {
|
|
33
|
+
expect(validateDomain("0.0.0.0", true, false)).toEqual([]);
|
|
34
|
+
expect(validateDomain("255.255.255.255", true, false)).toEqual([]);
|
|
35
|
+
});
|
|
36
|
+
it("accepts IPv6 literal", () => {
|
|
37
|
+
expect(validateDomain("2001:db8::1", false, true)).toEqual([]);
|
|
38
|
+
});
|
|
39
|
+
it("accepts full IPv6", () => {
|
|
40
|
+
expect(validateDomain("2001:0db8:0000:0000:0000:0000:0000:0001", false, true)).toEqual([]);
|
|
41
|
+
});
|
|
42
|
+
it("accepts IPv6 loopback", () => {
|
|
43
|
+
expect(validateDomain("::1", false, true)).toEqual([]);
|
|
44
|
+
});
|
|
45
|
+
it("accepts IPv6 fe80", () => {
|
|
46
|
+
expect(validateDomain("fe80::1", false, true)).toEqual([]);
|
|
47
|
+
});
|
|
48
|
+
});
|
|
49
|
+
describe("hostname label errors", () => {
|
|
50
|
+
it("rejects label starting with hyphen", () => {
|
|
51
|
+
const errors = validateDomain("example.-domain.com", false, false);
|
|
52
|
+
expect(errors.some((e) => e.code === "ERR_DOMAIN_LABEL_HYPHEN_START")).toBe(true);
|
|
53
|
+
});
|
|
54
|
+
it("rejects label ending with hyphen", () => {
|
|
55
|
+
const errors = validateDomain("example.domain-.com", false, false);
|
|
56
|
+
expect(errors.some((e) => e.code === "ERR_DOMAIN_LABEL_HYPHEN_END")).toBe(true);
|
|
57
|
+
});
|
|
58
|
+
it("rejects empty label (consecutive dots)", () => {
|
|
59
|
+
const errors = validateDomain("example..com", false, false);
|
|
60
|
+
expect(errors.some((e) => e.code === "ERR_DOMAIN_LABEL_EMPTY")).toBe(true);
|
|
61
|
+
});
|
|
62
|
+
it("rejects label exceeding 63 chars", () => {
|
|
63
|
+
const label = "a".repeat(64);
|
|
64
|
+
const errors = validateDomain(`${label}.com`, false, false);
|
|
65
|
+
expect(errors.some((e) => e.code === "ERR_DOMAIN_LABEL_LENGTH")).toBe(true);
|
|
66
|
+
});
|
|
67
|
+
it("rejects invalid char in label", () => {
|
|
68
|
+
const errors = validateDomain("example.c_m.com", false, false);
|
|
69
|
+
expect(errors.some((e) => e.code === "ERR_DOMAIN_INVALID_CHAR")).toBe(true);
|
|
70
|
+
});
|
|
71
|
+
it("rejects domain with no dot", () => {
|
|
72
|
+
const errors = validateDomain("localhost", false, false);
|
|
73
|
+
expect(errors.some((e) => e.code === "ERR_DOMAIN_NO_DOT")).toBe(true);
|
|
74
|
+
});
|
|
75
|
+
it("rejects numeric TLD", () => {
|
|
76
|
+
const errors = validateDomain("example.123", false, false);
|
|
77
|
+
expect(errors.some((e) => e.code === "ERR_DOMAIN_NUMERIC_TLD")).toBe(true);
|
|
78
|
+
});
|
|
79
|
+
});
|
|
80
|
+
describe("length errors", () => {
|
|
81
|
+
it("rejects empty domain", () => {
|
|
82
|
+
const errors = validateDomain("", false, false);
|
|
83
|
+
expect(errors.some((e) => e.code === "ERR_DOMAIN_EMPTY")).toBe(true);
|
|
84
|
+
});
|
|
85
|
+
it("rejects domain exceeding 255 chars", () => {
|
|
86
|
+
const label = "a".repeat(63);
|
|
87
|
+
const domain = `${label}.${label}.${label}.${label}.${label}`;
|
|
88
|
+
// That's ~319 chars, > 255
|
|
89
|
+
const errors = validateDomain(domain, false, false, 255);
|
|
90
|
+
expect(errors.some((e) => e.code === "ERR_DOMAIN_LENGTH")).toBe(true);
|
|
91
|
+
});
|
|
92
|
+
it("accepts with custom max domain length", () => {
|
|
93
|
+
const domain = "a".repeat(10) + ".b";
|
|
94
|
+
const errors = validateDomain(domain, false, false, 100);
|
|
95
|
+
expect(errors.filter((e) => e.code === "ERR_DOMAIN_LENGTH")).toEqual([]);
|
|
96
|
+
});
|
|
97
|
+
});
|
|
98
|
+
describe("IPv4 literal errors", () => {
|
|
99
|
+
it("rejects invalid octet value (>255)", () => {
|
|
100
|
+
const errors = validateDomain("256.1.1.1", true, false);
|
|
101
|
+
expect(errors.some((e) => e.code === "ERR_IPV4_INVALID")).toBe(true);
|
|
102
|
+
});
|
|
103
|
+
it("rejects wrong number of octets", () => {
|
|
104
|
+
const errors = validateDomain("1.2.3", true, false);
|
|
105
|
+
expect(errors.some((e) => e.code === "ERR_IPV4_INVALID")).toBe(true);
|
|
106
|
+
});
|
|
107
|
+
it("rejects non-numeric octet", () => {
|
|
108
|
+
const errors = validateDomain("abc.1.1.1", true, false);
|
|
109
|
+
expect(errors.some((e) => e.code === "ERR_IPV4_INVALID")).toBe(true);
|
|
110
|
+
});
|
|
111
|
+
});
|
|
112
|
+
describe("IPv6 literal errors", () => {
|
|
113
|
+
it("rejects empty IPv6", () => {
|
|
114
|
+
const errors = validateDomain("", false, true);
|
|
115
|
+
// Empty domain is caught by the general empty check, which takes precedence
|
|
116
|
+
expect(errors.some((e) => e.code === "ERR_DOMAIN_EMPTY")).toBe(true);
|
|
117
|
+
});
|
|
118
|
+
it("rejects invalid hex chars", () => {
|
|
119
|
+
const errors = validateDomain("gggg::1", false, true);
|
|
120
|
+
expect(errors.some((e) => e.code === "ERR_IPV6_INVALID")).toBe(true);
|
|
121
|
+
});
|
|
122
|
+
it("rejects too many segments", () => {
|
|
123
|
+
const errors = validateDomain("1:2:3:4:5:6:7:8:9", false, true);
|
|
124
|
+
expect(errors.some((e) => e.code === "ERR_IPV6_INVALID")).toBe(true);
|
|
125
|
+
});
|
|
126
|
+
});
|
|
127
|
+
});
|
|
128
|
+
//# sourceMappingURL=domain.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"domain.test.js","sourceRoot":"","sources":["../../../src/email-validator/__tests__/domain.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,110 @@
|
|
|
1
|
+
import { describe, it, expect } from "vitest";
|
|
2
|
+
import { validateLocalPart } from "../local-part.js";
|
|
3
|
+
describe("validateLocalPart", () => {
|
|
4
|
+
describe("valid dot-atom", () => {
|
|
5
|
+
it("accepts simple alphanumeric", () => {
|
|
6
|
+
expect(validateLocalPart("user")).toEqual([]);
|
|
7
|
+
});
|
|
8
|
+
it("accepts single character", () => {
|
|
9
|
+
expect(validateLocalPart("a")).toEqual([]);
|
|
10
|
+
});
|
|
11
|
+
it("accepts all allowed special characters", () => {
|
|
12
|
+
expect(validateLocalPart("a!#$%&'*+-/=?^_`{|}~z")).toEqual([]);
|
|
13
|
+
});
|
|
14
|
+
it("accepts dot in middle", () => {
|
|
15
|
+
expect(validateLocalPart("first.last")).toEqual([]);
|
|
16
|
+
});
|
|
17
|
+
it("accepts multiple dots", () => {
|
|
18
|
+
expect(validateLocalPart("a.b.c")).toEqual([]);
|
|
19
|
+
});
|
|
20
|
+
it("accepts digits", () => {
|
|
21
|
+
expect(validateLocalPart("user123")).toEqual([]);
|
|
22
|
+
});
|
|
23
|
+
it("accepts plus sign (common alias)", () => {
|
|
24
|
+
expect(validateLocalPart("user+tag")).toEqual([]);
|
|
25
|
+
});
|
|
26
|
+
it("accepts 64-char local part", () => {
|
|
27
|
+
const lp = "a".repeat(64);
|
|
28
|
+
expect(validateLocalPart(lp)).toEqual([]);
|
|
29
|
+
});
|
|
30
|
+
});
|
|
31
|
+
describe("valid quoted strings", () => {
|
|
32
|
+
it("accepts quoted string with spaces", () => {
|
|
33
|
+
expect(validateLocalPart('"hello world"')).toEqual([]);
|
|
34
|
+
});
|
|
35
|
+
it("accepts quoted string with special chars", () => {
|
|
36
|
+
expect(validateLocalPart('"john@doe"')).toEqual([]);
|
|
37
|
+
});
|
|
38
|
+
it("accepts quoted string with escaped chars", () => {
|
|
39
|
+
expect(validateLocalPart('"escaped \\" quote"')).toEqual([]);
|
|
40
|
+
});
|
|
41
|
+
it("accepts empty quoted string", () => {
|
|
42
|
+
expect(validateLocalPart('""')).toEqual([]);
|
|
43
|
+
});
|
|
44
|
+
});
|
|
45
|
+
describe("dot-atom errors", () => {
|
|
46
|
+
it("rejects leading dot", () => {
|
|
47
|
+
const errors = validateLocalPart(".user");
|
|
48
|
+
expect(errors.some((e) => e.code === "ERR_LOCAL_PART_DOT_START")).toBe(true);
|
|
49
|
+
});
|
|
50
|
+
it("rejects trailing dot", () => {
|
|
51
|
+
const errors = validateLocalPart("user.");
|
|
52
|
+
expect(errors.some((e) => e.code === "ERR_LOCAL_PART_DOT_END")).toBe(true);
|
|
53
|
+
});
|
|
54
|
+
it("rejects consecutive dots", () => {
|
|
55
|
+
const errors = validateLocalPart("user..name");
|
|
56
|
+
expect(errors.some((e) => e.code === "ERR_LOCAL_PART_CONSECUTIVE_DOTS")).toBe(true);
|
|
57
|
+
});
|
|
58
|
+
it("rejects invalid char (space)", () => {
|
|
59
|
+
const errors = validateLocalPart("user name");
|
|
60
|
+
expect(errors.some((e) => e.code === "ERR_LOCAL_PART_INVALID_CHAR")).toBe(true);
|
|
61
|
+
});
|
|
62
|
+
it("rejects invalid char (angle bracket)", () => {
|
|
63
|
+
const errors = validateLocalPart("<user>");
|
|
64
|
+
expect(errors.some((e) => e.code === "ERR_LOCAL_PART_INVALID_CHAR")).toBe(true);
|
|
65
|
+
});
|
|
66
|
+
});
|
|
67
|
+
describe("length errors", () => {
|
|
68
|
+
it("rejects empty local part", () => {
|
|
69
|
+
const errors = validateLocalPart("");
|
|
70
|
+
expect(errors.some((e) => e.code === "ERR_LOCAL_PART_EMPTY")).toBe(true);
|
|
71
|
+
});
|
|
72
|
+
it("rejects local part exceeding default 64 chars", () => {
|
|
73
|
+
const lp = "a".repeat(65);
|
|
74
|
+
const errors = validateLocalPart(lp);
|
|
75
|
+
expect(errors.some((e) => e.code === "ERR_LOCAL_PART_LENGTH")).toBe(true);
|
|
76
|
+
});
|
|
77
|
+
it("accepts with custom max length", () => {
|
|
78
|
+
const lp = "a".repeat(10);
|
|
79
|
+
const errors = validateLocalPart(lp, 10);
|
|
80
|
+
expect(errors).toEqual([]);
|
|
81
|
+
});
|
|
82
|
+
it("rejects with custom max length exceeded", () => {
|
|
83
|
+
const lp = "a".repeat(11);
|
|
84
|
+
const errors = validateLocalPart(lp, 10);
|
|
85
|
+
expect(errors.some((e) => e.code === "ERR_LOCAL_PART_LENGTH")).toBe(true);
|
|
86
|
+
});
|
|
87
|
+
});
|
|
88
|
+
describe("quoted string errors", () => {
|
|
89
|
+
it("rejects unbalanced quotes", () => {
|
|
90
|
+
const errors = validateLocalPart('"unbalanced');
|
|
91
|
+
// Falls through to dot-atom validation since it doesn't start+end with quotes
|
|
92
|
+
expect(errors.some((e) => e.code === "ERR_LOCAL_PART_INVALID_CHAR")).toBe(true);
|
|
93
|
+
});
|
|
94
|
+
it("rejects quote in middle of quoted string", () => {
|
|
95
|
+
const errors = validateLocalPart('"hello"world"');
|
|
96
|
+
expect(errors.some((e) => e.code === "ERR_UNBALANCED_QUOTES")).toBe(true);
|
|
97
|
+
});
|
|
98
|
+
});
|
|
99
|
+
describe("edge cases", () => {
|
|
100
|
+
it("multiple errors for dot-only local part", () => {
|
|
101
|
+
const errors = validateLocalPart(".");
|
|
102
|
+
expect(errors.length).toBeGreaterThanOrEqual(1);
|
|
103
|
+
});
|
|
104
|
+
it("multiple errors for double-dot-only", () => {
|
|
105
|
+
const errors = validateLocalPart("..");
|
|
106
|
+
expect(errors.length).toBeGreaterThanOrEqual(1);
|
|
107
|
+
});
|
|
108
|
+
});
|
|
109
|
+
});
|
|
110
|
+
//# sourceMappingURL=local-part.test.js.map
|