@telora/daemon 0.12.33

package/dist/git-branch.d.ts

@@ -0,0 +1,33 @@
+/**
+ * Branch management utilities for the git subsystem.
+ *
+ * Handles branch existence checks, default branch detection,
+ * integration branch creation, and branch deletion.
+ *
+ * Uses daemon-core's branchExists for the local-only check and layers
+ * a remote-branch fallback on top for the daemon's broader needs.
+ */
+import type { DaemonConfig } from './types.js';
+/**
+ * Check if a branch exists (locally or remotely).
+ *
+ * Delegates to daemon-core's branchExists for the local check, then
+ * falls back to a remote branch lookup. The daemon needs both because
+ * worktree creation and integration-branch setup reference branches
+ * that may only exist on the remote.
+ */
+export declare function branchExists(branchName: string, repoPath: string): boolean;
+/**
+ * Get the default branch (main or master).
+ */
+export declare function getDefaultBranch(repoPath: string): string;
+/**
+ * Ensure the integration branch exists.
+ * Creates it from the default branch (main/master) if it doesn't exist.
+ */
+export declare function ensureIntegrationBranch(config: DaemonConfig): Promise<void>;
+/**
+ * Delete a branch after successful merge to integration.
+ */
+export declare function deleteBranch(branchName: string, repoPath: string): void;
+//# sourceMappingURL=git-branch.d.ts.map

package/dist/git-branch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"git-branch.d.ts","sourceRoot":"","sources":["../src/git-branch.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAO/C;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAgB1E;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAiBzD;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAoCjF;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAUvE"}

package/dist/git-branch.js

@@ -0,0 +1,88 @@
+/**
+ * Branch management utilities for the git subsystem.
+ *
+ * Handles branch existence checks, default branch detection,
+ * integration branch creation, and branch deletion.
+ *
+ * Uses daemon-core's branchExists for the local-only check and layers
+ * a remote-branch fallback on top for the daemon's broader needs.
+ */
+import { branchExists as localBranchExists, runGit, } from '@telora/daemon-core';
+import { runGitSync } from './git-types.js';
+/**
+ * Check if a branch exists (locally or remotely).
+ *
+ * Delegates to daemon-core's branchExists for the local check, then
+ * falls back to a remote branch lookup. The daemon needs both because
+ * worktree creation and integration-branch setup reference branches
+ * that may only exist on the remote.
+ */
+export function branchExists(branchName, repoPath) {
+    // Check local branches via daemon-core
+    if (localBranchExists(branchName, repoPath)) {
+        return true;
+    }
+    // Check remote branches
+    const remoteResult = runGit(['branch', '-r', '--list', `origin/${branchName}`], repoPath);
+    if (remoteResult.success && remoteResult.output.includes(`origin/${branchName}`)) {
+        return true;
+    }
+    return false;
+}
+/**
+ * Get the default branch (main or master).
+ */
+export function getDefaultBranch(repoPath) {
+    // Try to get the default branch from remote HEAD
+    const result = runGitSync(['symbolic-ref', 'refs/remotes/origin/HEAD', '--short'], repoPath);
+    if (result.success) {
+        // Result is like "origin/main", extract just the branch name
+        const parts = result.output.split('/');
+        return parts[parts.length - 1];
+    }
+    // Fallback: check if main exists, otherwise assume master
+    if (branchExists('main', repoPath)) {
+        return 'main';
+    }
+    return 'master';
+}
+/**
+ * Ensure the integration branch exists.
+ * Creates it from the default branch (main/master) if it doesn't exist.
+ */
+export async function ensureIntegrationBranch(config) {
+    const { repoPath, integrationBranch } = config;
+    if (branchExists(integrationBranch, repoPath)) {
+        console.log(`Integration branch '${integrationBranch}' exists`);
+        return;
+    }
+    const defaultBranch = getDefaultBranch(repoPath);
+    console.log(`Creating integration branch '${integrationBranch}' from '${defaultBranch}'...`);
+    // Create the integration branch from the default branch
+    const result = runGitSync(['branch', integrationBranch, defaultBranch], repoPath);
+    if (!result.success) {
+        throw new Error(`Failed to create integration branch: ${result.error}`);
+    }
+    // Push the integration branch to remote if origin exists
+    const pushResult = runGitSync(['push', '-u', 'origin', integrationBranch], repoPath);
+    if (pushResult.success) {
+        console.log(`Pushed integration branch to origin`);
+    }
+    else {
+        console.log(`Note: Could not push integration branch to origin (may not have remote)`);
+    }
+}
+/**
+ * Delete a branch after successful merge to integration.
+ */
+export function deleteBranch(branchName, repoPath) {
+    // Delete local branch
+    const localResult = runGitSync(['branch', '-d', branchName], repoPath);
+    if (!localResult.success) {
+        // Try force delete if normal delete fails
+        runGitSync(['branch', '-D', branchName], repoPath);
+    }
+    // Delete remote branch (if exists)
+    runGitSync(['push', 'origin', '--delete', branchName], repoPath);
+}
+//# sourceMappingURL=git-branch.js.map

