@substrate-ai/core 0.19.54

package/dist/git/git-utils.js

@@ -0,0 +1,347 @@
+/**
+ * git-utils.ts — Low-level git command helpers.
+ *
+ * All git commands are executed via child_process.spawn (not simple-git),
+ * as specified in ADR-007 (Git Worktree Management).
+ *
+ * Functions:
+ *  - spawnGit: Execute git with given args, returns stdout/stderr/code
+ *  - getGitVersion: Returns version string like "2.42.0"
+ *  - parseGitVersion: Parses version string into { major, minor, patch }
+ *  - isGitVersionSupported: Checks if version >= 2.20.0
+ *  - verifyGitVersion: Throws if git not installed or < 2.20
+ *  - createWorktree: Creates a worktree + branch
+ *  - removeWorktree: Removes a worktree directory
+ *  - removeBranch: Deletes a branch with git branch -D
+ *  - getOrphanedWorktrees: Scans .substrate-worktrees/ and returns paths
+ *  - simulateMerge: Runs git merge --no-commit --no-ff to detect conflicts
+ *  - abortMerge: Runs git merge --abort to clean up a simulated merge
+ *  - getConflictingFiles: Returns list of files with conflicts using git diff --name-only --diff-filter=U
+ *  - performMerge: Runs git merge --no-ff to execute actual merge
+ *  - getMergedFiles: Returns list of files changed in a merge using git diff --name-only
+ */
+import { spawn } from 'node:child_process';
+import { readdir, access } from 'node:fs/promises';
+import * as path from 'node:path';
+// Minimum supported git version
+const MIN_GIT_MAJOR = 2;
+const MIN_GIT_MINOR = 20;
+// ---------------------------------------------------------------------------
+// spawnGit
+// ---------------------------------------------------------------------------
+/**
+ * Spawn a git subprocess with the given args.
+ *
+ * @param args    - Arguments to pass to git (e.g., ['worktree', 'add', ...])
+ * @param options - Optional spawn options (cwd, env)
+ * @returns       - Object with stdout, stderr, and exit code
+ */
+export function spawnGit(args, options) {
+    return new Promise((resolve) => {
+        const proc = spawn('git', args, {
+            cwd: options?.cwd,
+            env: options?.env ?? process.env,
+            stdio: ['ignore', 'pipe', 'pipe'],
+        });
+        let stdout = '';
+        let stderr = '';
+        proc.stdout?.on('data', (chunk) => {
+            stdout += chunk.toString();
+        });
+        proc.stderr?.on('data', (chunk) => {
+            stderr += chunk.toString();
+        });
+        proc.on('close', (code) => {
+            resolve({ stdout: stdout.trim(), stderr: stderr.trim(), code: code ?? 1 });
+        });
+        proc.on('error', (err) => {
+            resolve({ stdout: '', stderr: err.message, code: 1 });
+        });
+    });
+}
+// ---------------------------------------------------------------------------
+// getGitVersion
+// ---------------------------------------------------------------------------
+/**
+ * Get the installed git version string.
+ *
+ * @returns Version string like "2.42.0"
+ * @throws  Error if git is not installed or version cannot be parsed
+ */
+export async function getGitVersion() {
+    const result = await spawnGit(['--version']);
+    if (result.code !== 0) {
+        throw new Error(`git --version failed: ${result.stderr}`);
+    }
+    // Output is like: "git version 2.42.0"
+    const match = /git version\s+(\d+\.\d+(?:\.\d+)?)/.exec(result.stdout);
+    if (match === null || match[1] === undefined) {
+        throw new Error(`Unable to parse git version from output: "${result.stdout}"`);
+    }
+    return match[1];
+}
+// ---------------------------------------------------------------------------
+// parseGitVersion
+// ---------------------------------------------------------------------------
+/**
+ * Parse a git version string into major/minor/patch components.
+ *
+ * @param versionString - Version string like "2.42.0" or "2.20"
+ * @returns             - Parsed version components
+ */
+export function parseGitVersion(versionString) {
+    const parts = versionString.split('.').map(Number);
+    return {
+        major: parts[0] ?? 0,
+        minor: parts[1] ?? 0,
+        patch: parts[2] ?? 0,
+    };
+}
+// ---------------------------------------------------------------------------
+// isGitVersionSupported
+// ---------------------------------------------------------------------------
+/**
+ * Check if the given git version string is >= 2.20.0.
+ *
+ * @param version - Version string like "2.42.0"
+ * @returns       - true if version >= 2.20.0
+ */
+export function isGitVersionSupported(version) {
+    const { major, minor } = parseGitVersion(version);
+    if (major > MIN_GIT_MAJOR)
+        return true;
+    if (major === MIN_GIT_MAJOR && minor >= MIN_GIT_MINOR)
+        return true;
+    return false;
+}
+// ---------------------------------------------------------------------------
+// verifyGitVersion
+// ---------------------------------------------------------------------------
+/**
+ * Verify that git is installed and version >= 2.20.
+ *
+ * @throws Error with clear message if git is not installed or too old
+ */
+export async function verifyGitVersion() {
+    let version;
+    try {
+        version = await getGitVersion();
+    }
+    catch (err) {
+        throw new Error(`git is not installed or could not be executed. ` +
+            `Please install git 2.20 or newer. Details: ${String(err)}`);
+    }
+    if (!isGitVersionSupported(version)) {
+        const { major, minor, patch } = parseGitVersion(version);
+        throw new Error(`Git version ${major}.${minor}.${patch} is too old. ` +
+            `Substrate requires git 2.20 or newer. ` +
+            `Please upgrade git: https://git-scm.com/downloads`);
+    }
+}
+// ---------------------------------------------------------------------------
+// createWorktree
+// ---------------------------------------------------------------------------
+/**
+ * Create a git worktree and its associated branch.
+ *
+ * Uses a single `git worktree add {worktreePath} -b {branchName} {baseBranch}`
+ * command to create the worktree with a new branch in one step.
+ *
+ * @param projectRoot - Absolute path to the git repository root
+ * @param taskId      - Task identifier (used in path derivation)
+ * @param branchName  - Branch name to create (e.g., "substrate/task-abc123")
+ * @param baseBranch  - Branch to base the worktree on (e.g., "main")
+ * @returns           - Object with the worktreePath
+ * @throws            - Error if git command fails
+ */
+export async function createWorktree(projectRoot, taskId, branchName, baseBranch) {
+    const worktreePath = path.join(projectRoot, '.substrate-worktrees', taskId);
+    // Create the worktree with a new branch based on baseBranch in one command
+    const addResult = await spawnGit(['worktree', 'add', worktreePath, '-b', branchName, baseBranch], { cwd: projectRoot });
+    if (addResult.code !== 0) {
+        throw new Error(`git worktree add failed for task "${taskId}": ${addResult.stderr || addResult.stdout}`);
+    }
+    return { worktreePath };
+}
+// ---------------------------------------------------------------------------
+// removeWorktree
+// ---------------------------------------------------------------------------
+/**
+ * Remove a git worktree by path.
+ *
+ * Uses `git worktree remove --force` to handle unclean worktrees.
+ *
+ * @param worktreePath - Absolute path to the worktree directory
+ * @param projectRoot  - Absolute path to the git repository root
+ * @throws             - Error if git command fails
+ */
+export async function removeWorktree(worktreePath, projectRoot) {
+    const spawnOpts = {};
+    if (projectRoot !== undefined)
+        spawnOpts.cwd = projectRoot;
+    const result = await spawnGit(['worktree', 'remove', '--force', worktreePath], spawnOpts);
+    if (result.code !== 0) {
+        throw new Error(`git worktree remove failed for "${worktreePath}": ${result.stderr || result.stdout}`);
+    }
+}
+// ---------------------------------------------------------------------------
+// removeBranch
+// ---------------------------------------------------------------------------
+/**
+ * Delete a git branch using `git branch -D`.
+ *
+ * @param branchName  - Branch name to delete (e.g., "substrate/task-abc123")
+ * @param projectRoot - Absolute path to the git repository root
+ * @returns           - true if branch was successfully deleted, false otherwise
+ */
+export async function removeBranch(branchName, projectRoot) {
+    const spawnOpts = {};
+    if (projectRoot !== undefined)
+        spawnOpts.cwd = projectRoot;
+    const result = await spawnGit(['branch', '-D', branchName], spawnOpts);
+    if (result.code !== 0) {
+        // Branch may not exist (e.g., worktree checkout failed earlier) — treat as warning not error
+        return false;
+    }
+    return true;
+}
+// ---------------------------------------------------------------------------
+// getOrphanedWorktrees
+// ---------------------------------------------------------------------------
+/**
+ * Scan the worktrees base directory and return paths of all found worktree directories.
+ *
+ * @param projectRoot   - Absolute path to the git repository root
+ * @param baseDirectory - Relative directory name for worktrees (default: '.substrate-worktrees')
+ * @returns             - Array of absolute worktree directory paths
+ */
+export async function getOrphanedWorktrees(projectRoot, baseDirectory = '.substrate-worktrees') {
+    const worktreesDir = path.join(projectRoot, baseDirectory);
+    // Check if the directory exists
+    try {
+        await access(worktreesDir);
+    }
+    catch {
+        // Directory doesn't exist — no orphaned worktrees
+        return [];
+    }
+    let entries;
+    try {
+        entries = await readdir(worktreesDir, { withFileTypes: true });
+    }
+    catch {
+        return [];
+    }
+    // Filter for directories only and return absolute paths
+    return entries
+        .filter((entry) => entry.isDirectory())
+        .map((entry) => path.join(worktreesDir, entry.name));
+}
+// ---------------------------------------------------------------------------
+// simulateMerge
+// ---------------------------------------------------------------------------
+/**
+ * Simulate a merge using git merge --no-commit --no-ff without committing.
+ *
+ * This runs in the target branch's working directory (the project root or
+ * worktree path). The simulation must be aborted after checking conflicts
+ * via abortMerge().
+ *
+ * @param branchName  - The source branch to simulate merging
+ * @param cwd         - Working directory (must be on the target branch)
+ * @returns           - true if merge would be clean, false if there are conflicts
+ */
+export async function simulateMerge(branchName, cwd) {
+    const result = await spawnGit(['merge', '--no-commit', '--no-ff', branchName], { cwd });
+    // Git exits with code 0 if merge is clean (but not committed due to --no-commit)
+    // Git exits with non-zero code if there are conflicts
+    if (result.code === 0) {
+        return true;
+    }
+    return false;
+}
+// ---------------------------------------------------------------------------
+// abortMerge
+// ---------------------------------------------------------------------------
+/**
+ * Abort a merge in progress using git merge --abort.
+ *
+ * Should be called after simulateMerge() to clean up the merge state,
+ * regardless of whether conflicts were found.
+ *
+ * @param cwd - Working directory (same as used for simulateMerge)
+ */
+export async function abortMerge(cwd) {
+    await spawnGit(['merge', '--abort'], { cwd });
+}
+// ---------------------------------------------------------------------------
+// getConflictingFiles
+// ---------------------------------------------------------------------------
+/**
+ * Get a list of files with conflicts during a merge.
+ *
+ * Must be called while a merge is in progress (after simulateMerge() and
+ * before abortMerge()).
+ *
+ * @param cwd - Working directory of the repository
+ * @returns   - Array of conflicting file paths
+ */
+export async function getConflictingFiles(cwd) {
+    const result = await spawnGit(['diff', '--name-only', '--diff-filter=U'], { cwd });
+    if (result.code !== 0) {
+        return [];
+    }
+    if (result.stdout.trim() === '') {
+        return [];
+    }
+    return result.stdout.trim().split('\n').filter((f) => f.trim().length > 0);
+}
+// ---------------------------------------------------------------------------
+// performMerge
+// ---------------------------------------------------------------------------
+/**
+ * Perform an actual merge using git merge --no-ff.
+ *
+ * Should only be called after detectConflicts() confirms there are no conflicts.
+ * Creates a merge commit even if fast-forward is possible (--no-ff ensures history).
+ *
+ * @param branchName  - The source branch to merge
+ * @param cwd         - Working directory (must be on the target branch)
+ * @returns           - true if merge succeeded, false otherwise
+ */
+export async function performMerge(branchName, cwd) {
+    const result = await spawnGit(['merge', '--no-ff', branchName], { cwd });
+    if (result.code !== 0) {
+        return false;
+    }
+    return true;
+}
+// ---------------------------------------------------------------------------
+// getMergedFiles
+// ---------------------------------------------------------------------------
+/**
+ * Get a list of files changed in the most recent merge.
+ *
+ * Uses git diff --name-only HEAD~1..HEAD to find files in the merge commit.
+ * Falls back to empty array if commit history is insufficient.
+ *
+ * @param cwd - Working directory of the repository
+ * @returns   - Array of file paths that were merged
+ */
+export async function getMergedFiles(cwd) {
+    // Get files changed between HEAD~1 and HEAD (the merge commit)
+    const result = await spawnGit(['diff', '--name-only', 'HEAD~1..HEAD'], { cwd });
+    if (result.code !== 0) {
+        // May fail if there's only one commit — try alternative approach
+        const altResult = await spawnGit(['show', '--name-only', '--format=', 'HEAD'], { cwd });
+        if (altResult.code !== 0) {
+            return [];
+        }
+        return altResult.stdout.trim().split('\n').filter((f) => f.trim().length > 0);
+    }
+    if (result.stdout.trim() === '') {
+        return [];
+    }
+    return result.stdout.trim().split('\n').filter((f) => f.trim().length > 0);
+}
+//# sourceMappingURL=git-utils.js.map

