@mknightzzz/stw 0.1.0

package/dist/mechanical-review.js

@@ -0,0 +1,76 @@
+import { execFileSync } from 'node:child_process';
+import { existsSync } from 'node:fs';
+import { join } from 'node:path';
+function isCommandExcluded(cmd, excludeCommands) {
+    if (!excludeCommands)
+        return false;
+    const cmdStr = cmd.join(' ');
+    return excludeCommands.some((excluded) => cmdStr.includes(excluded));
+}
+function runCommand(file, args, cwd, timeoutMs = 30_000) {
+    try {
+        const options = {
+            cwd,
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+            timeout: timeoutMs,
+            killSignal: 'SIGTERM',
+        };
+        const output = execFileSync(file, args, options);
+        return { passed: true, output: output.trim() };
+    }
+    catch (err) {
+        const error = err;
+        if (error.killed || error.signal === 'SIGTERM') {
+            return { passed: false, output: `Command timed out after ${timeoutMs}ms` };
+        }
+        const stdout = error.stdout ? String(error.stdout) : '';
+        const stderr = error.stderr ? String(error.stderr) : '';
+        const output = stdout || stderr || error.message || '';
+        return { passed: false, output: output.trim() };
+    }
+}
+function getChangedFiles(cwd, baseBranch) {
+    try {
+        const output = execFileSync('git', ['diff', '--name-only', baseBranch], {
+            cwd,
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+        });
+        return output.split('\n').filter((line) => line.trim() !== '');
+    }
+    catch {
+        return [];
+    }
+}
+export function checkScopeCompliance(declaredScope, changedFiles) {
+    const declared = new Set(declaredScope);
+    const undeclared = changedFiles.filter((f) => !declared.has(f));
+    return {
+        passed: undeclared.length === 0,
+        declared: declaredScope,
+        undeclared,
+    };
+}
+export async function runMechanicalReview(options) {
+    const { cwd, declaredScope, baseBranch = 'HEAD~1', excludeCommands } = options;
+    const isNodeRepo = existsSync(join(cwd, 'package.json'));
+    const testResult = !isNodeRepo || isCommandExcluded(['npx', 'vitest', 'run'], excludeCommands)
+        ? { passed: true, output: isNodeRepo ? 'skipped (duplicate)' : 'skipped (non-Node repo)' }
+        : runCommand('npx', ['vitest', 'run'], cwd);
+    const typecheckResult = !isNodeRepo || isCommandExcluded(['npx', 'tsc', '--noEmit'], excludeCommands)
+        ? { passed: true, output: isNodeRepo ? 'skipped (duplicate)' : 'skipped (non-Node repo)' }
+        : runCommand('npx', ['tsc', '--noEmit'], cwd);
+    const changedFiles = getChangedFiles(cwd, baseBranch);
+    const scopeResult = checkScopeCompliance(declaredScope, changedFiles);
+    const allPassed = testResult.passed && typecheckResult.passed && scopeResult.passed;
+    return {
+        passed: allPassed,
+        checks: {
+            tests: testResult,
+            typecheck: typecheckResult,
+            scope: scopeResult,
+        },
+    };
+}
+//# sourceMappingURL=mechanical-review.js.map

package/dist/mechanical-review.js.map

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

package/dist/merge.d.ts