package/dist/git-branch.js.map

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

package/dist/git-integration.d.ts

@@ -0,0 +1,27 @@
+/**
+ * Integration branch management for the git subsystem.
+ *
+ * Handles syncing integration with main so agents start from the latest code.
+ * The daemon never touches main directly — the user merges integration into main.
+ */
+import type { DaemonConfig } from './types.js';
+/**
+ * Sync the integration branch with main so agents start from the latest code.
+ *
+ * Uses a pre-flight check to avoid taking the merge lock when integration
+ * is already up-to-date with main. This prevents spawn operations from
+ * contending with merge completions in the common case.
+ *
+ * Steps:
+ *   1. Fetch origin to get latest remote state
+ *   2. Check if integration already contains main (skip if so)
+ *   3. Acquire merge lock only if sync is needed
+ *   4. Check out integration, merge main, push, restore
+ *
+ * Uses merge (not rebase) to preserve in-progress agent branch references.
+ */
+export declare function syncIntegrationWithMain(config: DaemonConfig): Promise<{
+    success: boolean;
+    error?: string;
+}>;
+//# sourceMappingURL=git-integration.d.ts.map

package/dist/git-integration.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"git-integration.d.ts","sourceRoot":"","sources":["../src/git-integration.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAM/C;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA2E/C"}

package/dist/git-integration.js