package/dist/git/git-utils.js.map

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

package/dist/git/git-worktree-manager-impl.d.ts

@@ -0,0 +1,58 @@
+/**
+ * GitWorktreeManagerImpl — concrete implementation of GitWorktreeManager.
+ *
+ * Subscribes to task:ready events to create worktrees and to
+ * task:complete / task:failed events to clean them up.
+ *
+ * Architecture constraints:
+ *  - Uses child_process.spawn for all git operations (via git-utils)
+ *  - Branch names: "substrate/task-{taskId}"
+ *  - Worktree path: {projectRoot}/.substrate-worktrees/{taskId}
+ *  - Implements IBaseService lifecycle (initialize / shutdown)
+ */
+import type { TypedEventBus, CoreEvents } from '../events/index.js';
+import type { ILogger } from '../dispatch/types.js';
+import type { GitWorktreeManager, WorktreeInfo, ConflictReport, MergeResult } from './git-worktree-manager.js';
+/**
+ * Minimal interface for the legacy db parameter (unused in current implementation,
+ * kept for backward compatibility with call sites that pass a db instance).
+ */
+export interface LegacyDbLike {
+    readonly isOpen?: boolean;
+    readonly db?: Record<string, unknown>;
+    initialize?(): Promise<void>;
+    shutdown?(): Promise<void>;
+}
+export declare class GitWorktreeManagerImpl implements GitWorktreeManager {
+    private readonly _eventBus;
+    private readonly _projectRoot;
+    private readonly _baseDirectory;
+    private readonly _db;
+    private readonly _logger;
+    /** Bound listener references for cleanup in shutdown() */
+    private readonly _onTaskReady;
+    private readonly _onTaskComplete;
+    private readonly _onTaskFailed;
+    constructor(eventBus: TypedEventBus<CoreEvents>, projectRoot: string, baseDirectory?: string, db?: LegacyDbLike | null, logger?: ILogger);
+    initialize(): Promise<void>;
+    shutdown(): Promise<void>;
+    private _handleTaskReady;
+    private _handleTaskDone;
+    createWorktree(taskId: string, baseBranch?: string): Promise<WorktreeInfo>;
+    cleanupWorktree(taskId: string): Promise<void>;
+    cleanupAllWorktrees(): Promise<number>;
+    detectConflicts(taskId: string, targetBranch?: string): Promise<ConflictReport>;
+    mergeWorktree(taskId: string, targetBranch?: string): Promise<MergeResult>;
+    listWorktrees(): Promise<WorktreeInfo[]>;
+    getWorktreePath(taskId: string): string;
+    verifyGitVersion(): Promise<void>;
+}
+export interface GitWorktreeManagerOptions {
+    eventBus: TypedEventBus<CoreEvents>;
+    projectRoot: string;
+    baseDirectory?: string;
+    db?: LegacyDbLike | null;
+    logger?: ILogger;
+}
+export declare function createGitWorktreeManager(options: GitWorktreeManagerOptions): GitWorktreeManager;
+//# sourceMappingURL=git-worktree-manager-impl.d.ts.map