@@ -0,0 +1,83 @@
+import { type MRResult } from './gitlab.js';
+import type { RiskLevel, StwConfig, Task } from './types.js';
+export interface MergeOptions {
+    repoRoot: string;
+    runId: string;
+    baseBranch: string;
+    runBranch: string;
+    maxRisk: RiskLevel;
+    config: StwConfig;
+    tasks: Task[];
+    stwRoot?: string;
+}
+export interface MergeResult {
+    mechanical_passed: boolean;
+    llm_passed: boolean;
+    auto_merge: boolean;
+    should_push: boolean;
+    max_risk: RiskLevel;
+    mr_url?: string;
+    mr_iid?: number;
+    error?: string;
+    failure_reason?: string;
+}
+export interface PushAndCreateMROptions {
+    repoRoot: string;
+    runBranch: string;
+    baseBranch: string;
+    title: string;
+    autoMerge: boolean;
+    remote?: string;
+}
+export interface GitlabMergeabilityCheckResult {
+    ok: boolean;
+    reason?: string;
+}
+export interface ConflictMarker {
+    type: 'ours' | 'theirs' | 'ancestor';
+    file?: string;
+    content: string;
+}
+export interface ConflictingFile {
+    path: string;
+    hasConflictMarkers: boolean;
+    isBinary: boolean;
+}
+export type AutomaticResolutionStrategy = 'ours' | 'theirs' | 'ancestor' | 'combine';
+export interface MergeResolutionResult {
+    resolved: boolean;
+    strategy?: AutomaticResolutionStrategy;
+    filesResolved: string[];
+    filesUnresolved: string[];
+}
+export declare function parseConflictMarkers(output: string): ConflictMarker[];
+export declare function identifyConflictingFiles(mergeTreeOutput: string): string[];
+export declare function detectBinaryVsTextConflicts(mergeTreeOutput: string): {
+    binary: string[];
+    text: string[];
+};
+export declare function automaticResolutionStrategy(mergeTreeOutput: string): AutomaticResolutionStrategy | null;
+export declare function resolveConflictsAutomatic(mergeTreeOutput: string, strategy: AutomaticResolutionStrategy): MergeResolutionResult;
+export declare function cleanupConflictedFiles(repoRoot: string, files: string[]): void;
+export interface ExecuteMergeForRunOptions {
+    stwRoot: string;
+    runId: string;
+    repoRoot: string;
+}
+export interface ExecuteMergeForRunResult {
+    ok: boolean;
+    result?: MergeResult;
+    messages: Array<{
+        level: 'info' | 'error';
+        text: string;
+    }>;
+}
+export declare function prepareMerge(options: MergeOptions): Promise<MergeResult>;
+export declare function checkGitlabMergeability(options: {
+    repoRoot: string;
+    baseBranch: string;
+    runBranch: string;
+}): GitlabMergeabilityCheckResult;
+export declare function pushAndCreateMR(options: PushAndCreateMROptions): MRResult;
+export declare function writeMergeArtifact(stwRoot: string, runId: string, result: MergeResult): void;
+export declare function executeMergeForRun(options: ExecuteMergeForRunOptions): Promise<ExecuteMergeForRunResult>;

package/dist/merge.js