@@ -0,0 +1,82 @@
+/**
+ * Integration branch management for the git subsystem.
+ *
+ * Handles syncing integration with main so agents start from the latest code.
+ * The daemon never touches main directly — the user merges integration into main.
+ */
+import { runGitSync } from './git-types.js';
+import { withMergeLock } from './git-merge-lock.js';
+import { getDefaultBranch } from './git-branch.js';
+import { getMergeWorktreePath } from './worktree.js';
+/**
+ * Sync the integration branch with main so agents start from the latest code.
+ *
+ * Uses a pre-flight check to avoid taking the merge lock when integration
+ * is already up-to-date with main. This prevents spawn operations from
+ * contending with merge completions in the common case.
+ *
+ * Steps:
+ *   1. Fetch origin to get latest remote state
+ *   2. Check if integration already contains main (skip if so)
+ *   3. Acquire merge lock only if sync is needed
+ *   4. Check out integration, merge main, push, restore
+ *
+ * Uses merge (not rebase) to preserve in-progress agent branch references.
+ */
+export async function syncIntegrationWithMain(config) {
+    const { repoPath, integrationBranch } = config;
+    const defaultBranch = getDefaultBranch(repoPath);
+    // No remote — nothing to sync from, local integration is the source of truth.
+    const hasOrigin = runGitSync(['remote', 'get-url', 'origin'], repoPath, { timeoutMs: 3_000 }).success;
+    if (!hasOrigin) {
+        return { success: true };
+    }
+    // Pre-flight: fetch and check if sync is actually needed.
+    // This runs outside the merge lock to avoid contention.
+    const fetchResult = runGitSync(['fetch', 'origin'], repoPath);
+    if (!fetchResult.success) {
+        return { success: false, error: `Fetch failed: ${fetchResult.error}` };
+    }
+    // Check if integration already contains all of origin/main.
+    // merge-base --is-ancestor returns 0 if main is ancestor of integration.
+    const ancestorCheck = runGitSync(['merge-base', '--is-ancestor', `origin/${defaultBranch}`, integrationBranch], repoPath);
+    if (ancestorCheck.success) {
+        // Integration already up-to-date with main -- no lock needed
+        return { success: true };
+    }
+    // Sync is needed -- acquire the merge lock
+    return withMergeLock(async () => {
+        const mwt = getMergeWorktreePath(config);
+        // Re-check after acquiring lock (another caller may have synced while we waited)
+        const recheck = runGitSync(['merge-base', '--is-ancestor', `origin/${defaultBranch}`, integrationBranch], repoPath);
+        if (recheck.success) {
+            return { success: true };
+        }
+        // Checkout integration branch in the merge worktree
+        const checkoutResult = runGitSync(['checkout', integrationBranch], mwt);
+        if (!checkoutResult.success) {
+            return { success: false, error: `Checkout integration failed: ${checkoutResult.error}` };
+        }
+        // Pull latest integration from remote (in case another daemon pushed)
+        runGitSync(['pull', 'origin', integrationBranch], mwt);
+        // Merge main into integration
+        const mergeResult = runGitSync(['merge', `origin/${defaultBranch}`, '-m', `Sync integration with ${defaultBranch}`], mwt);
+        if (!mergeResult.success) {
+            // Merge conflict during sync -- abort and report
+            runGitSync(['merge', '--abort'], mwt);
+            return {
+                success: false,
+                error: `Sync merge conflict (${defaultBranch} -> ${integrationBranch}): ${mergeResult.error}`,
+            };
+        }
+        // Push updated integration to origin
+        const pushResult = runGitSync(['push', 'origin', integrationBranch], mwt);
+        if (!pushResult.success) {
+            console.warn(`Could not push synced integration to origin: ${pushResult.error}`);
+            // Non-fatal -- local sync still succeeded
+        }
+        console.log(`Synced ${integrationBranch} with ${defaultBranch}`);
+        return { success: true };
+    }, 'syncIntegrationWithMain');
+}
+//# sourceMappingURL=git-integration.js.map

package/dist/git-integration.js.map

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

package/dist/git-merge-helpers.d.ts

@@ -0,0 +1,48 @@
+/**
+ * Git merge helper functions.
+ *
+ * Low-level helpers for merge operations: remote detection, conflict
+ * extraction, rollback, untracked file handling, and push failure recovery.
+ */
+import { type MergeResult } from './git-types.js';
+import { type CorruptionDetails } from './git-merge-lock.js';
+/**
+ * Returns true if the repo at repoPath has an 'origin' remote configured.
+ * Used to gate all network operations so the daemon works in remote-less repos.
+ */
+export declare function hasOriginRemote(repoPath: string): boolean;
+/**
+ * Extract the list of conflicted files from git status.
+ * Returns an empty array if the command fails or there are no conflicts.
+ */
+export declare function extractConflictedFiles(repoPath: string): string[];
+/**
+ * Hard-reset the current branch to a given ref.
+ * Returns whether the rollback succeeded.
+ */
+export declare function rollbackToRef(repoPath: string, ref: string): boolean;
+interface PushFailureRollbackParams {
+    repoPath: string;
+    branch: string;
+    preMergeRef: string;
+    pushError: string;
+    sourceBranch: string;
+    targetBranch: string;
+    onRollbackFailure?: (details: CorruptionDetails) => void;
+}
+/**
+ * Handle a push failure with rollback. If rollback also fails, marks the
+ * branch as corrupt and returns a result indicating the failure.
+ */
+export declare function handlePushFailureWithRollback(params: PushFailureRollbackParams): MergeResult;
+/**
+ * Handle untracked files that block a merge.
+ *
+ * When agents create new files (e.g. migrations) that also exist as
+ * untracked files in the main repo working directory, git refuses to
+ * merge. This helper parses the error output, removes the blocking
+ * files, and returns true if blocking files were cleaned.
+ */
+export declare function handleUntrackedFilesBlockingMerge(repoPath: string, errorOutput: string): boolean;
+export {};
+//# sourceMappingURL=git-merge-helpers.d.ts.map

