agentic-orchestrator 0.1.0

package/dist/apps/control-plane/application/services/lock-service.js

@@ -0,0 +1,242 @@
+import crypto from 'node:crypto';
+import { nowIso, pathExists } from '../../core/fs.js';
+import { ERROR_CODES } from '../../core/error-codes.js';
+import { fail } from '../../core/response.js';
+import { STATUS } from '../../core/constants.js';
+function normalizeSet(array) {
+    return [...new Set(array)].sort((a, b) => a.localeCompare(b));
+}
+function sleep(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
+export class LockService {
+    port;
+    constructor(port) {
+        this.port = port;
+    }
+    async locksAcquire(resource, featureId, waitTimeoutSeconds = null) {
+        const policy = this.port.getPolicySnapshot();
+        if (!resource || !policy.locks.resources.includes(resource)) {
+            throw {
+                normalizedResponse: fail(ERROR_CODES.INVALID_ARGUMENT, 'Unknown lock resource', {
+                    resource,
+                    retryable: false,
+                    requires_human: true
+                })
+            };
+        }
+        if (!featureId) {
+            throw {
+                normalizedResponse: fail(ERROR_CODES.INVALID_ARGUMENT, 'feature_id is required', {
+                    retryable: false,
+                    requires_human: true
+                })
+            };
+        }
+        const behavior = policy.locks.acquire_behavior ?? 'wait';
+        const timeoutMs = (waitTimeoutSeconds ?? policy.locks.default_wait_timeout_seconds) * 1000;
+        const backoffCfg = policy.locks.acquire_backoff;
+        let backoffMs = backoffCfg.initial_ms;
+        const started = Date.now();
+        while (true) {
+            const result = await this.port.withIndexLock(async () => {
+                const index = await this.port.readIndex();
+                const holder = index.locks[resource];
+                const lease = index.lock_leases[resource];
+                let staleReclaimed = false;
+                if (holder && lease && new Date(lease.expires_at).getTime() < Date.now()) {
+                    staleReclaimed = true;
+                    index.locks[resource] = null;
+                    index.lock_leases[resource] = null;
+                }
+                if (!index.locks[resource] || index.locks[resource] === featureId) {
+                    const leaseId = crypto.randomUUID();
+                    const expiresAt = new Date(Date.now() + policy.locks.lease_ttl_seconds * 1000).toISOString();
+                    index.locks[resource] = featureId;
+                    index.lock_leases[resource] = {
+                        holder: featureId,
+                        lease_id: leaseId,
+                        expires_at: expiresAt
+                    };
+                    index.version += 1;
+                    index.updated_at = nowIso();
+                    await this.port.writeIndex(index);
+                    await this.port.updateState(featureId, null, (frontMatter, body) => Promise.resolve({
+                        frontMatter: {
+                            locks: {
+                                held: normalizeSet([...(frontMatter.locks?.held ?? []), resource])
+                            }
+                        },
+                        body
+                    }));
+                    return {
+                        acquired: true,
+                        staleReclaimed,
+                        lease_id: leaseId,
+                        expires_at: expiresAt
+                    };
+                }
+                return {
+                    acquired: false,
+                    holder: index.locks[resource]
+                };
+            });
+            if (result.acquired) {
+                return {
+                    data: {
+                        resource,
+                        feature_id: featureId,
+                        lease_id: result.lease_id,
+                        expires_at: result.expires_at,
+                        stale_reclaimed: result.staleReclaimed
+                    },
+                    evidence: result.staleReclaimed
+                        ? {
+                            code: ERROR_CODES.STALE_LOCK_RECLAIMED,
+                            message: `Reclaimed stale lock for ${resource}`
+                        }
+                        : undefined
+                };
+            }
+            if (behavior === 'fail') {
+                throw {
+                    normalizedResponse: fail(ERROR_CODES.LOCK_CONFLICT, 'Lock is held by another feature', {
+                        resource,
+                        holder: result.holder,
+                        retryable: true,
+                        requires_human: false
+                    })
+                };
+            }
+            if (Date.now() - started > timeoutMs) {
+                throw {
+                    normalizedResponse: fail(ERROR_CODES.LOCK_CONFLICT, 'Timed out waiting for lock', {
+                        resource,
+                        retryable: true,
+                        requires_human: false
+                    })
+                };
+            }
+            await sleep(backoffMs + Math.floor(Math.random() * (backoffCfg.jitter_ms ?? 0)));
+            backoffMs = Math.min(backoffCfg.max_ms, Math.floor(backoffMs * backoffCfg.multiplier));
+        }
+    }
+    async locksRelease(resource, featureId) {
+        if (!resource || !featureId) {
+            throw {
+                normalizedResponse: fail(ERROR_CODES.INVALID_ARGUMENT, 'resource and feature_id are required', {
+                    retryable: false,
+                    requires_human: true
+                })
+            };
+        }
+        await this.port.withIndexLock(async () => {
+            const index = await this.port.readIndex();
+            const holder = index.locks[resource];
+            if (holder && holder !== featureId) {
+                throw {
+                    normalizedResponse: fail(ERROR_CODES.LOCK_CONFLICT, 'Cannot release lock held by another feature', {
+                        resource,
+                        holder,
+                        retryable: false,
+                        requires_human: true
+                    })
+                };
+            }
+            index.locks[resource] = null;
+            index.lock_leases[resource] = null;
+            index.version += 1;
+            index.updated_at = nowIso();
+            await this.port.writeIndex(index);
+        });
+        await this.port.updateState(featureId, null, (frontMatter, body) => Promise.resolve({
+            frontMatter: {
+                locks: {
+                    held: (frontMatter.locks?.held ?? []).filter((item) => item !== resource)
+                }
+            },
+            body
+        }));
+        if (this.port.collisionQueueService) {
+            await this.port.collisionQueueService.reDriveBlockedQueue().catch(() => ({
+                data: { processed: 0, retried: 0, still_blocked: 0 }
+            }));
+        }
+        return {
+            data: {
+                resource,
+                feature_id: featureId,
+                released: true
+            }
+        };
+    }
+    async renewLeases(featureIds) {
+        const policy = this.port.getPolicySnapshot();
+        const set = new Set(featureIds);
+        await this.port.withIndexLock(async () => {
+            const index = await this.port.readIndex();
+            let changed = false;
+            for (const [resource, lease] of Object.entries(index.lock_leases)) {
+                if (!lease || !set.has(lease.holder)) {
+                    continue;
+                }
+                index.lock_leases[resource] = {
+                    ...lease,
+                    expires_at: new Date(Date.now() + policy.locks.lease_ttl_seconds * 1000).toISOString()
+                };
+                changed = true;
+            }
+            if (changed) {
+                index.version += 1;
+                index.updated_at = nowIso();
+                await this.port.writeIndex(index);
+            }
+        });
+    }
+    async recoverFromState() {
+        const index = await this.port.readIndex();
+        const staleFeatures = [];
+        await this.port.withIndexLock(async () => {
+            const current = await this.port.readIndex();
+            for (const [resource, lease] of Object.entries(current.lock_leases)) {
+                if (!lease) {
+                    continue;
+                }
+                if (new Date(lease.expires_at).getTime() < Date.now()) {
+                    const holder = lease.holder;
+                    if (typeof holder === 'string' && holder.length > 0) {
+                        staleFeatures.push(holder);
+                    }
+                    current.lock_leases[resource] = null;
+                    current.locks[resource] = null;
+                }
+            }
+            if (staleFeatures.length > 0) {
+                current.version += 1;
+                current.updated_at = nowIso();
+                await this.port.writeIndex(current);
+            }
+        });
+        for (const featureId of normalizeSet(staleFeatures)) {
+            const statePath = this.port.statePath(featureId);
+            if (!(await pathExists(statePath))) {
+                continue;
+            }
+            await this.port.updateState(featureId, null, (frontMatter, body) => Promise.resolve({
+                frontMatter: {
+                    status: STATUS.BLOCKED,
+                    status_reason: 'Lease expired and was reclaimed'
+                },
+                body
+            }));
+        }
+        return {
+            data: {
+                recovered: true,
+                stale_features: normalizeSet(staleFeatures),
+                active: index.active
+            }
+        };
+    }
+}
+//# sourceMappingURL=lock-service.js.map

package/dist/apps/control-plane/application/services/lock-service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"lock-service.js","sourceRoot":"","sources":["../../../../../apps/control-plane/src/application/services/lock-service.ts"],"names":[],"mappings":"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"}