@@ -0,0 +1,363 @@
+/* eslint-disable max-lines */
+import { execFileSync } from 'node:child_process';
+import { randomUUID } from 'node:crypto';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { createDraftMR, setMRLabels } from './gitlab.js';
+import { reviewTask } from './llm-reviewer.js';
+import { runMechanicalReview } from './mechanical-review.js';
+import { runDir, writeJson, readJson } from './storage.js';
+import { readTaskStatus } from './status.js';
+import { loadConfig } from './config.js';
+export function parseConflictMarkers(output) {
+    const markers = [];
+    const lines = output.split('\n');
+    for (const line of lines) {
+        if (line.startsWith('<<<<<<<')) {
+            markers.push({ type: 'ours', content: line });
+        }
+        else if (line.startsWith('=======')) {
+            if (markers.length > 0 && markers[markers.length - 1].type === 'ours') {
+                markers[markers.length - 1].type = 'ancestor';
+                markers.push({ type: 'theirs', content: line });
+            }
+        }
+        else if (line.startsWith('>>>>>>>')) {
+            markers.push({ type: 'theirs', content: line });
+        }
+    }
+    return markers;
+}
+export function identifyConflictingFiles(mergeTreeOutput) {
+    const files = [];
+    const lines = mergeTreeOutput.split('\n');
+    for (const line of lines) {
+        const conflictMatch = line.match(/^<<<<<<< .*/);
+        if (conflictMatch) {
+            const file = conflictMatch[0].replace('<<<<<<< ', '');
+            if (file && !files.includes(file)) {
+                files.push(file);
+            }
+        }
+    }
+    return files;
+}
+export function detectBinaryVsTextConflicts(mergeTreeOutput) {
+    const binary = [];
+    const text = [];
+    const conflictingFiles = identifyConflictingFiles(mergeTreeOutput);
+    for (const file of conflictingFiles) {
+        const binaryExtensions = ['.png', '.jpg', '.jpeg', '.gif', '.ico', '.pdf', '.zip', '.tar', '.gz'];
+        const isBinaryFile = binaryExtensions.some((ext) => file.endsWith(ext));
+        if (isBinaryFile) {
+            binary.push(file);
+        }
+        else {
+            text.push(file);
+        }
+    }
+    return { binary, text };
+}
+export function automaticResolutionStrategy(mergeTreeOutput) {
+    const conflictingFiles = identifyConflictingFiles(mergeTreeOutput);
+    if (conflictingFiles.length === 0) {
+        return null;
+    }
+    const { binary } = detectBinaryVsTextConflicts(mergeTreeOutput);
+    if (binary.length > 0) {
+        return 'ancestor';
+    }
+    return 'ours';
+}
+export function resolveConflictsAutomatic(mergeTreeOutput, strategy) {
+    const conflictingFiles = identifyConflictingFiles(mergeTreeOutput);
+    if (conflictingFiles.length === 0) {
+        return { resolved: true, filesResolved: [], filesUnresolved: [] };
+    }
+    return {
+        resolved: true,
+        strategy,
+        filesResolved: conflictingFiles,
+        filesUnresolved: [],
+    };
+}
+export function cleanupConflictedFiles(repoRoot, files) {
+    for (const file of files) {
+        try {
+            execFileSync('git', ['checkout', '--theirs', file], getExecOptions(repoRoot));
+        }
+        catch {
+            // Best effort cleanup
+        }
+    }
+}
+export async function prepareMerge(options) {
+    const declaredScope = collectDeclaredScope(options.tasks);
+    const reviewTaskDir = runDir(resolveStwRoot(options.repoRoot, options.stwRoot), options.runId);
+    let worktreePath = null;
+    try {
+        worktreePath = createDetachedWorktree(options.repoRoot, options.runBranch);
+        const mechanicalResult = await runMechanicalReview({
+            cwd: worktreePath,
+            declaredScope,
+            baseBranch: options.baseBranch,
+        });
+        if (!mechanicalResult.passed) {
+            return {
+                mechanical_passed: false,
+                llm_passed: false,
+                auto_merge: false,
+                should_push: false,
+                max_risk: options.maxRisk,
+                failure_reason: 'Mechanical review failed',
+            };
+        }
+        const validationResult = {
+            passed: true,
+            checks: [],
+        };
+        const reviewResult = await reviewTask(createMergeReviewTask(options.runId, options.maxRisk, declaredScope), options.config, getRunDiff(options.repoRoot, options.baseBranch, options.runBranch), validationResult, reviewTaskDir, worktreePath);
+        const llmPassed = reviewResult.decision === 'complete';
+        const shouldPush = llmPassed;
+        return {
+            mechanical_passed: true,
+            llm_passed: llmPassed,
+            auto_merge: shouldPush && options.maxRisk !== 'high',
+            should_push: shouldPush,
+            max_risk: options.maxRisk,
+            failure_reason: llmPassed ? undefined : 'LLM review did not approve the run',
+        };
+    }
+    finally {
+        if (worktreePath) {
+            removeWorktree(options.repoRoot, worktreePath);
+        }
+    }
+}
+export function checkGitlabMergeability(options) {
+    const gitOptions = getExecOptions(options.repoRoot);
+    try {
+        execFileSync('git', ['rev-parse', '--verify', options.runBranch], gitOptions);
+    }
+    catch {
+        return {
+            ok: false,
+            reason: `Run branch does not exist locally: ${options.runBranch}`,
+        };
+    }
+    try {
+        execFileSync('git', ['rev-parse', '--verify', options.baseBranch], gitOptions);
+    }
+    catch {
+        return {
+            ok: false,
+            reason: `Base branch does not exist locally: ${options.baseBranch}`,
+        };
+    }
+    try {
+        const statusOutput = String(execFileSync('git', ['status', '--porcelain'], gitOptions)).trim();
+        if (statusOutput.length > 0) {
+            return {
+                ok: false,
+                reason: 'GitLab mergeability check failed: working tree is not clean',
+            };
+        }
+    }
+    catch {
+        return {
+            ok: false,
+            reason: 'GitLab mergeability check failed: could not inspect working tree status',
+        };
+    }
+    try {
+        execFileSync('git', ['merge-base', options.baseBranch, options.runBranch], gitOptions);
+    }
+    catch {
+        return {
+            ok: false,
+            reason: `Could not determine merge base between ${options.baseBranch} and ${options.runBranch}`,
+        };
+    }
+    try {
+        const mergeBase = String(execFileSync('git', ['merge-base', options.baseBranch, options.runBranch], gitOptions)).trim();
+        const output = execFileSync('git', ['merge-tree', mergeBase, options.baseBranch, options.runBranch], gitOptions);
+        if (output.includes('<<<<<<<')) {
+            return {
+                ok: false,
+                reason: 'GitLab mergeability check failed: merge conflicts detected',
+            };
+        }
+    }
+    catch (error) {
+        const execError = error;
+        const output = execError.stdout ?? '';
+        if (output.includes('<<<<<<<')) {
+            return {
+                ok: false,
+                reason: 'GitLab mergeability check failed: merge conflicts detected',
+            };
+        }
+    }
+    return { ok: true };
+}
+export function pushAndCreateMR(options) {
+    const gitOptions = getExecOptions(options.repoRoot);
+    const remote = options.remote ?? 'gitlab';
+    execFileSync('git', ['push', remote, options.runBranch], gitOptions);
+    const result = createDraftMR({
+        repoRoot: options.repoRoot,
+        sourceBranch: options.runBranch,
+        targetBranch: options.baseBranch,
+        title: options.title,
+    });
+    const labels = ['ai:running'];
+    if (options.autoMerge) {
+        labels.push('ai:complete');
+    }
+    setMRLabels({
+        repoRoot: options.repoRoot,
+        mrIid: result.mr_iid,
+        labels,
+    });
+    return result;
+}
+export function writeMergeArtifact(stwRoot, runId, result) {
+    writeJson(join(runDir(stwRoot, runId), 'merge.json'), {
+        schema_version: 1,
+        run_id: runId,
+        ...result,
+        timestamp: new Date().toISOString(),
+    });
+}
+export async function executeMergeForRun(options) {
+    const messages = [];
+    const manifest = readJson(join(runDir(options.stwRoot, options.runId), 'manifest.json'));
+    const graph = readJson(join(runDir(options.stwRoot, options.runId), 'task_graph.json'));
+    const config = loadConfig(join(options.stwRoot, 'config.yml'));
+    if (manifest.status !== 'complete') {
+        messages.push({
+            level: 'error',
+            text: `Run ${options.runId} is not mergeable yet: status is ${manifest.status}, expected complete.`,
+        });
+        return { ok: false, messages };
+    }
+    const completedTasks = graph.tasks.filter((task) => readTaskStatus(options.stwRoot, options.runId, task.id)?.status === 'complete');
+    if (completedTasks.length !== graph.tasks.length) {
+        messages.push({
+            level: 'error',
+            text: `Run ${options.runId} is not mergeable yet: ${completedTasks.length}/${graph.tasks.length} tasks are marked complete.`,
+        });
+        return { ok: false, messages };
+    }
+    const mergeability = checkGitlabMergeability({
+        repoRoot: options.repoRoot,
+        baseBranch: manifest.base_branch,
+        runBranch: manifest.branch,
+    });
+    if (!mergeability.ok) {
+        messages.push({ level: 'error', text: mergeability.reason ?? 'GitLab mergeability checks failed.' });
+        return { ok: false, messages };
+    }
+    const maxRisk = ['high', 'medium', 'low'].find((risk) => completedTasks.some((task) => task.risk === risk)) ?? 'low';
+    messages.push({
+        level: 'info',
+        text: `Preparing merge for ${completedTasks.length} completed tasks (max risk: ${maxRisk})...`,
+    });
+    const result = await prepareMerge({
+        repoRoot: options.repoRoot,
+        runId: options.runId,
+        baseBranch: manifest.base_branch,
+        runBranch: manifest.branch,
+        maxRisk,
+        config,
+        tasks: completedTasks,
+        stwRoot: options.stwRoot,
+    });
+    if (!result.should_push) {
+        messages.push({ level: 'error', text: 'Review failed. Not pushing.' });
+        messages.push({ level: 'error', text: `Mechanical: ${result.mechanical_passed ? 'PASS' : 'FAIL'}` });
+        messages.push({ level: 'error', text: `LLM: ${result.llm_passed ? 'PASS' : 'FAIL'}` });
+        if (result.failure_reason) {
+            messages.push({ level: 'error', text: `Reason: ${result.failure_reason}` });
+        }
+        writeMergeArtifact(options.stwRoot, options.runId, result);
+        return { ok: false, result, messages };
+    }
+    messages.push({
+        level: 'info',
+        text: `Reviews passed. Pushing and creating MR (auto-merge: ${result.auto_merge})...`,
+    });
+    try {
+        const mr = pushAndCreateMR({
+            repoRoot: options.repoRoot,
+            runBranch: manifest.branch,
+            baseBranch: manifest.base_branch,
+            title: `[stw] ${manifest.run_id}`,
+            autoMerge: result.auto_merge,
+            remote: config.gitlab?.remote ?? 'gitlab',
+        });
+        result.mr_url = mr.mr_url;
+        result.mr_iid = mr.mr_iid;
+        messages.push({ level: 'info', text: `MR created: ${mr.mr_url}` });
+        if (!result.auto_merge) {
+            messages.push({ level: 'info', text: 'High-risk run - manual merge required.' });
+        }
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        result.error = message;
+        messages.push({ level: 'error', text: `Failed to push/create MR: ${message}` });
+    }
+    writeMergeArtifact(options.stwRoot, options.runId, result);
+    return { ok: !result.error, result, messages };
+}
+function collectDeclaredScope(tasks) {
+    const scope = new Set();
+    for (const task of tasks) {
+        for (const file of task.scope.files) {
+            scope.add(file);
+        }
+    }
+    return [...scope];
+}
+function createMergeReviewTask(runId, risk, declaredScope) {
+    return {
+        schema_version: 1,
+        id: `merge-${runId}`,
+        description: `Review merge readiness for run ${runId}`,
+        task_type: 'merge_review',
+        risk,
+        state: 'reviewing',
+        scope: {
+            files: declaredScope,
+            allow_shared_files: true,
+        },
+        dependencies: [],
+        acceptance_checks: [],
+        model_tier: 'strong',
+        max_retries: 0,
+        timeout_minutes: 10,
+    };
+}
+function resolveStwRoot(repoRoot, stwRoot) {
+    return stwRoot ?? join(repoRoot, '.stw');
+}
+function createDetachedWorktree(repoRoot, runBranch) {
+    const worktreePath = join(tmpdir(), `stw-merge-${randomUUID().slice(0, 8)}`);
+    execFileSync('git', ['worktree', 'add', '--detach', worktreePath, runBranch], getExecOptions(repoRoot));
+    return worktreePath;
+}
+function removeWorktree(repoRoot, worktreePath) {
+    execFileSync('git', ['worktree', 'remove', '--force', worktreePath], getExecOptions(repoRoot));
+}
+function getRunDiff(repoRoot, baseBranch, runBranch) {
+    return execFileSync('git', ['diff', `${baseBranch}...${runBranch}`], getExecOptions(repoRoot));
+}
+function getExecOptions(cwd) {
+    return {
+        cwd,
+        encoding: 'utf-8',
+        stdio: ['pipe', 'pipe', 'pipe'],
+    };
+}
+//# sourceMappingURL=merge.js.map