package/dist/git-merge-helpers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"git-merge-helpers.d.ts","sourceRoot":"","sources":["../src/git-merge-helpers.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAc,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EAA0B,KAAK,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAErF;;;GAGG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAEzD;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,CAMjE;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAGpE;AAED,UAAU,yBAAyB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,IAAI,CAAC;CAC1D;AAED;;;GAGG;AACH,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,yBAAyB,GAAG,WAAW,CA8C5F;AAED;;;;;;;GAOG;AACH,wBAAgB,iCAAiC,CAC/C,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,GAClB,OAAO,CA6BT"}

package/dist/git-merge-helpers.js

@@ -0,0 +1,105 @@
+/**
+ * Git merge helper functions.
+ *
+ * Low-level helpers for merge operations: remote detection, conflict
+ * extraction, rollback, untracked file handling, and push failure recovery.
+ */
+import { runGitSync } from './git-types.js';
+import { markIntegrationCorrupt } from './git-merge-lock.js';
+/**
+ * Returns true if the repo at repoPath has an 'origin' remote configured.
+ * Used to gate all network operations so the daemon works in remote-less repos.
+ */
+export function hasOriginRemote(repoPath) {
+    return runGitSync(['remote', 'get-url', 'origin'], repoPath, { timeoutMs: 3_000 }).success;
+}
+/**
+ * Extract the list of conflicted files from git status.
+ * Returns an empty array if the command fails or there are no conflicts.
+ */
+export function extractConflictedFiles(repoPath) {
+    const statusResult = runGitSync(['diff', '--name-only', '--diff-filter=U'], repoPath);
+    if (!statusResult.success) {
+        return [];
+    }
+    return statusResult.output.split('\n').filter(Boolean);
+}
+/**
+ * Hard-reset the current branch to a given ref.
+ * Returns whether the rollback succeeded.
+ */
+export function rollbackToRef(repoPath, ref) {
+    const result = runGitSync(['reset', '--hard', ref], repoPath);
+    return result.success;
+}
+/**
+ * Handle a push failure with rollback. If rollback also fails, marks the
+ * branch as corrupt and returns a result indicating the failure.
+ */
+export function handlePushFailureWithRollback(params) {
+    const { repoPath, branch, preMergeRef, pushError, sourceBranch, targetBranch, onRollbackFailure } = params;
+    console.error(`Push to origin failed for ${branch}: ${pushError}`);
+    const rollbackSuccess = rollbackToRef(repoPath, preMergeRef);
+    if (rollbackSuccess) {
+        console.log(`Rolled back local merge to ${preMergeRef.slice(0, 8)}`);
+        return {
+            success: false,
+            error: `Push failed (local merge rolled back): ${pushError}. Branch ${sourceBranch} preserved for retry.`,
+            sourceBranch,
+            targetBranch,
+        };
+    }
+    // Rollback also failed -- mark as corrupt
+    const currentHeadResult = runGitSync(['rev-parse', 'HEAD'], repoPath);
+    const currentHead = currentHeadResult.success ? currentHeadResult.output : 'unknown';
+    const details = {
+        branch,
+        attemptedRollbackRef: preMergeRef,
+        currentHead,
+    };
+    markIntegrationCorrupt(details);
+    console.error(`[merge-lock] CRITICAL: Push failed AND rollback failed for "${branch}". ` +
+        `Branch is in a corrupt state. Attempted rollback to ${preMergeRef}, ` +
+        `current HEAD: ${currentHead}. All further merge operations will be rejected ` +
+        `until manual recovery and daemon restart.`);
+    if (onRollbackFailure) {
+        onRollbackFailure(details);
+    }
+    return {
+        success: false,
+        error: `Push failed AND rollback failed. Branch "${branch}" is corrupt. ` +
+            `Manual recovery required: git reset --hard origin/${branch}`,
+        sourceBranch,
+        targetBranch,
+        rollbackFailed: true,
+    };
+}
+/**
+ * Handle untracked files that block a merge.
+ *
+ * When agents create new files (e.g. migrations) that also exist as
+ * untracked files in the main repo working directory, git refuses to
+ * merge. This helper parses the error output, removes the blocking
+ * files, and returns true if blocking files were cleaned.
+ */
+export function handleUntrackedFilesBlockingMerge(repoPath, errorOutput) {
+    const isUntrackedBlock = errorOutput.includes('untracked working tree files would be overwritten') ||
+        errorOutput.includes('would be overwritten by merge');
+    if (!isUntrackedBlock) {
+        return false;
+    }
+    const lines = errorOutput.split('\n');
+    const blockingFiles = lines
+        .map((l) => l.trim())
+        .filter((l) => l &&
+        !l.startsWith('error:') &&
+        !l.startsWith('Please') &&
+        !l.startsWith('Aborting'));
+    if (blockingFiles.length === 0) {
+        return false;
+    }
+    console.log(`Removing ${blockingFiles.length} untracked file(s) blocking merge: ${blockingFiles.join(', ')}`);
+    runGitSync(['clean', '-f', '--', ...blockingFiles], repoPath);
+    return true;
+}
+//# sourceMappingURL=git-merge-helpers.js.map