package/dist/apps/control-plane/application/services/merge-service.d.ts

@@ -0,0 +1,33 @@
+type AnyRecord = Record<string, any>;
+type StateUpdater = (frontMatter: AnyRecord, body: string) => Promise<{
+    frontMatter?: AnyRecord;
+    body?: string;
+}>;
+export interface MergeServicePort {
+    getRepoRoot(): string;
+    getPolicySnapshot(): AnyRecord;
+    featurePath(featureId: string): string;
+    readState(featureId: string): Promise<{
+        frontMatter: AnyRecord;
+        body: string;
+    }>;
+    worktreePath(featureId: string): string;
+    updateState(featureId: string, expectedVersion: number | null, updater: StateUpdater): Promise<AnyRecord>;
+    locksRelease(resource: string, featureId: string): Promise<unknown>;
+    withIndexLock<T>(operation: () => Promise<T>): Promise<T>;
+    readIndex(): Promise<AnyRecord>;
+    writeIndex(index: AnyRecord): Promise<void>;
+}
+export declare class MergeService {
+    private readonly port;
+    constructor(port: MergeServicePort);
+    featureReadyToMerge(featureId: string, commitMessage: string, mergeStrategy: string, userApprovalToken: string | null): Promise<{
+        data: {
+            feature_id: string;
+            merge_sha: string;
+            merge_strategy: string;
+            status: string;
+        };
+    }>;
+}
+export {};