package/dist/merge.js.map

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

package/dist/parallel.d.ts

@@ -0,0 +1,35 @@
+import type { Task, TaskGraph, StwConfig } from './types.js';
+import { type ExecuteTaskOptions, type ExecuteTaskResult } from './task-executor.js';
+import type { Logger } from './logger.js';
+export interface ReadyTask {
+    task: Task;
+    index: number;
+}
+export declare function findReadyTasks(graph: TaskGraph, stwRoot: string, runId: string): ReadyTask[];
+export interface BatchTaskResult {
+    task: Task;
+    result: ExecuteTaskResult;
+    worktreePath?: string;
+    taskBranch?: string;
+    taskDir: string;
+}
+export interface MergeBackResult {
+    taskId: string;
+    merged: boolean;
+    needsRetry: boolean;
+    error?: string;
+}
+export declare function mergeBackSequentially(input: {
+    completedResults: BatchTaskResult[];
+    repoRoot: string;
+    runBranch: string;
+    logger?: Logger;
+}): MergeBackResult[];
+export interface ExecuteBatchOptions {
+    tasks: Task[];
+    config: StwConfig;
+    baseOptions: Omit<ExecuteTaskOptions, 'deferMerge' | 'taskDir'>;
+    taskDirFn: (taskId: string) => string;
+    logger?: Logger;
+}
+export declare function executeBatch(options: ExecuteBatchOptions): Promise<BatchTaskResult[]>;