package/dist/git-merge-helpers.js.map

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

package/dist/git-merge-lock.d.ts

@@ -0,0 +1,67 @@
+/**
+ * Merge lock and corruption state management for the git subsystem.
+ *
+ * Provides an in-process mutex to serialize operations that checkout/modify
+ * the integration or main branches. Only one such operation can run at a
+ * time since the daemon is a single Node.js process sharing one repo.
+ */
+/**
+ * Error thrown when the merge lock cannot be acquired within the timeout.
+ */
+export declare class MergeLockTimeoutError extends Error {
+    constructor(label: string, timeoutMs: number);
+}
+/** Details of the corrupt integration branch, if any. */
+export interface CorruptionDetails {
+    branch: string;
+    attemptedRollbackRef: string;
+    currentHead: string;
+}
+/**
+ * Error thrown when the integration branch is in a corrupt state.
+ */
+export declare class IntegrationCorruptError extends Error {
+    constructor(details: CorruptionDetails);
+}
+/**
+ * Check if the integration branch is in a corrupt state.
+ */
+export declare function isIntegrationCorrupt(): boolean;
+/**
+ * Get corruption details if the integration branch is corrupt.
+ */
+export declare function getCorruptionDetails(): CorruptionDetails | null;
+/**
+ * Reset the corruption flag. Exported for testing and manual recovery.
+ */
+export declare function resetCorruptionFlag(): void;
+/**
+ * Mark the integration branch as corrupt. Called by merge operations
+ * when push fails and rollback also fails.
+ */
+export declare function markIntegrationCorrupt(details: CorruptionDetails): void;
+/**
+ * Configure merge lock timeouts. Called during daemon initialization.
+ */
+export declare function configureMergeLock(config: {
+    timeoutMs: number;
+    contentionWarningMs: number;
+}): void;
+/**
+ * Acquire the merge lock, execute `fn`, then release.
+ * Callers are queued in FIFO order.
+ *
+ * Features:
+ * - Configurable acquisition timeout (rejects with MergeLockTimeoutError)
+ * - Contention logging with caller labels and wait durations
+ * - Rejects if integration branch is in corrupt state
+ *
+ * @param fn The function to execute while holding the lock
+ * @param label Optional caller label for contention logging (e.g. "mergeToIntegration:my-delivery")
+ */
+export declare function withMergeLock<T>(fn: () => Promise<T>, label?: string): Promise<T>;
+/**
+ * Reset the merge lock state. Only for testing.
+ */
+export declare function resetMergeLock(): void;
+//# sourceMappingURL=git-merge-lock.d.ts.map