package/dist/apps/control-plane/application/services/merge-service.js

@@ -0,0 +1,194 @@
+import fs from 'node:fs/promises';
+import { nowIso } from '../../core/fs.js';
+import { runGit } from '../../core/git.js';
+import { ERROR_CODES } from '../../core/error-codes.js';
+import { fail } from '../../core/response.js';
+import { GATE_RESULT, STATUS } from '../../core/constants.js';
+function normalizeSet(array) {
+    return [...new Set(array)].sort((a, b) => a.localeCompare(b));
+}
+function readHeldLocks(frontMatter) {
+    const locks = frontMatter?.locks && typeof frontMatter.locks === 'object' ? frontMatter.locks : {};
+    const held = Array.isArray(locks.held) ? locks.held : [];
+    return held.filter((item) => typeof item === 'string');
+}
+function asRecord(value) {
+    return value && typeof value === 'object' ? value : {};
+}
+function asArray(value) {
+    return Array.isArray(value) ? value : [];
+}
+export class MergeService {
+    port;
+    constructor(port) {
+        this.port = port;
+    }
+    async featureReadyToMerge(featureId, commitMessage, mergeStrategy, userApprovalToken) {
+        const policy = this.port.getPolicySnapshot();
+        const state = await this.port.readState(featureId);
+        if (!policy.merge_policy.allowed_strategies.includes(mergeStrategy)) {
+            throw {
+                normalizedResponse: fail(ERROR_CODES.MERGE_DISABLED, 'Merge strategy is not allowed by policy', {
+                    merge_strategy: mergeStrategy,
+                    retryable: false,
+                    requires_human: true
+                })
+            };
+        }
+        if (policy.merge_policy.require_user_approval && !userApprovalToken) {
+            throw {
+                normalizedResponse: fail(ERROR_CODES.USER_APPROVAL_REQUIRED, 'User approval token is required', {
+                    retryable: false,
+                    requires_human: true
+                })
+            };
+        }
+        if (state.frontMatter.status !== STATUS.READY_TO_MERGE) {
+            throw {
+                normalizedResponse: fail(ERROR_CODES.INVALID_STATUS_TRANSITION, 'Feature must be ready_to_merge before merge', {
+                    current_status: state.frontMatter.status,
+                    retryable: false,
+                    requires_human: true
+                })
+            };
+        }
+        const requiredModes = [...policy.required_modes, policy.required_merge_mode];
+        for (const mode of requiredModes) {
+            if (state.frontMatter.gates?.[mode] !== GATE_RESULT.PASS) {
+                throw {
+                    normalizedResponse: fail(ERROR_CODES.MERGE_DISABLED, 'Required gate mode has not passed', {
+                        mode,
+                        retryable: true,
+                        requires_human: false
+                    })
+                };
+            }
+        }
+        const repoRoot = this.port.getRepoRoot();
+        const featureWorktree = this.port.worktreePath(featureId);
+        const commitResult = await runGit(repoRoot, ['add', '-A'], { cwd: featureWorktree });
+        if (commitResult.code !== 0) {
+            throw {
+                normalizedResponse: fail(ERROR_CODES.GIT_FAILURE, 'Failed to stage changes before merge', {
+                    stderr: commitResult.stderr,
+                    retryable: true,
+                    requires_human: false
+                })
+            };
+        }
+        const commit = await runGit(repoRoot, ['commit', '-m', commitMessage], { cwd: featureWorktree });
+        if (commit.code !== 0 && !commit.stderr.includes('nothing to commit')) {
+            throw {
+                normalizedResponse: fail(ERROR_CODES.GIT_FAILURE, 'Failed to commit feature branch', {
+                    stderr: commit.stderr,
+                    retryable: true,
+                    requires_human: false
+                })
+            };
+        }
+        const baseBranch = policy.worktree.base_branch;
+        const checkoutBase = await runGit(repoRoot, ['checkout', baseBranch]);
+        if (checkoutBase.code !== 0) {
+            throw {
+                normalizedResponse: fail(ERROR_CODES.GIT_FAILURE, 'Failed to checkout base branch for merge', {
+                    stderr: checkoutBase.stderr,
+                    retryable: true,
+                    requires_human: true
+                })
+            };
+        }
+        let merge;
+        if (mergeStrategy === 'merge_commit') {
+            merge = await runGit(repoRoot, ['merge', '--no-ff', featureId, '-m', `Merge feature ${featureId}`]);
+        }
+        else if (mergeStrategy === 'squash') {
+            merge = await runGit(repoRoot, ['merge', '--squash', featureId]);
+            if (merge.code === 0) {
+                merge = await runGit(repoRoot, ['commit', '-m', `Squash merge ${featureId}`]);
+            }
+        }
+        else {
+            const rebase = await runGit(repoRoot, ['rebase', baseBranch], { cwd: featureWorktree });
+            if (rebase.code !== 0) {
+                throw {
+                    normalizedResponse: fail(ERROR_CODES.GIT_FAILURE, 'Rebase failed before merge', {
+                        stderr: rebase.stderr,
+                        retryable: true,
+                        requires_human: true
+                    })
+                };
+            }
+            merge = await runGit(repoRoot, ['merge', '--ff-only', featureId]);
+        }
+        if (merge.code !== 0) {
+            throw {
+                normalizedResponse: fail(ERROR_CODES.GIT_FAILURE, 'Merge failed', {
+                    stderr: merge.stderr,
+                    retryable: true,
+                    requires_human: true
+                })
+            };
+        }
+        const mergeShaResult = await runGit(repoRoot, ['rev-parse', 'HEAD']);
+        const mergeSha = mergeShaResult.stdout.trim();
+        await this.port.updateState(featureId, state.frontMatter.version, (frontMatter, body) => Promise.resolve({
+            frontMatter: {
+                status: STATUS.MERGED,
+                status_reason: `Merged by strategy ${mergeStrategy}`,
+                evidence: {
+                    ...(frontMatter.evidence ?? {}),
+                    merge_sha: mergeSha,
+                    merge_strategy: mergeStrategy,
+                    merge_at: nowIso()
+                }
+            },
+            body: `${body}\n\n## Merge\n\nMerged at ${nowIso()} as ${mergeSha}.\n`
+        }));
+        const heldLocks = [...readHeldLocks(state.frontMatter)];
+        for (const resource of heldLocks) {
+            await this.port.locksRelease(resource, featureId);
+        }
+        await this.port.withIndexLock(async () => {
+            const index = await this.port.readIndex();
+            index.active = normalizeSet(asArray(index.active).filter((id) => id !== featureId));
+            index.blocked = normalizeSet(asArray(index.blocked).filter((id) => id !== featureId));
+            index.merged = normalizeSet([...asArray(index.merged), featureId]);
+            const blockedQueue = asArray(index.blocked_queue);
+            index.blocked_queue = blockedQueue.filter((entry) => asRecord(entry).feature_id !== featureId);
+            const locks = asRecord(index.locks);
+            for (const [resource, holder] of Object.entries(locks)) {
+                if (holder === featureId) {
+                    locks[resource] = null;
+                }
+            }
+            index.locks = locks;
+            const lockLeases = asRecord(index.lock_leases);
+            for (const [resource, lease] of Object.entries(lockLeases)) {
+                if (asRecord(lease).holder === featureId) {
+                    lockLeases[resource] = null;
+                }
+            }
+            index.lock_leases = lockLeases;
+            const runtimeSessions = asRecord(index.runtime_sessions);
+            const featureSessions = asRecord(runtimeSessions.feature_sessions);
+            if (Object.prototype.hasOwnProperty.call(featureSessions, featureId)) {
+                delete featureSessions[featureId];
+            }
+            runtimeSessions.feature_sessions = featureSessions;
+            index.runtime_sessions = runtimeSessions;
+            index.version += 1;
+            index.updated_at = nowIso();
+            await this.port.writeIndex(index);
+        });
+        await fs.rm(this.port.featurePath(featureId), { recursive: true, force: true });
+        return {
+            data: {
+                feature_id: featureId,
+                merge_sha: mergeSha,
+                merge_strategy: mergeStrategy,
+                status: STATUS.MERGED
+            }
+        };
+    }
+}
+//# sourceMappingURL=merge-service.js.map