package/dist/git/git-worktree-manager-impl.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"git-worktree-manager-impl.d.ts","sourceRoot":"","sources":["../../src/git/git-worktree-manager-impl.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAIH,OAAO,KAAK,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AACnE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAG9G;;;GAGG;AACH,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAA;IACzB,QAAQ,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACrC,UAAU,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IAC5B,QAAQ,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CAC3B;AAYD,qBAAa,sBAAuB,YAAW,kBAAkB;IAC/D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA2B;IACrD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAQ;IACrC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAQ;IACvC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAqB;IACzC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IAEjC,0DAA0D;IAC1D,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAuC;IACpE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAuC;IACvE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAuC;gBAGnE,QAAQ,EAAE,aAAa,CAAC,UAAU,CAAC,EACnC,WAAW,EAAE,MAAM,EACnB,aAAa,GAAE,MAA8B,EAC7C,EAAE,GAAE,YAAY,GAAG,IAAW,EAC9B,MAAM,CAAC,EAAE,OAAO;IA6BZ,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB3B,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;YAkBjB,gBAAgB;YAShB,eAAe;IAcvB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC;IAkC1E,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA0C9C,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC;IA4CtC,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,SAAS,GAAG,OAAO,CAAC,cAAc,CAAC;IAuD/E,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;IAgD1E,aAAa,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IAiC9C,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAIjC,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;CAOxC;AAMD,MAAM,WAAW,yBAAyB;IACxC,QAAQ,EAAE,aAAa,CAAC,UAAU,CAAC,CAAA;IACnC,WAAW,EAAE,MAAM,CAAA;IACnB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,EAAE,CAAC,EAAE,YAAY,GAAG,IAAI,CAAA;IACxB,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,yBAAyB,GAAG,kBAAkB,CAQ/F"}