package/dist/git-merge-lock.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"git-merge-lock.d.ts","sourceRoot":"","sources":["../src/git-merge-lock.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAOH;;GAEG;AACH,qBAAa,qBAAsB,SAAQ,KAAK;gBAClC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;CAO7C;AASD,yDAAyD;AACzD,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,oBAAoB,EAAE,MAAM,CAAC;IAC7B,WAAW,EAAE,MAAM,CAAC;CACrB;AAID;;GAEG;AACH,qBAAa,uBAAwB,SAAQ,KAAK;gBACpC,OAAO,EAAE,iBAAiB;CAUvC;AAED;;GAEG;AACH,wBAAgB,oBAAoB,IAAI,OAAO,CAE9C;AAED;;GAEG;AACH,wBAAgB,oBAAoB,IAAI,iBAAiB,GAAG,IAAI,CAE/D;AAED;;GAEG;AACH,wBAAgB,mBAAmB,IAAI,IAAI,CAG1C;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,iBAAiB,GAAG,IAAI,CAGvE;AAUD;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,mBAAmB,EAAE,MAAM,CAAC;CAC7B,GAAG,IAAI,CAEP;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,aAAa,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAAE,KAAK,SAAY,GAAG,OAAO,CAAC,CAAC,CAAC,CAgEpF;AAED;;GAEG;AACH,wBAAgB,cAAc,IAAI,IAAI,CAKrC"}

package/dist/git-merge-lock.js