package/dist/apps/control-plane/application/services/merge-service.js.map

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

package/dist/apps/control-plane/application/services/patch-service.d.ts

@@ -0,0 +1,39 @@
+import { parseUnifiedDiff } from '../../core/patch.js';
+type AnyRecord = Record<string, any>;
+type StateUpdater = (frontMatter: AnyRecord, body: string) => Promise<{
+    frontMatter?: AnyRecord;
+    body?: string;
+}>;
+export interface PatchServicePort {
+    getRepoRoot(): string;
+    getPolicySnapshot(): AnyRecord;
+    getGatesConfig(): AnyRecord;
+    planPath(featureId: string): string;
+    qaIndexPath(featureId: string): string;
+    worktreePath(featureId: string): string;
+    readState(featureId: string): Promise<{
+        frontMatter: AnyRecord;
+    }>;
+    validateSchema(schemaName: string, value: unknown): Promise<{
+        valid: boolean;
+        errors?: unknown;
+    }>;
+    updateState(featureId: string, expectedVersion: number | null, updater: StateUpdater): Promise<AnyRecord>;
+}
+export declare class PatchService {
+    private readonly port;
+    constructor(port: PatchServicePort);
+    loadAcceptedPlan(featureId: string): Promise<AnyRecord | null>;
+    requiredResourcesForPlan(plan: AnyRecord): string[];
+    assertPlanLocksHeld(featureId: string, plan: AnyRecord): Promise<void>;
+    validatePatchPaths(featureId: string, parsedDiff: ReturnType<typeof parseUnifiedDiff>, plan: AnyRecord | null): Promise<string[]>;
+    repoApplyPatch(featureId: string, unifiedDiff: string): Promise<{
+        data: {
+            feature_id: string;
+            changed_files: string[];
+            status_porcelain: string[];
+            qa_index_version: number;
+        };
+    }>;
+}
+export {};