@zmice/zc 0.2.5 → 0.2.7
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 +98 -11
- package/dist/cli/__tests__/platform.test.js +215 -2
- package/dist/cli/__tests__/platform.test.js.map +1 -1
- package/dist/cli/__tests__/surface.test.js +52 -0
- package/dist/cli/__tests__/surface.test.js.map +1 -1
- package/dist/cli/__tests__/team.test.d.ts +2 -0
- package/dist/cli/__tests__/team.test.d.ts.map +1 -0
- package/dist/cli/__tests__/team.test.js +29 -0
- package/dist/cli/__tests__/team.test.js.map +1 -0
- package/dist/cli/__tests__/upstream.test.js +4 -0
- package/dist/cli/__tests__/upstream.test.js.map +1 -1
- package/dist/cli/platform.d.ts +11 -3
- package/dist/cli/platform.d.ts.map +1 -1
- package/dist/cli/platform.js +216 -54
- package/dist/cli/platform.js.map +1 -1
- package/dist/cli/team.d.ts.map +1 -1
- package/dist/cli/team.js +114 -4
- package/dist/cli/team.js.map +1 -1
- package/dist/cli/upstream.d.ts +1 -0
- package/dist/cli/upstream.d.ts.map +1 -1
- package/dist/cli/upstream.js +84 -5
- package/dist/cli/upstream.js.map +1 -1
- package/dist/node_modules/@zmice/platform-core/dist/index.d.ts +37 -3
- package/dist/node_modules/@zmice/platform-core/dist/index.d.ts.map +1 -1
- package/dist/node_modules/@zmice/platform-core/dist/index.js +68 -0
- package/dist/node_modules/@zmice/platform-core/dist/index.js.map +1 -1
- package/dist/node_modules/@zmice/platform-core/dist/index.test.js +44 -1
- package/dist/node_modules/@zmice/platform-core/dist/index.test.js.map +1 -1
- package/dist/runtime/__tests__/worktree-manager.test.js +63 -1
- package/dist/runtime/__tests__/worktree-manager.test.js.map +1 -1
- package/dist/runtime/worktree-manager.d.ts +26 -1
- package/dist/runtime/worktree-manager.d.ts.map +1 -1
- package/dist/runtime/worktree-manager.js +126 -12
- package/dist/runtime/worktree-manager.js.map +1 -1
- package/dist/team/__tests__/orchestrator.test.js +40 -0
- package/dist/team/__tests__/orchestrator.test.js.map +1 -1
- package/dist/team/__tests__/planner.test.d.ts +2 -0
- package/dist/team/__tests__/planner.test.d.ts.map +1 -0
- package/dist/team/__tests__/planner.test.js +43 -0
- package/dist/team/__tests__/planner.test.js.map +1 -0
- package/dist/team/__tests__/task-queue.test.js +18 -0
- package/dist/team/__tests__/task-queue.test.js.map +1 -1
- package/dist/team/orchestrator.d.ts +2 -1
- package/dist/team/orchestrator.d.ts.map +1 -1
- package/dist/team/orchestrator.js +29 -10
- package/dist/team/orchestrator.js.map +1 -1
- package/dist/team/planner.d.ts +27 -0
- package/dist/team/planner.d.ts.map +1 -0
- package/dist/team/planner.js +120 -0
- package/dist/team/planner.js.map +1 -0
- package/dist/team/task-queue.d.ts +3 -0
- package/dist/team/task-queue.d.ts.map +1 -1
- package/dist/team/task-queue.js +11 -2
- package/dist/team/task-queue.js.map +1 -1
- package/package.json +2 -2
- package/vendor/node_modules/@zmice/platform-core/dist/index.d.ts +37 -3
- package/vendor/node_modules/@zmice/platform-core/dist/index.d.ts.map +1 -1
- package/vendor/node_modules/@zmice/platform-core/dist/index.js +68 -0
- package/vendor/node_modules/@zmice/platform-core/dist/index.js.map +1 -1
- package/vendor/node_modules/@zmice/platform-core/dist/index.test.js +44 -1
- package/vendor/node_modules/@zmice/platform-core/dist/index.test.js.map +1 -1
- package/vendor/packages/platform-claude/dist/index.d.ts.map +1 -1
- package/vendor/packages/platform-claude/dist/index.js +12 -70
- package/vendor/packages/platform-claude/dist/index.js.map +1 -1
- package/vendor/packages/platform-codex/dist/generate.d.ts +1 -1
- package/vendor/packages/platform-codex/dist/generate.d.ts.map +1 -1
- package/vendor/packages/platform-codex/dist/generate.js +1 -1
- package/vendor/packages/platform-codex/dist/generate.js.map +1 -1
- package/vendor/packages/platform-codex/dist/index.d.ts +15 -1
- package/vendor/packages/platform-codex/dist/index.d.ts.map +1 -1
- package/vendor/packages/platform-codex/dist/index.js +320 -47
- package/vendor/packages/platform-codex/dist/index.js.map +1 -1
- package/vendor/packages/platform-codex/dist/index.test.js +113 -5
- package/vendor/packages/platform-codex/dist/index.test.js.map +1 -1
- package/vendor/packages/platform-opencode/dist/index.d.ts.map +1 -1
- package/vendor/packages/platform-opencode/dist/index.js +15 -81
- package/vendor/packages/platform-opencode/dist/index.js.map +1 -1
- package/vendor/packages/platform-qwen/dist/index.d.ts.map +1 -1
- package/vendor/packages/platform-qwen/dist/index.js +28 -84
- package/vendor/packages/platform-qwen/dist/index.js.map +1 -1
- package/vendor/packages/toolkit/src/content/agents/architect/body.md +8 -0
- package/vendor/packages/toolkit/src/content/agents/code-reviewer/body.md +10 -0
- package/vendor/packages/toolkit/src/content/agents/product-owner/body.md +8 -0
- package/vendor/packages/toolkit/src/content/commands/plan-review/body.md +3 -1
- package/vendor/packages/toolkit/src/content/commands/start/body.md +51 -2
- package/vendor/packages/toolkit/src/content/commands/start/meta.yaml +2 -2
- package/vendor/packages/toolkit/src/content/skills/branch-finish-and-cleanup/body.md +17 -0
- package/vendor/packages/toolkit/src/content/skills/browser-qa-testing/body.md +77 -520
- package/vendor/packages/toolkit/src/content/skills/ci-cd-and-automation/body.md +56 -387
- package/vendor/packages/toolkit/src/content/skills/code-review-and-quality/body.md +10 -0
- package/vendor/packages/toolkit/src/content/skills/code-simplification/body.md +55 -301
- package/vendor/packages/toolkit/src/content/skills/context-engineering/body.md +10 -0
- package/vendor/packages/toolkit/src/content/skills/continuous-learning/body.md +66 -331
- package/vendor/packages/toolkit/src/content/skills/multi-perspective-review/body.md +30 -1
- package/vendor/packages/toolkit/src/content/skills/parallel-agent-dispatch/body.md +79 -317
- package/vendor/packages/toolkit/src/content/skills/performance-optimization/body.md +60 -330
- package/vendor/packages/toolkit/src/content/skills/planning-and-task-breakdown/body.md +35 -0
- package/vendor/packages/toolkit/src/content/skills/sdd-tdd-workflow/body.md +66 -342
- package/vendor/packages/toolkit/src/content/skills/sprint-retrospective/body.md +66 -303
- package/vendor/packages/toolkit/src/content/skills/team-orchestration/body.md +81 -327
- package/vendor/packages/toolkit/src/content/skills/test-driven-development/body.md +50 -346
- package/vendor/packages/toolkit/src/content/skills/using-agent-skills/body.md +26 -2
- package/vendor/references/upstreams.yaml +5 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../src/index.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,MAAM,MAAM,oBAAoB,CAAC;AAExC,OAAO,EACL,kBAAkB,EAClB,sBAAsB,EACtB,uBAAuB,EACvB,iBAAiB,EACjB,sBAAsB,EACtB,mBAAmB,
|
|
1
|
+
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../src/index.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
import { describe, it, expect } from "vitest";
|
|
2
|
-
import {
|
|
2
|
+
import { mkdtemp, mkdir, rm } from "node:fs/promises";
|
|
3
|
+
import { tmpdir } from "node:os";
|
|
4
|
+
import { join } from "node:path";
|
|
5
|
+
import { WorktreeManager, WorktreeSafetyError } from "../worktree-manager.js";
|
|
3
6
|
describe("WorktreeManager", () => {
|
|
4
7
|
it("creates an instance with the expected methods", () => {
|
|
5
8
|
const manager = new WorktreeManager("/tmp/repo");
|
|
@@ -7,5 +10,64 @@ describe("WorktreeManager", () => {
|
|
|
7
10
|
expect(typeof manager.remove).toBe("function");
|
|
8
11
|
expect(typeof manager.list).toBe("function");
|
|
9
12
|
});
|
|
13
|
+
it("prefers .worktrees over worktrees", async () => {
|
|
14
|
+
const repoRoot = await mkdtemp(join(tmpdir(), "zc-worktree-root-"));
|
|
15
|
+
await mkdir(join(repoRoot, ".worktrees"));
|
|
16
|
+
await mkdir(join(repoRoot, "worktrees"));
|
|
17
|
+
const manager = new WorktreeManager(repoRoot, async () => ({ stdout: "", stderr: "" }));
|
|
18
|
+
await expect(manager.resolveWorktreeRoot()).resolves.toBe(join(repoRoot, ".worktrees"));
|
|
19
|
+
await rm(repoRoot, { recursive: true, force: true });
|
|
20
|
+
});
|
|
21
|
+
it("rejects project-local worktree roots that are not ignored", async () => {
|
|
22
|
+
const repoRoot = await mkdtemp(join(tmpdir(), "zc-worktree-root-"));
|
|
23
|
+
const manager = new WorktreeManager(repoRoot, async (file, args) => {
|
|
24
|
+
if (file === "git" && args[0] === "check-ignore") {
|
|
25
|
+
throw new Error("not ignored");
|
|
26
|
+
}
|
|
27
|
+
return { stdout: "", stderr: "" };
|
|
28
|
+
});
|
|
29
|
+
await expect(manager.assertProjectLocalWorktreeIgnored(join(repoRoot, ".worktrees")))
|
|
30
|
+
.rejects
|
|
31
|
+
.toBeInstanceOf(WorktreeSafetyError);
|
|
32
|
+
await rm(repoRoot, { recursive: true, force: true });
|
|
33
|
+
});
|
|
34
|
+
it("checks project-local worktree roots as directories before they exist", async () => {
|
|
35
|
+
const repoRoot = await mkdtemp(join(tmpdir(), "zc-worktree-root-"));
|
|
36
|
+
const checked = [];
|
|
37
|
+
const manager = new WorktreeManager(repoRoot, async (file, args) => {
|
|
38
|
+
if (file === "git" && args[0] === "check-ignore") {
|
|
39
|
+
checked.push(String(args[2]));
|
|
40
|
+
}
|
|
41
|
+
return { stdout: "", stderr: "" };
|
|
42
|
+
});
|
|
43
|
+
await manager.assertProjectLocalWorktreeIgnored(join(repoRoot, ".worktrees"));
|
|
44
|
+
expect(checked).toEqual([".worktrees/"]);
|
|
45
|
+
await rm(repoRoot, { recursive: true, force: true });
|
|
46
|
+
});
|
|
47
|
+
it("reports ahead as unknown for branches without upstream tracking", async () => {
|
|
48
|
+
const repoRoot = await mkdtemp(join(tmpdir(), "zc-worktree-root-"));
|
|
49
|
+
const worktreePath = join(repoRoot, ".worktrees", "team-a-w1");
|
|
50
|
+
const manager = new WorktreeManager(repoRoot, async (file, args) => {
|
|
51
|
+
if (file === "git" && args[0] === "worktree" && args[1] === "list") {
|
|
52
|
+
return {
|
|
53
|
+
stdout: `worktree ${worktreePath}\nHEAD 0000000\nbranch refs/heads/zc/team-a-w1\n`,
|
|
54
|
+
stderr: "",
|
|
55
|
+
};
|
|
56
|
+
}
|
|
57
|
+
if (file === "git" && args[0] === "-C" && args[2] === "branch") {
|
|
58
|
+
return { stdout: "zc/team-a-w1\n", stderr: "" };
|
|
59
|
+
}
|
|
60
|
+
if (file === "git" && args[0] === "-C" && args[2] === "status") {
|
|
61
|
+
return { stdout: "## zc/team-a-w1\n", stderr: "" };
|
|
62
|
+
}
|
|
63
|
+
if (file === "git" && args[0] === "branch" && args[1] === "--merged") {
|
|
64
|
+
return { stdout: "", stderr: "" };
|
|
65
|
+
}
|
|
66
|
+
return { stdout: "", stderr: "" };
|
|
67
|
+
});
|
|
68
|
+
const [status] = await manager.inspectTeam("team-a");
|
|
69
|
+
expect(status?.ahead).toBeNull();
|
|
70
|
+
await rm(repoRoot, { recursive: true, force: true });
|
|
71
|
+
});
|
|
10
72
|
});
|
|
11
73
|
//# sourceMappingURL=worktree-manager.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worktree-manager.test.js","sourceRoot":"","sources":["../../../src/runtime/__tests__/worktree-manager.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"worktree-manager.test.js","sourceRoot":"","sources":["../../../src/runtime/__tests__/worktree-manager.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,29 @@
|
|
|
1
|
+
type ExecFileAsync = (file: string, args: readonly string[], options: {
|
|
2
|
+
cwd: string;
|
|
3
|
+
}) => Promise<{
|
|
4
|
+
stdout: string;
|
|
5
|
+
stderr: string;
|
|
6
|
+
}>;
|
|
1
7
|
export interface WorktreeInfo {
|
|
2
8
|
name: string;
|
|
3
9
|
path: string;
|
|
4
10
|
}
|
|
11
|
+
export interface WorktreeBranchStatus {
|
|
12
|
+
name: string;
|
|
13
|
+
path: string;
|
|
14
|
+
branch: string | null;
|
|
15
|
+
status: "clean" | "dirty" | "unknown";
|
|
16
|
+
ahead: number | null;
|
|
17
|
+
merged: boolean | null;
|
|
18
|
+
}
|
|
19
|
+
export declare class WorktreeSafetyError extends Error {
|
|
20
|
+
readonly directory: string;
|
|
21
|
+
constructor(message: string, directory: string);
|
|
22
|
+
}
|
|
5
23
|
export declare class WorktreeManager {
|
|
6
24
|
private readonly repoRoot;
|
|
7
|
-
|
|
25
|
+
private readonly run;
|
|
26
|
+
constructor(repoRoot: string, run?: ExecFileAsync);
|
|
8
27
|
create(name: string): Promise<string>;
|
|
9
28
|
remove(name: string): Promise<void>;
|
|
10
29
|
list(): Promise<WorktreeInfo[]>;
|
|
@@ -14,5 +33,11 @@ export declare class WorktreeManager {
|
|
|
14
33
|
}>;
|
|
15
34
|
cleanup(name: string): Promise<void>;
|
|
16
35
|
prune(): Promise<void>;
|
|
36
|
+
inspectTeam(name: string): Promise<WorktreeBranchStatus[]>;
|
|
37
|
+
resolveWorktreeRoot(): Promise<string>;
|
|
38
|
+
assertProjectLocalWorktreeIgnored(root: string): Promise<void>;
|
|
39
|
+
private inspect;
|
|
40
|
+
private isMerged;
|
|
17
41
|
}
|
|
42
|
+
export {};
|
|
18
43
|
//# sourceMappingURL=worktree-manager.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worktree-manager.d.ts","sourceRoot":"","sources":["../../src/runtime/worktree-manager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"worktree-manager.d.ts","sourceRoot":"","sources":["../../src/runtime/worktree-manager.ts"],"names":[],"mappings":"AAOA,KAAK,aAAa,GAAG,CACnB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,OAAO,EAAE;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,KACrB,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAEjD,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,MAAM,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS,CAAC;IACtC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,MAAM,EAAE,OAAO,GAAG,IAAI,CAAC;CACxB;AAED,qBAAa,mBAAoB,SAAQ,KAAK;IAG1C,QAAQ,CAAC,SAAS,EAAE,MAAM;gBAD1B,OAAO,EAAE,MAAM,EACN,SAAS,EAAE,MAAM;CAK7B;AAED,qBAAa,eAAe;IAExB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,GAAG;gBADH,QAAQ,EAAE,MAAM,EAChB,GAAG,GAAE,aAA8C;IAGhE,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAYrC,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYnC,IAAI,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IAiB/B,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAItE,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAapC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAUtB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAM1D,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC;IActC,iCAAiC,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAmBtD,OAAO;YA+BP,QAAQ;CAWvB"}
|
|
@@ -1,22 +1,38 @@
|
|
|
1
1
|
import { execFile } from "node:child_process";
|
|
2
|
+
import { access, mkdir } from "node:fs/promises";
|
|
3
|
+
import { join, relative } from "node:path";
|
|
2
4
|
import { promisify } from "node:util";
|
|
3
5
|
const execFileAsync = promisify(execFile);
|
|
6
|
+
export class WorktreeSafetyError extends Error {
|
|
7
|
+
directory;
|
|
8
|
+
constructor(message, directory) {
|
|
9
|
+
super(message);
|
|
10
|
+
this.directory = directory;
|
|
11
|
+
this.name = "WorktreeSafetyError";
|
|
12
|
+
}
|
|
13
|
+
}
|
|
4
14
|
export class WorktreeManager {
|
|
5
15
|
repoRoot;
|
|
6
|
-
|
|
16
|
+
run;
|
|
17
|
+
constructor(repoRoot, run = execFileAsync) {
|
|
7
18
|
this.repoRoot = repoRoot;
|
|
19
|
+
this.run = run;
|
|
8
20
|
}
|
|
9
21
|
async create(name) {
|
|
10
|
-
const
|
|
11
|
-
await
|
|
22
|
+
const root = await this.resolveWorktreeRoot();
|
|
23
|
+
await this.assertProjectLocalWorktreeIgnored(root);
|
|
24
|
+
await mkdir(root, { recursive: true });
|
|
25
|
+
const path = join(root, name);
|
|
26
|
+
await this.run("git", ["worktree", "add", path, "-b", `zc/${name}`], {
|
|
12
27
|
cwd: this.repoRoot,
|
|
13
28
|
});
|
|
14
29
|
return path;
|
|
15
30
|
}
|
|
16
31
|
async remove(name) {
|
|
17
|
-
const
|
|
32
|
+
const root = await this.resolveWorktreeRoot();
|
|
33
|
+
const path = join(root, name);
|
|
18
34
|
try {
|
|
19
|
-
await
|
|
35
|
+
await this.run("git", ["worktree", "remove", "--force", path], {
|
|
20
36
|
cwd: this.repoRoot,
|
|
21
37
|
});
|
|
22
38
|
}
|
|
@@ -25,15 +41,16 @@ export class WorktreeManager {
|
|
|
25
41
|
}
|
|
26
42
|
}
|
|
27
43
|
async list() {
|
|
28
|
-
const { stdout } = await
|
|
44
|
+
const { stdout } = await this.run("git", ["worktree", "list", "--porcelain"], {
|
|
29
45
|
cwd: this.repoRoot,
|
|
30
46
|
});
|
|
31
|
-
const lines = stdout.trim().split("\n");
|
|
47
|
+
const lines = stdout.trim().split("\n").filter(Boolean);
|
|
32
48
|
const worktrees = [];
|
|
33
|
-
for (
|
|
34
|
-
|
|
35
|
-
if (!path)
|
|
49
|
+
for (const line of lines) {
|
|
50
|
+
if (!line.startsWith("worktree ")) {
|
|
36
51
|
continue;
|
|
52
|
+
}
|
|
53
|
+
const path = line.replace(/^worktree /, "");
|
|
37
54
|
const name = path.split("/").pop() ?? path;
|
|
38
55
|
worktrees.push({ name, path });
|
|
39
56
|
}
|
|
@@ -43,11 +60,19 @@ export class WorktreeManager {
|
|
|
43
60
|
return { success: true, message: "" };
|
|
44
61
|
}
|
|
45
62
|
async cleanup(name) {
|
|
46
|
-
await this.
|
|
63
|
+
const worktrees = await this.list().catch(() => []);
|
|
64
|
+
const teamWorktrees = worktrees.filter((worktree) => worktree.name.startsWith(`${name}-`));
|
|
65
|
+
if (teamWorktrees.length === 0) {
|
|
66
|
+
await this.remove(name);
|
|
67
|
+
return;
|
|
68
|
+
}
|
|
69
|
+
for (const worktree of teamWorktrees) {
|
|
70
|
+
await this.remove(worktree.name);
|
|
71
|
+
}
|
|
47
72
|
}
|
|
48
73
|
async prune() {
|
|
49
74
|
try {
|
|
50
|
-
await
|
|
75
|
+
await this.run("git", ["worktree", "prune"], {
|
|
51
76
|
cwd: this.repoRoot,
|
|
52
77
|
});
|
|
53
78
|
}
|
|
@@ -55,5 +80,94 @@ export class WorktreeManager {
|
|
|
55
80
|
// ignore
|
|
56
81
|
}
|
|
57
82
|
}
|
|
83
|
+
async inspectTeam(name) {
|
|
84
|
+
const worktrees = await this.list().catch(() => []);
|
|
85
|
+
const teamWorktrees = worktrees.filter((worktree) => worktree.name.startsWith(`${name}-`));
|
|
86
|
+
return Promise.all(teamWorktrees.map((worktree) => this.inspect(worktree)));
|
|
87
|
+
}
|
|
88
|
+
async resolveWorktreeRoot() {
|
|
89
|
+
const preferred = join(this.repoRoot, ".worktrees");
|
|
90
|
+
if (await pathExists(preferred)) {
|
|
91
|
+
return preferred;
|
|
92
|
+
}
|
|
93
|
+
const fallback = join(this.repoRoot, "worktrees");
|
|
94
|
+
if (await pathExists(fallback)) {
|
|
95
|
+
return fallback;
|
|
96
|
+
}
|
|
97
|
+
return preferred;
|
|
98
|
+
}
|
|
99
|
+
async assertProjectLocalWorktreeIgnored(root) {
|
|
100
|
+
const relativeRoot = relative(this.repoRoot, root) || ".";
|
|
101
|
+
if (relativeRoot.startsWith("..")) {
|
|
102
|
+
return;
|
|
103
|
+
}
|
|
104
|
+
const ignoreProbe = relativeRoot.endsWith("/") ? relativeRoot : `${relativeRoot}/`;
|
|
105
|
+
try {
|
|
106
|
+
await this.run("git", ["check-ignore", "-q", ignoreProbe], {
|
|
107
|
+
cwd: this.repoRoot,
|
|
108
|
+
});
|
|
109
|
+
}
|
|
110
|
+
catch {
|
|
111
|
+
throw new WorktreeSafetyError(`Worktree directory "${relativeRoot}" is not ignored. Add "${relativeRoot}/" to .gitignore before starting team worktrees.`, relativeRoot);
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
async inspect(worktree) {
|
|
115
|
+
try {
|
|
116
|
+
const [{ stdout: branchStdout }, { stdout: statusStdout }] = await Promise.all([
|
|
117
|
+
this.run("git", ["-C", worktree.path, "branch", "--show-current"], { cwd: this.repoRoot }),
|
|
118
|
+
this.run("git", ["-C", worktree.path, "status", "--porcelain", "--branch"], { cwd: this.repoRoot }),
|
|
119
|
+
]);
|
|
120
|
+
const branch = branchStdout.trim() || null;
|
|
121
|
+
const statusLines = statusStdout.trim().split("\n").filter(Boolean);
|
|
122
|
+
const dirty = statusLines.some((line) => !line.startsWith("## "));
|
|
123
|
+
const header = statusLines.find((line) => line.startsWith("## ")) ?? "";
|
|
124
|
+
const ahead = parseAhead(header);
|
|
125
|
+
const merged = branch ? await this.isMerged(branch) : null;
|
|
126
|
+
return {
|
|
127
|
+
...worktree,
|
|
128
|
+
branch,
|
|
129
|
+
status: dirty ? "dirty" : "clean",
|
|
130
|
+
ahead,
|
|
131
|
+
merged,
|
|
132
|
+
};
|
|
133
|
+
}
|
|
134
|
+
catch {
|
|
135
|
+
return {
|
|
136
|
+
...worktree,
|
|
137
|
+
branch: null,
|
|
138
|
+
status: "unknown",
|
|
139
|
+
ahead: null,
|
|
140
|
+
merged: null,
|
|
141
|
+
};
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
async isMerged(branch) {
|
|
145
|
+
try {
|
|
146
|
+
const { stdout } = await this.run("git", ["branch", "--merged"], { cwd: this.repoRoot });
|
|
147
|
+
return stdout
|
|
148
|
+
.split("\n")
|
|
149
|
+
.map((line) => line.replace(/^\*\s*/, "").trim())
|
|
150
|
+
.includes(branch);
|
|
151
|
+
}
|
|
152
|
+
catch {
|
|
153
|
+
return null;
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
async function pathExists(path) {
|
|
158
|
+
try {
|
|
159
|
+
await access(path);
|
|
160
|
+
return true;
|
|
161
|
+
}
|
|
162
|
+
catch {
|
|
163
|
+
return false;
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
function parseAhead(header) {
|
|
167
|
+
if (!header.includes("...")) {
|
|
168
|
+
return null;
|
|
169
|
+
}
|
|
170
|
+
const match = /ahead (\d+)/.exec(header);
|
|
171
|
+
return match ? Number.parseInt(match[1] ?? "0", 10) : 0;
|
|
58
172
|
}
|
|
59
173
|
//# sourceMappingURL=worktree-manager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worktree-manager.js","sourceRoot":"","sources":["../../src/runtime/worktree-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"worktree-manager.js","sourceRoot":"","sources":["../../src/runtime/worktree-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,26 @@ import { describe, it, expect } from "vitest";
|
|
|
2
2
|
import { Orchestrator } from "../orchestrator.js";
|
|
3
3
|
import { SessionManager } from "../../runtime/session-manager.js";
|
|
4
4
|
import { WorktreeManager } from "../../runtime/worktree-manager.js";
|
|
5
|
+
class FakeSessionManager extends SessionManager {
|
|
6
|
+
sent = [];
|
|
7
|
+
async createSession(name) {
|
|
8
|
+
return name;
|
|
9
|
+
}
|
|
10
|
+
async createPane(sessionName) {
|
|
11
|
+
return `${sessionName}:1`;
|
|
12
|
+
}
|
|
13
|
+
async sendKeys(_paneId, keys) {
|
|
14
|
+
this.sent.push(keys);
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
class FakeWorktreeManager extends WorktreeManager {
|
|
18
|
+
constructor() {
|
|
19
|
+
super("/tmp/repo");
|
|
20
|
+
}
|
|
21
|
+
async create(name) {
|
|
22
|
+
return `/tmp/repo/.worktrees/${name}`;
|
|
23
|
+
}
|
|
24
|
+
}
|
|
5
25
|
describe("Orchestrator", () => {
|
|
6
26
|
it("creates an instance with the expected public API", () => {
|
|
7
27
|
const orch = new Orchestrator("/tmp/state", new SessionManager(), new WorktreeManager("/tmp/repo"));
|
|
@@ -9,5 +29,25 @@ describe("Orchestrator", () => {
|
|
|
9
29
|
expect(typeof orch.dispatchOnce).toBe("function");
|
|
10
30
|
expect(typeof orch.shutdown).toBe("function");
|
|
11
31
|
});
|
|
32
|
+
it("injects explicit task skills into dispatched worker prompts", async () => {
|
|
33
|
+
const session = new FakeSessionManager();
|
|
34
|
+
const stateDir = `/tmp/zc-orchestrator-${Date.now()}`;
|
|
35
|
+
const orch = new Orchestrator(stateDir, session, new FakeWorktreeManager());
|
|
36
|
+
await orch.startTeam({
|
|
37
|
+
name: "team-skills",
|
|
38
|
+
workers: [{ id: "w1", cli: "codex" }],
|
|
39
|
+
tasks: [{
|
|
40
|
+
id: "task-1",
|
|
41
|
+
title: "Implement API",
|
|
42
|
+
description: "Implement API",
|
|
43
|
+
files: ["src/api.ts"],
|
|
44
|
+
dependencies: [],
|
|
45
|
+
skills: ["zc-build"],
|
|
46
|
+
mode: "parallel",
|
|
47
|
+
}],
|
|
48
|
+
});
|
|
49
|
+
await orch.dispatchOnce();
|
|
50
|
+
expect(session.sent.at(-1)).toContain("# Skill: zc-build");
|
|
51
|
+
});
|
|
12
52
|
});
|
|
13
53
|
//# sourceMappingURL=orchestrator.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orchestrator.test.js","sourceRoot":"","sources":["../../../src/team/__tests__/orchestrator.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAEpE,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;QAC1D,MAAM,IAAI,GAAG,IAAI,YAAY,CAAC,YAAY,EAAE,IAAI,cAAc,EAAE,EAAE,IAAI,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC;QACpG,MAAM,CAAC,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC/C,MAAM,CAAC,OAAO,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAClD,MAAM,CAAC,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"orchestrator.test.js","sourceRoot":"","sources":["../../../src/team/__tests__/orchestrator.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAEpE,MAAM,kBAAmB,SAAQ,cAAc;IAC7C,IAAI,GAAa,EAAE,CAAC;IAEX,KAAK,CAAC,aAAa,CAAC,IAAY;QACvC,OAAO,IAAI,CAAC;IACd,CAAC;IAEQ,KAAK,CAAC,UAAU,CAAC,WAAmB;QAC3C,OAAO,GAAG,WAAW,IAAI,CAAC;IAC5B,CAAC;IAEQ,KAAK,CAAC,QAAQ,CAAC,OAAe,EAAE,IAAY;QACnD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC;CACF;AAED,MAAM,mBAAoB,SAAQ,eAAe;IAC/C;QACE,KAAK,CAAC,WAAW,CAAC,CAAC;IACrB,CAAC;IAEQ,KAAK,CAAC,MAAM,CAAC,IAAY;QAChC,OAAO,wBAAwB,IAAI,EAAE,CAAC;IACxC,CAAC;CACF;AAED,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;QAC1D,MAAM,IAAI,GAAG,IAAI,YAAY,CAAC,YAAY,EAAE,IAAI,cAAc,EAAE,EAAE,IAAI,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC;QACpG,MAAM,CAAC,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC/C,MAAM,CAAC,OAAO,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAClD,MAAM,CAAC,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6DAA6D,EAAE,KAAK,IAAI,EAAE;QAC3E,MAAM,OAAO,GAAG,IAAI,kBAAkB,EAAE,CAAC;QACzC,MAAM,QAAQ,GAAG,wBAAwB,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;QACtD,MAAM,IAAI,GAAG,IAAI,YAAY,CAAC,QAAQ,EAAE,OAAO,EAAE,IAAI,mBAAmB,EAAE,CAAC,CAAC;QAE5E,MAAM,IAAI,CAAC,SAAS,CAAC;YACnB,IAAI,EAAE,aAAa;YACnB,OAAO,EAAE,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC;YACrC,KAAK,EAAE,CAAC;oBACN,EAAE,EAAE,QAAQ;oBACZ,KAAK,EAAE,eAAe;oBACtB,WAAW,EAAE,eAAe;oBAC5B,KAAK,EAAE,CAAC,YAAY,CAAC;oBACrB,YAAY,EAAE,EAAE;oBAChB,MAAM,EAAE,CAAC,UAAU,CAAC;oBACpB,IAAI,EAAE,UAAU;iBACjB,CAAC;SACH,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAE1B,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"planner.test.d.ts","sourceRoot":"","sources":["../../../src/team/__tests__/planner.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import { describe, expect, it } from "vitest";
|
|
2
|
+
import { createTeamPlan, parseTeamTaskDescriptors } from "../planner.js";
|
|
3
|
+
describe("team planner", () => {
|
|
4
|
+
it("detects file conflicts and blocks unsafe parallel starts", () => {
|
|
5
|
+
const tasks = parseTeamTaskDescriptors([
|
|
6
|
+
"API work | files=src/api.ts,src/shared.ts",
|
|
7
|
+
"UI work | files=src/shared.ts,src/ui.ts",
|
|
8
|
+
]);
|
|
9
|
+
const plan = createTeamPlan(tasks, 2);
|
|
10
|
+
expect(plan.canStart).toBe(false);
|
|
11
|
+
expect(plan.blockers).toContain("file-conflicts");
|
|
12
|
+
expect(plan.conflicts).toEqual([
|
|
13
|
+
{ file: "src/shared.ts", tasks: ["task-1", "task-2"] },
|
|
14
|
+
]);
|
|
15
|
+
});
|
|
16
|
+
it("builds dependency batches and blocks blind parallel dependency starts", () => {
|
|
17
|
+
const tasks = parseTeamTaskDescriptors([
|
|
18
|
+
"Schema | files=src/schema.ts",
|
|
19
|
+
"API | files=src/api.ts | deps=task-1",
|
|
20
|
+
]);
|
|
21
|
+
const plan = createTeamPlan(tasks, 2);
|
|
22
|
+
expect(plan.canStart).toBe(false);
|
|
23
|
+
expect(plan.blockers).toContain("dependencies-present");
|
|
24
|
+
expect(plan.batches).toEqual([["task-1"], ["task-2"]]);
|
|
25
|
+
});
|
|
26
|
+
it("allows scoped independent tasks", () => {
|
|
27
|
+
const tasks = parseTeamTaskDescriptors([
|
|
28
|
+
"API | files=src/api.ts",
|
|
29
|
+
"UI | files=src/ui.ts",
|
|
30
|
+
]);
|
|
31
|
+
const plan = createTeamPlan(tasks, 2);
|
|
32
|
+
expect(plan.canStart).toBe(true);
|
|
33
|
+
expect(plan.recommendedWorkers).toBe(2);
|
|
34
|
+
});
|
|
35
|
+
it("marks team runtime as requiring worktree isolation even for one task", () => {
|
|
36
|
+
const tasks = parseTeamTaskDescriptors([
|
|
37
|
+
"Docs | files=docs/usage-guide.md",
|
|
38
|
+
]);
|
|
39
|
+
const plan = createTeamPlan(tasks, 1);
|
|
40
|
+
expect(plan.requiresWorktree).toBe(true);
|
|
41
|
+
});
|
|
42
|
+
});
|
|
43
|
+
//# sourceMappingURL=planner.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"planner.test.js","sourceRoot":"","sources":["../../../src/team/__tests__/planner.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAEzE,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,EAAE,CAAC,0DAA0D,EAAE,GAAG,EAAE;QAClE,MAAM,KAAK,GAAG,wBAAwB,CAAC;YACrC,2CAA2C;YAC3C,yCAAyC;SAC1C,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG,cAAc,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAEtC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAClC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;QAClD,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC;YAC7B,EAAE,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE;SACvD,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uEAAuE,EAAE,GAAG,EAAE;QAC/E,MAAM,KAAK,GAAG,wBAAwB,CAAC;YACrC,8BAA8B;YAC9B,sCAAsC;SACvC,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG,cAAc,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAEtC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAClC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC;QACxD,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iCAAiC,EAAE,GAAG,EAAE;QACzC,MAAM,KAAK,GAAG,wBAAwB,CAAC;YACrC,wBAAwB;YACxB,sBAAsB;SACvB,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG,cAAc,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAEtC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sEAAsE,EAAE,GAAG,EAAE;QAC9E,MAAM,KAAK,GAAG,wBAAwB,CAAC;YACrC,kCAAkC;SACnC,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG,cAAc,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAEtC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -24,5 +24,23 @@ describe("TaskQueue", () => {
|
|
|
24
24
|
expect(task.status).toBe("pending");
|
|
25
25
|
expect(queue.list()).toHaveLength(1);
|
|
26
26
|
});
|
|
27
|
+
it("only returns dependency-ready pending tasks", async () => {
|
|
28
|
+
const first = await queue.create({
|
|
29
|
+
title: "Schema",
|
|
30
|
+
description: "schema",
|
|
31
|
+
dependencies: [],
|
|
32
|
+
files: ["src/schema.ts"],
|
|
33
|
+
});
|
|
34
|
+
const second = await queue.create({
|
|
35
|
+
title: "API",
|
|
36
|
+
description: "api",
|
|
37
|
+
dependencies: [first.id],
|
|
38
|
+
files: ["src/api.ts"],
|
|
39
|
+
});
|
|
40
|
+
expect(queue.getReady().map((task) => task.id)).toEqual([first.id]);
|
|
41
|
+
const { token } = await queue.claim(first.id, "w1");
|
|
42
|
+
await queue.transition(first.id, token, "completed");
|
|
43
|
+
expect(queue.getReady().map((task) => task.id)).toEqual([second.id]);
|
|
44
|
+
});
|
|
27
45
|
});
|
|
28
46
|
//# sourceMappingURL=task-queue.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-queue.test.js","sourceRoot":"","sources":["../../../src/team/__tests__/task-queue.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACrE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACzB,IAAI,OAAe,CAAC;IACpB,IAAI,KAAgB,CAAC;IAErB,UAAU,CAAC,KAAK,IAAI,EAAE;QACpB,OAAO,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,eAAe,CAAC,CAAC,CAAC;QACzD,KAAK,GAAG,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC;QAC/B,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,KAAK,IAAI,EAAE;QACnB,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IACtE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,eAAe,EAAE,KAAK,IAAI,EAAE;QAC7B,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC;YAC9B,KAAK,EAAE,UAAU;YACjB,WAAW,EAAE,MAAM;YACnB,YAAY,EAAE,EAAE;YAChB,KAAK,EAAE,EAAE;SACV,CAAC,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACpC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"task-queue.test.js","sourceRoot":"","sources":["../../../src/team/__tests__/task-queue.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACrE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACzB,IAAI,OAAe,CAAC;IACpB,IAAI,KAAgB,CAAC;IAErB,UAAU,CAAC,KAAK,IAAI,EAAE;QACpB,OAAO,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,eAAe,CAAC,CAAC,CAAC;QACzD,KAAK,GAAG,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC;QAC/B,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,KAAK,IAAI,EAAE;QACnB,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IACtE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,eAAe,EAAE,KAAK,IAAI,EAAE;QAC7B,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC;YAC9B,KAAK,EAAE,UAAU;YACjB,WAAW,EAAE,MAAM;YACnB,YAAY,EAAE,EAAE;YAChB,KAAK,EAAE,EAAE;SACV,CAAC,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACpC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;QAC3D,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC;YAC/B,KAAK,EAAE,QAAQ;YACf,WAAW,EAAE,QAAQ;YACrB,YAAY,EAAE,EAAE;YAChB,KAAK,EAAE,CAAC,eAAe,CAAC;SACzB,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC;YAChC,KAAK,EAAE,KAAK;YACZ,WAAW,EAAE,KAAK;YAClB,YAAY,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC;YACxB,KAAK,EAAE,CAAC,YAAY,CAAC;SACtB,CAAC,CAAC;QAEH,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;QAEpE,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QACpD,MAAM,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;QAErD,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;IACvE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -3,13 +3,14 @@ import { Mailbox } from "./mailbox.js";
|
|
|
3
3
|
import { WorkerManager, type WorkerInfo } from "./worker-manager.js";
|
|
4
4
|
import type { SessionManager } from "../runtime/session-manager.js";
|
|
5
5
|
import type { WorktreeManager } from "../runtime/worktree-manager.js";
|
|
6
|
+
import type { TeamTaskSpec } from "./planner.js";
|
|
6
7
|
export interface TeamSpec {
|
|
7
8
|
name: string;
|
|
8
9
|
workers: Array<{
|
|
9
10
|
id: string;
|
|
10
11
|
cli: string;
|
|
11
12
|
}>;
|
|
12
|
-
tasks:
|
|
13
|
+
tasks: TeamTaskSpec[];
|
|
13
14
|
model?: string;
|
|
14
15
|
skills?: string[];
|
|
15
16
|
skillMatchMode?: "keyword" | "ai";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["../../src/team/orchestrator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAa,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,KAAK,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAErE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["../../src/team/orchestrator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAa,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,KAAK,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAErE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAStE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEjD,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,KAAK,CAAC;QACb,EAAE,EAAE,MAAM,CAAC;QACX,GAAG,EAAE,MAAM,CAAC;KACb,CAAC,CAAC;IACH,KAAK,EAAE,YAAY,EAAE,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,cAAc,CAAC,EAAE,SAAS,GAAG,IAAI,CAAC;CACnC;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,UAAU,EAAE,CAAC;IACtB,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAC1E,QAAQ,EAAE,MAAM,CAAC;CAClB;AAID,qBAAa,YAAY;IAiBrB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAlBlC,OAAO,CAAC,SAAS,CAAa;IAC9B,OAAO,CAAC,OAAO,CAAW;IAC1B,OAAO,CAAC,aAAa,CAAiB;IACtC,OAAO,CAAC,QAAQ,CAAM;IACtB,OAAO,CAAC,KAAK,CAAC,CAAS;IACvB,OAAO,CAAC,OAAO,CAAS;IAExB,+CAA+C;IAC/C,OAAO,CAAC,eAAe,CAAmB;IAE1C,OAAO,CAAC,YAAY,CAA2C;IAE/D,8DAA8D;IAC9D,OAAO,CAAC,iBAAiB,CAAwD;gBAG9D,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,cAAc,EAC9B,eAAe,EAAE,eAAe;IAK7C,SAAS,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAgE9C;;OAEG;IACG,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IA6CnC;;OAEG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAOhC,SAAS,IAAI,OAAO,CAAC,UAAU,CAAC;IAkBhC,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAmB/B,gBAAgB,IAAI,aAAa;IAIjC,UAAU,IAAI,OAAO;IAIrB,YAAY,IAAI,SAAS;YAMX,iBAAiB;YAgCjB,gBAAgB;YAgBhB,YAAY;YAKZ,KAAK;CAGpB"}
|
|
@@ -3,7 +3,7 @@ import { TaskQueue } from "./task-queue.js";
|
|
|
3
3
|
import { Mailbox } from "./mailbox.js";
|
|
4
4
|
import { WorkerManager } from "./worker-manager.js";
|
|
5
5
|
import { writeJson } from "../runtime/state.js";
|
|
6
|
-
import { discoverSkills,
|
|
6
|
+
import { discoverSkills, KeywordSkillMatcher, AISkillMatcher, } from "../utils/skill-loader.js";
|
|
7
7
|
import { getAdapter } from "../adapters/types.js";
|
|
8
8
|
const DISPATCH_INTERVAL_MS = 3000;
|
|
9
9
|
export class Orchestrator {
|
|
@@ -42,13 +42,14 @@ export class Orchestrator {
|
|
|
42
42
|
// 3. Create tmux session for team
|
|
43
43
|
await this.sessionManager.createSession(`zc-${spec.name}`);
|
|
44
44
|
// 4. Create tasks
|
|
45
|
-
for (const
|
|
45
|
+
for (const task of spec.tasks) {
|
|
46
46
|
await this.taskQueue.create({
|
|
47
|
-
title:
|
|
48
|
-
description:
|
|
49
|
-
dependencies:
|
|
50
|
-
files:
|
|
51
|
-
skills: spec.skills,
|
|
47
|
+
title: task.title,
|
|
48
|
+
description: task.description,
|
|
49
|
+
dependencies: task.dependencies,
|
|
50
|
+
files: task.files,
|
|
51
|
+
skills: task.skills && task.skills.length > 0 ? task.skills : spec.skills,
|
|
52
|
+
mode: task.mode,
|
|
52
53
|
});
|
|
53
54
|
}
|
|
54
55
|
// 5. Discover available skills for context injection
|
|
@@ -190,11 +191,16 @@ export class Orchestrator {
|
|
|
190
191
|
}
|
|
191
192
|
}
|
|
192
193
|
async enrichWithSkills(task) {
|
|
193
|
-
const
|
|
194
|
-
|
|
194
|
+
const explicitSkills = task.skills ?? [];
|
|
195
|
+
const matched = await Promise.resolve(this.skillMatcher.match(task.description, this.availableSkills));
|
|
196
|
+
const skillNames = uniqueStrings([
|
|
197
|
+
...explicitSkills,
|
|
198
|
+
...matched.map((skill) => skill.name),
|
|
199
|
+
]);
|
|
200
|
+
if (skillNames.length === 0) {
|
|
195
201
|
return task.description;
|
|
196
202
|
}
|
|
197
|
-
const skillBlock =
|
|
203
|
+
const skillBlock = skillNames.map((skill) => `# Skill: ${skill}`).join("\n");
|
|
198
204
|
return `${task.description}\n\n${skillBlock}`;
|
|
199
205
|
}
|
|
200
206
|
async persistState() {
|
|
@@ -205,4 +211,17 @@ export class Orchestrator {
|
|
|
205
211
|
await new Promise((resolve) => setTimeout(resolve, ms));
|
|
206
212
|
}
|
|
207
213
|
}
|
|
214
|
+
function uniqueStrings(values) {
|
|
215
|
+
const seen = new Set();
|
|
216
|
+
const result = [];
|
|
217
|
+
for (const value of values) {
|
|
218
|
+
const trimmed = value.trim();
|
|
219
|
+
if (!trimmed || seen.has(trimmed)) {
|
|
220
|
+
continue;
|
|
221
|
+
}
|
|
222
|
+
seen.add(trimmed);
|
|
223
|
+
result.push(trimmed);
|
|
224
|
+
}
|
|
225
|
+
return result;
|
|
226
|
+
}
|
|
208
227
|
//# sourceMappingURL=orchestrator.js.map
|