@@ -0,0 +1,157 @@
+/**
+ * Merge lock and corruption state management for the git subsystem.
+ *
+ * Provides an in-process mutex to serialize operations that checkout/modify
+ * the integration or main branches. Only one such operation can run at a
+ * time since the daemon is a single Node.js process sharing one repo.
+ */
+// ── Merge lock ─────────────────────────────────────────────────────
+let mergeLockPromise = Promise.resolve();
+let mergeLockQueueDepth = 0;
+/**
+ * Error thrown when the merge lock cannot be acquired within the timeout.
+ */
+export class MergeLockTimeoutError extends Error {
+    constructor(label, timeoutMs) {
+        super(`Merge lock acquisition timed out after ${timeoutMs}ms for "${label}". ` +
+            `Another operation may be holding the lock.`);
+        this.name = 'MergeLockTimeoutError';
+    }
+}
+// ── Integration branch corrupt state ─────────────────────────────
+// Set when a push fails AND the rollback also fails, leaving the
+// local branch in a state that doesn't match remote. While set,
+// all merge operations are rejected until daemon restart or manual fix.
+let integrationBranchCorrupt = false;
+let corruptionDetails = null;
+/**
+ * Error thrown when the integration branch is in a corrupt state.
+ */
+export class IntegrationCorruptError extends Error {
+    constructor(details) {
+        super(`Integration branch "${details.branch}" is in a corrupt state. ` +
+            `Attempted rollback to ${details.attemptedRollbackRef} failed. ` +
+            `Current HEAD: ${details.currentHead}. ` +
+            `Manual recovery required (e.g. git reset --hard origin/${details.branch}). ` +
+            `Restart daemon after fixing.`);
+        this.name = 'IntegrationCorruptError';
+    }
+}
+/**
+ * Check if the integration branch is in a corrupt state.
+ */
+export function isIntegrationCorrupt() {
+    return integrationBranchCorrupt;
+}
+/**
+ * Get corruption details if the integration branch is corrupt.
+ */
+export function getCorruptionDetails() {
+    return corruptionDetails;
+}
+/**
+ * Reset the corruption flag. Exported for testing and manual recovery.
+ */
+export function resetCorruptionFlag() {
+    integrationBranchCorrupt = false;
+    corruptionDetails = null;
+}
+/**
+ * Mark the integration branch as corrupt. Called by merge operations
+ * when push fails and rollback also fails.
+ */
+export function markIntegrationCorrupt(details) {
+    integrationBranchCorrupt = true;
+    corruptionDetails = details;
+}
+/**
+ * Merge lock configuration. Must be set before first use via configureMergeLock().
+ */
+let mergeLockConfig = {
+    timeoutMs: 300000, // 5 minutes
+    contentionWarningMs: 30000, // 30 seconds
+};
+/**
+ * Configure merge lock timeouts. Called during daemon initialization.
+ */
+export function configureMergeLock(config) {
+    mergeLockConfig = { ...config };
+}
+/**
+ * Acquire the merge lock, execute `fn`, then release.
+ * Callers are queued in FIFO order.
+ *
+ * Features:
+ * - Configurable acquisition timeout (rejects with MergeLockTimeoutError)
+ * - Contention logging with caller labels and wait durations
+ * - Rejects if integration branch is in corrupt state
+ *
+ * @param fn The function to execute while holding the lock
+ * @param label Optional caller label for contention logging (e.g. "mergeToIntegration:my-delivery")
+ */
+export function withMergeLock(fn, label = 'unknown') {
+    // Reject immediately if integration branch is corrupt
+    if (integrationBranchCorrupt && corruptionDetails) {
+        return Promise.reject(new IntegrationCorruptError(corruptionDetails));
+    }
+    let release;
+    const next = new Promise((resolve) => {
+        release = resolve;
+    });
+    const wait = mergeLockPromise;
+    mergeLockPromise = next;
+    const isContested = mergeLockQueueDepth > 0;
+    mergeLockQueueDepth++;
+    const enqueueTime = Date.now();
+    if (isContested) {
+        console.log(`[merge-lock] "${label}" waiting for lock (queue depth: ${mergeLockQueueDepth})`);
+    }
+    // Race the wait against a timeout
+    const timeoutMs = mergeLockConfig.timeoutMs;
+    let timedOut = false;
+    const timeoutPromise = new Promise((_resolve, reject) => {
+        const timer = setTimeout(() => {
+            timedOut = true;
+            reject(new MergeLockTimeoutError(label, timeoutMs));
+        }, timeoutMs);
+        // Don't let the timeout timer keep the process alive
+        if (timer.unref)
+            timer.unref();
+    });
+    return Promise.race([wait, timeoutPromise]).then(async () => {
+        // Lock acquired
+        mergeLockQueueDepth--;
+        const waitMs = Date.now() - enqueueTime;
+        if (waitMs > mergeLockConfig.contentionWarningMs) {
+            console.warn(`[merge-lock] WARNING: "${label}" waited ${waitMs}ms to acquire lock ` +
+                `(threshold: ${mergeLockConfig.contentionWarningMs}ms)`);
+        }
+        else if (isContested) {
+            console.log(`[merge-lock] "${label}" acquired lock after ${waitMs}ms`);
+        }
+        try {
+            return await fn();
+        }
+        finally {
+            release();
+        }
+    }, (err) => {
+        // On timeout, release the slot so subsequent callers aren't stuck
+        mergeLockQueueDepth--;
+        if (timedOut) {
+            // Still need to wait for our turn then release, so the chain isn't broken
+            wait.then(() => { release(); });
+        }
+        throw err;
+    });
+}
+/**
+ * Reset the merge lock state. Only for testing.
+ */
+export function resetMergeLock() {
+    mergeLockPromise = Promise.resolve();
+    mergeLockQueueDepth = 0;
+    integrationBranchCorrupt = false;
+    corruptionDetails = null;
+}
+//# sourceMappingURL=git-merge-lock.js.map

package/dist/git-merge-lock.js.map

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