mcp-codex-subagent 2.0.9 → 2.0.11

package/dist/wave/git.js

@@ -0,0 +1,227 @@
+/**
+ * Git operations for wave sub-agent groups.
+ *
+ * All commands use executeCommand() from src/utils/command.ts.
+ * No direct child_process usage.
+ */
+import { existsSync, mkdirSync } from 'fs';
+import { join } from 'path';
+import { executeCommand } from '../utils/command.js';
+// Directory existence cache (same pattern as output-file.ts)
+const knownDirs = new Set();
+// ---------------------------------------------------------------------------
+// Git command helper
+// ---------------------------------------------------------------------------
+async function git(cwd, args) {
+    return executeCommand('git', ['-C', cwd, ...args]);
+}
+// ---------------------------------------------------------------------------
+// Worktree operations
+// ---------------------------------------------------------------------------
+/**
+ * Ensure the .worktree root directory exists.
+ */
+export function ensureWorktreeRoot(baseCwd) {
+    const root = join(baseCwd, '.worktree');
+    if (knownDirs.has(root))
+        return;
+    try {
+        mkdirSync(root, { recursive: true });
+        knownDirs.add(root);
+    }
+    catch {
+        // Best-effort
+    }
+}
+/**
+ * Create a Git worktree with a new branch.
+ *
+ * @param baseCwd - The repository root
+ * @param groupId - Group identifier (used for branch name)
+ * @param groupName - Group alias (used for directory name)
+ * @param baseCommit - The commit SHA to base the new branch on
+ * @returns The absolute path to the created worktree
+ */
+export async function createWorktree(baseCwd, groupId, groupName, baseCommit) {
+    ensureWorktreeRoot(baseCwd);
+    const worktreePath = join(baseCwd, '.worktree', `${groupId}-${groupName}`);
+    const branchName = `sub-agent/${groupId}`;
+    // Check if branch already exists
+    try {
+        const { stdout } = await git(baseCwd, ['branch', '--list', branchName]);
+        if (stdout.trim()) {
+            throw new Error(`Branch "${branchName}" already exists. ` +
+                'Use append mode to reuse an existing group.');
+        }
+    }
+    catch (err) {
+        if (err instanceof Error && err.message.includes('already exists')) {
+            throw err;
+        }
+        // git branch --list may fail if not in a repo; re-throw
+        throw new Error(`Failed to check for existing branch: ${err instanceof Error ? err.message : String(err)}`);
+    }
+    // Create worktree
+    try {
+        await git(baseCwd, [
+            'worktree',
+            'add',
+            worktreePath,
+            '-b',
+            branchName,
+            baseCommit,
+        ]);
+    }
+    catch (err) {
+        throw new Error(`Failed to create worktree at ${worktreePath}: ${err instanceof Error ? err.message : String(err)}`);
+    }
+    return worktreePath;
+}
+/**
+ * Check if a worktree directory exists on disk.
+ */
+export function worktreeExists(baseCwd, groupId, groupName) {
+    const worktreePath = join(baseCwd, '.worktree', `${groupId}-${groupName}`);
+    return existsSync(worktreePath);
+}
+// ---------------------------------------------------------------------------
+// Base commit resolution
+// ---------------------------------------------------------------------------
+/**
+ * Resolve the base commit for a new group.
+ *
+ * Rules:
+ * 1. No dependencies: use HEAD of the current branch
+ * 2. Single dependency: use HEAD of the dep's branch
+ * 3. Multiple dependencies: validate linear ancestry, use most recent
+ *
+ * @param baseCwd - The repository root
+ * @param dependsOn - Array of dependency group IDs
+ * @param depBranches - Map from group ID to branch name
+ */
+export async function resolveBaseCommit(baseCwd, dependsOn, depBranches) {
+    if (dependsOn.length === 0) {
+        return getHead(baseCwd);
+    }
+    if (!depBranches || depBranches.size === 0) {
+        throw new Error('dependsOn specified but no dependency branches provided');
+    }
+    // Resolve branch heads
+    const branchTips = [];
+    for (const depId of dependsOn) {
+        const branch = depBranches.get(depId);
+        if (!branch) {
+            throw new Error(`Dependency group "${depId}" has no associated branch`);
+        }
+        const sha = await getBranchHead(baseCwd, branch);
+        branchTips.push({ groupId: depId, branch, sha });
+    }
+    if (branchTips.length === 1) {
+        return branchTips[0].sha;
+    }
+    // Multiple dependencies: validate linear ancestry
+    await validateLinearAncestry(baseCwd, branchTips.map((t) => t.sha));
+    // Return the most recent tip (the one that is an ancestor of none)
+    // With linear ancestry, the "newest" is the one that has all others as ancestors
+    for (const candidate of branchTips) {
+        const isNewest = await isAncestorOfAll(baseCwd, branchTips.filter((t) => t.sha !== candidate.sha).map((t) => t.sha), candidate.sha);
+        if (isNewest)
+            return candidate.sha;
+    }
+    // Fallback: use the last one
+    return branchTips[branchTips.length - 1].sha;
+}
+/**
+ * Validate that all given commit SHAs form a linear ancestry chain.
+ * Throws if any pair is not an ancestor relationship.
+ */
+export async function validateLinearAncestry(baseCwd, shas) {
+    if (shas.length <= 1)
+        return;
+    // Check each pair for ancestry
+    for (let i = 0; i < shas.length; i++) {
+        for (let j = i + 1; j < shas.length; j++) {
+            const isAncestor = await checkIsAncestor(baseCwd, shas[i], shas[j]);
+            const isReverse = await checkIsAncestor(baseCwd, shas[j], shas[i]);
+            if (!isAncestor && !isReverse) {
+                throw new Error(`Dependency branches have diverged (non-linear ancestry). ` +
+                    `Commits ${shas[i].slice(0, 8)} and ${shas[j].slice(0, 8)} ` +
+                    `are not in an ancestor relationship. ` +
+                    `Please merge your dependency branches first.`);
+            }
+        }
+    }
+}
+/**
+ * Get HEAD of the current branch.
+ */
+export async function getHead(baseCwd) {
+    const { stdout } = await git(baseCwd, ['rev-parse', 'HEAD']);
+    return stdout.trim();
+}
+/**
+ * Get the HEAD SHA of a branch.
+ */
+export async function getBranchHead(baseCwd, branch) {
+    try {
+        const { stdout } = await git(baseCwd, ['rev-parse', '--verify', branch]);
+        return stdout.trim();
+    }
+    catch {
+        throw new Error(`Branch "${branch}" does not exist or has been deleted`);
+    }
+}
+// ---------------------------------------------------------------------------
+// Commit operations
+// ---------------------------------------------------------------------------
+/**
+ * Stage all changes and commit.
+ *
+ * @returns The commit SHA, or null if nothing to commit.
+ */
+export async function commitChanges(worktreePath, groupId, agentCount, successCount) {
+    // Stage everything
+    await git(worktreePath, ['add', '-A']);
+    // Check if there are staged changes
+    try {
+        await git(worktreePath, ['diff', '--cached', '--quiet']);
+        // Exit code 0 means no changes
+        return null;
+    }
+    catch {
+        // Exit code 1 means there ARE changes (git diff --quiet exits 1 when there are diffs)
+    }
+    // Commit
+    const message = `sub-agent/${groupId}: ${successCount}/${agentCount} agents completed`;
+    await git(worktreePath, ['commit', '-m', message]);
+    // Get the commit SHA
+    const { stdout } = await git(worktreePath, ['rev-parse', 'HEAD']);
+    return stdout.trim();
+}
+// ---------------------------------------------------------------------------
+// Internal helpers
+// ---------------------------------------------------------------------------
+/**
+ * Check if `ancestor` is an ancestor of `descendant`.
+ */
+async function checkIsAncestor(baseCwd, ancestor, descendant) {
+    try {
+        await git(baseCwd, ['merge-base', '--is-ancestor', ancestor, descendant]);
+        return true; // exit code 0 = is ancestor
+    }
+    catch {
+        return false; // exit code 1 = not ancestor
+    }
+}
+/**
+ * Check if all `otherShas` are ancestors of `candidate`.
+ */
+async function isAncestorOfAll(baseCwd, otherShas, candidate) {
+    for (const sha of otherShas) {
+        const result = await checkIsAncestor(baseCwd, sha, candidate);
+        if (!result)
+            return false;
+    }
+    return true;
+}
+//# sourceMappingURL=git.js.map

package/dist/wave/git.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"git.js","sourceRoot":"","sources":["../../src/wave/git.ts"],"names":[],"mappings":"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"}

package/dist/wave/orchestrator.d.ts

@@ -0,0 +1,15 @@
+/**
+ * Wave group orchestrator — main scheduling loop.
+ *
+ * Synchronous from the MCP tool handler's perspective (blocks until
+ * all agents finish or the 30-minute timeout fires).
+ *
+ * Integrates with Phase 1 primitives:
+ * - CodexProcessRunner for spawning
+ * - taskStore for per-agent task records
+ * - taskEventBus for event routing
+ * - NotificationThrottle via progress collector
+ */
+import { type OrchestratorOptions, type OrchestratorResult } from './types.js';
+export declare function orchestrate(opts: OrchestratorOptions): Promise<OrchestratorResult>;
+//# sourceMappingURL=orchestrator.d.ts.map

package/dist/wave/orchestrator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["../../src/wave/orchestrator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAuBH,OAAO,EACL,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EAOxB,MAAM,YAAY,CAAC;AAQpB,wBAAsB,WAAW,CAC/B,IAAI,EAAE,mBAAmB,GACxB,OAAO,CAAC,kBAAkB,CAAC,CA8L7B"}