@telora/daemon 0.12.33

package/dist/git-state-detector.d.ts

@@ -0,0 +1,24 @@
+/**
+ * Deterministic git state detection via branch containment.
+ *
+ * Polls deliveries with a merge_commit_sha and checks whether
+ * those commits have reached integration, main, or remote branches.
+ * Updates gitState accordingly, replacing inline reportGitState calls
+ * that were scattered across agent/spawner lifecycle code.
+ *
+ * Called from the daemon poll loop alongside other periodic checks.
+ */
+import type { DaemonConfig } from './types.js';
+/**
+ * Detect and update git states for deliveries based on branch containment.
+ *
+ * For each active strategy, checks deliveries that have a mergeCommitSha.
+ * Determines the highest reachable state by checking containment in:
+ *   1. origin/<default-branch> -> pushed_to_remote
+ *   2. <default-branch>        -> merged_to_main
+ *   3. <integration-branch>    -> merged_to_integration
+ *
+ * Only updates forward (never downgrades state).
+ */
+export declare function detectGitStates(config: DaemonConfig): Promise<void>;
+//# sourceMappingURL=git-state-detector.d.ts.map

package/dist/git-state-detector.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"git-state-detector.d.ts","sourceRoot":"","sources":["../src/git-state-detector.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAY,MAAM,YAAY,CAAC;AA6CzD;;;;;;;;;;GAUG;AACH,wBAAsB,eAAe,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAoFzE"}

package/dist/git-state-detector.js

@@ -0,0 +1,122 @@
+/**
+ * Deterministic git state detection via branch containment.
+ *
+ * Polls deliveries with a merge_commit_sha and checks whether
+ * those commits have reached integration, main, or remote branches.
+ * Updates gitState accordingly, replacing inline reportGitState calls
+ * that were scattered across agent/spawner lifecycle code.
+ *
+ * Called from the daemon poll loop alongside other periodic checks.
+ */
+import { runGitSync } from './git-types.js';
+import { getDefaultBranch } from './git-branch.js';
+import { getActiveStrategies } from './queries/deliveries.js';
+import { getStrategyDeliveries } from './queries/strategies.js';
+import { reportGitState } from './queries/deliveries.js';
+/** Short timeout for containment checks to avoid blocking the poll loop. */
+const CONTAINMENT_CHECK_TIMEOUT_MS = 5_000;
+/** Track whether origin remote exists to avoid repeated fetch failures. */
+let originChecked = false;
+let originExists = false;
+/**
+ * Priority ordering for git states. Higher number = more advanced.
+ * Only update a delivery's state forward, never backward.
+ */
+const GIT_STATE_PRIORITY = {
+    'worktree_created': 0,
+    'worktree_active': 1,
+    'worktree_complete': 2,
+    'resolving_conflict': 3,
+    'merge_conflict': 3,
+    'merged_to_integration': 4,
+    'worktree_cleaned': 5,
+    'merged_to_main': 6,
+    'pushed_to_remote': 7,
+};
+/**
+ * Check if a commit SHA is an ancestor of (i.e., contained in) a branch.
+ *
+ * Uses `git merge-base --is-ancestor` which returns exit code 0 if
+ * the SHA is an ancestor of the branch tip, 1 otherwise.
+ */
+function isContainedIn(sha, branch, repoPath) {
+    const result = runGitSync(['merge-base', '--is-ancestor', sha, branch], repoPath, { timeoutMs: CONTAINMENT_CHECK_TIMEOUT_MS });
+    return result.success;
+}
+/**
+ * Detect and update git states for deliveries based on branch containment.
+ *
+ * For each active strategy, checks deliveries that have a mergeCommitSha.
+ * Determines the highest reachable state by checking containment in:
+ *   1. origin/<default-branch> -> pushed_to_remote
+ *   2. <default-branch>        -> merged_to_main
+ *   3. <integration-branch>    -> merged_to_integration
+ *
+ * Only updates forward (never downgrades state).
+ */
+export async function detectGitStates(config) {
+    const { repoPath, integrationBranch } = config;
+    // Check once whether origin remote exists; skip fetch entirely if not.
+    if (!originChecked) {
+        const remoteCheck = runGitSync(['remote', 'get-url', 'origin'], repoPath, { timeoutMs: 3_000 });
+        originExists = remoteCheck.success;
+        originChecked = true;
+        if (!originExists) {
+            console.debug('[git-state-detector] No origin remote configured -- skipping fetch');
+        }
+    }
+    // Fetch refs once before iterating (ensures consistent state)
+    if (originExists) {
+        const fetchResult = runGitSync(['fetch', '--quiet', 'origin'], repoPath, { timeoutMs: CONTAINMENT_CHECK_TIMEOUT_MS });
+        if (!fetchResult.success) {
+            console.debug('[git-state-detector] fetch failed (non-fatal):', fetchResult.error);
+        }
+    }
+    const defaultBranch = getDefaultBranch(repoPath);
+    let strategies;
+    try {
+        strategies = await getActiveStrategies(config.organizationId, config.productId);
+    }
+    catch (err) {
+        console.warn('[git-state-detector] Failed to fetch active strategies:', err.message);
+        return;
+    }
+    for (const strategy of strategies) {
+        let deliveries;
+        try {
+            deliveries = await getStrategyDeliveries(strategy.strategy_id);
+        }
+        catch (err) {
+            console.warn(`[git-state-detector] Failed to fetch deliveries for strategy ${strategy.strategy_id}:`, err.message);
+            continue;
+        }
+        for (const delivery of deliveries) {
+            if (!delivery.mergeCommitSha)
+                continue;
+            const currentPriority = GIT_STATE_PRIORITY[delivery.gitState ?? ''] ?? -1;
+            const sha = delivery.mergeCommitSha;
+            // Check highest state first: pushed_to_remote
+            if (currentPriority < GIT_STATE_PRIORITY['pushed_to_remote']) {
+                if (isContainedIn(sha, `origin/${defaultBranch}`, repoPath)) {
+                    reportGitState(delivery.id, 'pushed_to_remote').catch(err => console.warn(`[git-state-detector] pushed_to_remote failed for ${delivery.id}:`, err.message));
+                    continue;
+                }
+            }
+            // Check: merged_to_main
+            if (currentPriority < GIT_STATE_PRIORITY['merged_to_main']) {
+                if (isContainedIn(sha, defaultBranch, repoPath)) {
+                    reportGitState(delivery.id, 'merged_to_main').catch(err => console.warn(`[git-state-detector] merged_to_main failed for ${delivery.id}:`, err.message));
+                    continue;
+                }
+            }
+            // Check: merged_to_integration
+            if (currentPriority < GIT_STATE_PRIORITY['merged_to_integration']) {
+                if (isContainedIn(sha, integrationBranch, repoPath)) {
+                    reportGitState(delivery.id, 'merged_to_integration').catch(err => console.warn(`[git-state-detector] merged_to_integration failed for ${delivery.id}:`, err.message));
+                    continue;
+                }
+            }
+        }
+    }
+}
+//# sourceMappingURL=git-state-detector.js.map

package/dist/git-state-detector.js.map

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

package/dist/git-types.d.ts

@@ -0,0 +1,40 @@
+/**
+ * Shared types and utilities for the git subsystem.
+ *
+ * Core git primitives (runGit, GitResult, DEFAULT_GIT_TIMEOUT_MS, branchExists)
+ * are imported from @telora/daemon-core and re-exported with a backward-compatible
+ * wrapper (runGitSync) that accepts the daemon's RunGitSyncOptions interface.
+ */
+import { DEFAULT_GIT_TIMEOUT_MS, type GitResult } from '@telora/daemon-core';
+import type { PipelineConfig } from './types.js';
+export { DEFAULT_GIT_TIMEOUT_MS };
+export type { GitResult };
+export type MergeStrategy = PipelineConfig['ci']['mergeStrategy'];
+export interface MergeResult {
+    success: boolean;
+    error?: string;
+    /** Files that had conflicts (only set when success is false due to conflicts). */
+    conflictedFiles?: string[];
+    /** The agent branch that was being merged (for escalation context). */
+    sourceBranch?: string;
+    /** The target branch of the merge (for escalation context). */
+    targetBranch?: string;
+    /** Set when a rollback failure leaves the branch in a corrupt state. */
+    rollbackFailed?: boolean;
+    /** The resulting commit SHA after a successful merge (e.g. squash merge). */
+    commitSha?: string;
+}
+export interface RunGitSyncOptions {
+    /** Timeout in ms for the git operation. Default: 60000 (60s). */
+    timeoutMs?: number;
+}
+/**
+ * Run a git command synchronously and return the result.
+ *
+ * Backward-compatible wrapper around daemon-core's runGit that accepts
+ * the daemon's RunGitSyncOptions interface. All invocations have a
+ * configurable timeout (default 60s) to prevent the daemon from hanging
+ * indefinitely on stuck git operations.
+ */
+export declare function runGitSync(args: string[], cwd: string, options?: RunGitSyncOptions): GitResult;
+//# sourceMappingURL=git-types.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"git-types.d.ts","sourceRoot":"","sources":["../src/git-types.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAEL,sBAAsB,EACtB,KAAK,SAAS,EACf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAGjD,OAAO,EAAE,sBAAsB,EAAE,CAAC;AAClC,YAAY,EAAE,SAAS,EAAE,CAAC;AAE1B,MAAM,MAAM,aAAa,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,eAAe,CAAC,CAAC;AAElE,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,kFAAkF;IAClF,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,uEAAuE;IACvE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,+DAA+D;IAC/D,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,wEAAwE;IACxE,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,6EAA6E;IAC7E,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,iBAAiB;IAChC,iEAAiE;IACjE,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;GAOG;AACH,wBAAgB,UAAU,CACxB,IAAI,EAAE,MAAM,EAAE,EACd,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,iBAAiB,GAC1B,SAAS,CAGX"}

package/dist/git-types.js

@@ -0,0 +1,23 @@
+/**
+ * Shared types and utilities for the git subsystem.
+ *
+ * Core git primitives (runGit, GitResult, DEFAULT_GIT_TIMEOUT_MS, branchExists)
+ * are imported from @telora/daemon-core and re-exported with a backward-compatible
+ * wrapper (runGitSync) that accepts the daemon's RunGitSyncOptions interface.
+ */
+import { runGit, DEFAULT_GIT_TIMEOUT_MS, } from '@telora/daemon-core';
+// Re-export daemon-core primitives
+export { DEFAULT_GIT_TIMEOUT_MS };
+/**
+ * Run a git command synchronously and return the result.
+ *
+ * Backward-compatible wrapper around daemon-core's runGit that accepts
+ * the daemon's RunGitSyncOptions interface. All invocations have a
+ * configurable timeout (default 60s) to prevent the daemon from hanging
+ * indefinitely on stuck git operations.
+ */
+export function runGitSync(args, cwd, options) {
+    const timeoutMs = options?.timeoutMs ?? DEFAULT_GIT_TIMEOUT_MS;
+    return runGit(args, cwd, timeoutMs);
+}
+//# sourceMappingURL=git-types.js.map

package/dist/git-types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"git-types.js","sourceRoot":"","sources":["../src/git-types.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,MAAM,EACN,sBAAsB,GAEvB,MAAM,qBAAqB,CAAC;AAG7B,mCAAmC;AACnC,OAAO,EAAE,sBAAsB,EAAE,CAAC;AAyBlC;;;;;;;GAOG;AACH,MAAM,UAAU,UAAU,CACxB,IAAc,EACd,GAAW,EACX,OAA2B;IAE3B,MAAM,SAAS,GAAG,OAAO,EAAE,SAAS,IAAI,sBAAsB,CAAC;IAC/D,OAAO,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC;AACtC,CAAC"}

package/dist/git-utils.d.ts

@@ -0,0 +1,28 @@
+/**
+ * Shared git utility functions for the daemon.
+ *
+ * Consolidates branch name sanitization logic previously duplicated between
+ * spawner.ts (generateBranchName) and strategy-executor.ts (generateStrategyBranchName).
+ */
+/**
+ * Sanitize a string for safe use as a git branch name segment.
+ *
+ * Converts the input to lowercase, replaces any non-alphanumeric/hyphen characters
+ * with hyphens, collapses consecutive hyphens, strips leading/trailing hyphens,
+ * and truncates to maxLen characters (default 50).
+ */
+export declare function sanitizeGitSegment(str: string, maxLen?: number): string;
+/**
+ * Compute aggregate lines added/removed for a git revision range.
+ *
+ * Uses `git log --numstat` to parse insertions and deletions.
+ * Binary files (which show `-` in numstat) are skipped.
+ * Returns { linesAdded: 0, linesRemoved: 0 } if git fails.
+ *
+ * @param revRange - A git revision range, e.g. "main..feature-branch"
+ */
+export declare function computeGitDiffStats(repoPath: string, revRange: string): {
+    linesAdded: number;
+    linesRemoved: number;
+};
+//# sourceMappingURL=git-utils.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"git-utils.d.ts","sourceRoot":"","sources":["../src/git-utils.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,SAAK,GAAG,MAAM,CAOnE;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GACf;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CA6B9C"}

package/dist/git-utils.js

@@ -0,0 +1,57 @@
+/**
+ * Shared git utility functions for the daemon.
+ *
+ * Consolidates branch name sanitization logic previously duplicated between
+ * spawner.ts (generateBranchName) and strategy-executor.ts (generateStrategyBranchName).
+ */
+import { runGitSync } from './git-types.js';
+/**
+ * Sanitize a string for safe use as a git branch name segment.
+ *
+ * Converts the input to lowercase, replaces any non-alphanumeric/hyphen characters
+ * with hyphens, collapses consecutive hyphens, strips leading/trailing hyphens,
+ * and truncates to maxLen characters (default 50).
+ */
+export function sanitizeGitSegment(str, maxLen = 50) {
+    return str
+        .toLowerCase()
+        .replace(/[^a-z0-9-]/g, '-')
+        .replace(/-+/g, '-')
+        .replace(/^-|-$/g, '')
+        .slice(0, maxLen);
+}
+/**
+ * Compute aggregate lines added/removed for a git revision range.
+ *
+ * Uses `git log --numstat` to parse insertions and deletions.
+ * Binary files (which show `-` in numstat) are skipped.
+ * Returns { linesAdded: 0, linesRemoved: 0 } if git fails.
+ *
+ * @param revRange - A git revision range, e.g. "main..feature-branch"
+ */
+export function computeGitDiffStats(repoPath, revRange) {
+    const result = runGitSync(['log', '--numstat', '--format=', revRange], repoPath, { timeoutMs: 30_000 });
+    if (!result.success) {
+        console.warn(`[git-utils] computeGitDiffStats failed: ${result.error}`);
+        return { linesAdded: 0, linesRemoved: 0 };
+    }
+    let linesAdded = 0;
+    let linesRemoved = 0;
+    for (const line of result.output.split('\n')) {
+        const trimmed = line.trim();
+        if (!trimmed)
+            continue;
+        const parts = trimmed.split('\t');
+        if (parts.length < 3)
+            continue;
+        const added = parts[0];
+        const removed = parts[1];
+        // Binary files show `-` for both columns — skip
+        if (added === '-' || removed === '-')
+            continue;
+        linesAdded += parseInt(added, 10) || 0;
+        linesRemoved += parseInt(removed, 10) || 0;
+    }
+    return { linesAdded, linesRemoved };
+}
+//# sourceMappingURL=git-utils.js.map

package/dist/git-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"git-utils.js","sourceRoot":"","sources":["../src/git-utils.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C;;;;;;GAMG;AACH,MAAM,UAAU,kBAAkB,CAAC,GAAW,EAAE,MAAM,GAAG,EAAE;IACzD,OAAO,GAAG;SACP,WAAW,EAAE;SACb,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC;SAC3B,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;SACnB,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;SACrB,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;AACtB,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,mBAAmB,CACjC,QAAgB,EAChB,QAAgB;IAEhB,MAAM,MAAM,GAAG,UAAU,CACvB,CAAC,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,CAAC,EAC3C,QAAQ,EACR,EAAE,SAAS,EAAE,MAAM,EAAE,CACtB,CAAC;IAEF,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACpB,OAAO,CAAC,IAAI,CAAC,2CAA2C,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;QACxE,OAAO,EAAE,UAAU,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;IAC5C,CAAC;IAED,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,IAAI,YAAY,GAAG,CAAC,CAAC;IAErB,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QAC7C,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QAC5B,IAAI,CAAC,OAAO;YAAE,SAAS;QACvB,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAClC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;YAAE,SAAS;QAC/B,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACvB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACzB,gDAAgD;QAChD,IAAI,KAAK,KAAK,GAAG,IAAI,OAAO,KAAK,GAAG;YAAE,SAAS;QAC/C,UAAU,IAAI,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;QACvC,YAAY,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;IAED,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC;AACtC,CAAC"}

package/dist/git.d.ts

@@ -0,0 +1,24 @@
+/**
+ * Git utilities for the daemon.
+ *
+ * Thin barrel re-export that preserves the original import surface.
+ * Actual implementations live in focused sub-modules:
+ *   - git-types.ts: shared types and runGitSync
+ *   - git-merge-lock.ts: merge lock and corruption state
+ *   - git-branch.ts: branch management utilities
+ *   - git-merge.ts: merge operations and strategy dispatch
+ *   - git-integration.ts: integration branch sync and advance
+ *   - worktree.ts: worktree management (re-exported here for backward compatibility)
+ */
+import type { DaemonConfig } from './types.js';
+export { runGitSync, DEFAULT_GIT_TIMEOUT_MS, type GitResult, type MergeResult, type MergeStrategy, type RunGitSyncOptions } from './git-types.js';
+export { MergeLockTimeoutError, IntegrationCorruptError, type CorruptionDetails, isIntegrationCorrupt, getCorruptionDetails, resetCorruptionFlag, configureMergeLock, withMergeLock, resetMergeLock, } from './git-merge-lock.js';
+export { branchExists, getDefaultBranch, ensureIntegrationBranch, deleteBranch, } from './git-branch.js';
+export { mergeToIntegration, type MergeToIntegrationParams, applyMergeStrategy, trySquashMerge, handlePushFailureWithRollback, } from './git-merge.js';
+export { syncIntegrationWithMain, } from './git-integration.js';
+export { ensureWorktreeDir, ensureMergeWorktree, getMergeWorktreePath, pruneWorktrees, worktreeExistsForBranch, createWorktree, ensureMcpServerInWorktree, worktreeHasUncommittedChanges, branchHasUnmergedCommits, removeWorktree, commitWipChanges, safeRemoveStrategyWorktree, cleanupOrphanStrategyWorktrees, type SafeRemoveStrategyWorktreeParams, type SafeRemoveResult, } from './worktree.js';
+/**
+ * Initialize git subsystem for daemon startup.
+ */
+export declare function initGit(config: DaemonConfig): Promise<void>;
+//# sourceMappingURL=git.d.ts.map

package/dist/git.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../src/git.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAa/C,OAAO,EAAE,UAAU,EAAE,sBAAsB,EAAE,KAAK,SAAS,EAAE,KAAK,WAAW,EAAE,KAAK,aAAa,EAAE,KAAK,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAGlJ,OAAO,EACL,qBAAqB,EACrB,uBAAuB,EACvB,KAAK,iBAAiB,EACtB,oBAAoB,EACpB,oBAAoB,EACpB,mBAAmB,EACnB,kBAAkB,EAClB,aAAa,EACb,cAAc,GACf,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,uBAAuB,EACvB,YAAY,GACb,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EACL,kBAAkB,EAClB,KAAK,wBAAwB,EAC7B,kBAAkB,EAClB,cAAc,EACd,6BAA6B,GAC9B,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EACL,uBAAuB,GACxB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EACL,iBAAiB,EACjB,mBAAmB,EACnB,oBAAoB,EACpB,cAAc,EACd,uBAAuB,EACvB,cAAc,EACd,yBAAyB,EACzB,6BAA6B,EAC7B,wBAAwB,EACxB,cAAc,EACd,gBAAgB,EAChB,0BAA0B,EAC1B,8BAA8B,EAC9B,KAAK,gCAAgC,EACrC,KAAK,gBAAgB,GACtB,MAAM,eAAe,CAAC;AAIvB;;GAEG;AACH,wBAAsB,OAAO,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAkCjE"}

package/dist/git.js

@@ -0,0 +1,64 @@
+/**
+ * Git utilities for the daemon.
+ *
+ * Thin barrel re-export that preserves the original import surface.
+ * Actual implementations live in focused sub-modules:
+ *   - git-types.ts: shared types and runGitSync
+ *   - git-merge-lock.ts: merge lock and corruption state
+ *   - git-branch.ts: branch management utilities
+ *   - git-merge.ts: merge operations and strategy dispatch
+ *   - git-integration.ts: integration branch sync and advance
+ *   - worktree.ts: worktree management (re-exported here for backward compatibility)
+ */
+// Import worktree functions used locally by initGit
+import { ensureWorktreeDir, pruneWorktrees, ensureMergeWorktree } from './worktree.js';
+// Import sub-module functions used by initGit
+import { configureMergeLock } from './git-merge-lock.js';
+import { ensureIntegrationBranch } from './git-branch.js';
+import { syncIntegrationWithMain } from './git-integration.js';
+// ── Re-exports from sub-modules ─────────────────────────────────
+// git-types.ts: shared types and utilities
+export { runGitSync, DEFAULT_GIT_TIMEOUT_MS } from './git-types.js';
+// git-merge-lock.ts: merge lock and corruption state
+export { MergeLockTimeoutError, IntegrationCorruptError, isIntegrationCorrupt, getCorruptionDetails, resetCorruptionFlag, configureMergeLock, withMergeLock, resetMergeLock, } from './git-merge-lock.js';
+// git-branch.ts: branch management
+export { branchExists, getDefaultBranch, ensureIntegrationBranch, deleteBranch, } from './git-branch.js';
+// git-merge.ts: merge operations
+export { mergeToIntegration, applyMergeStrategy, trySquashMerge, handlePushFailureWithRollback, } from './git-merge.js';
+// git-integration.ts: integration branch operations
+export { syncIntegrationWithMain, } from './git-integration.js';
+// worktree.ts: worktree management (re-exported for backward compatibility)
+export { ensureWorktreeDir, ensureMergeWorktree, getMergeWorktreePath, pruneWorktrees, worktreeExistsForBranch, createWorktree, ensureMcpServerInWorktree, worktreeHasUncommittedChanges, branchHasUnmergedCommits, removeWorktree, commitWipChanges, safeRemoveStrategyWorktree, cleanupOrphanStrategyWorktrees, } from './worktree.js';
+// ── initGit ─────────────────────────────────────────────────────
+/**
+ * Initialize git subsystem for daemon startup.
+ */
+export async function initGit(config) {
+    console.log('Initializing git subsystem...');
+    // Configure merge lock from daemon config
+    configureMergeLock({
+        timeoutMs: config.mergeLockTimeoutMs,
+        contentionWarningMs: config.mergeLockContentionWarningMs,
+    });
+    // Ensure worktree directory exists
+    ensureWorktreeDir(config);
+    // Prune stale worktree entries
+    pruneWorktrees(config.repoPath);
+    // Ensure integration branch exists
+    await ensureIntegrationBranch(config);
+    // Create persistent merge worktree for branch-switching operations
+    ensureMergeWorktree(config);
+    // Sync integration with main on startup so we start fresh
+    const syncResult = await syncIntegrationWithMain(config);
+    if (syncResult.success) {
+        console.log('Integration branch synced with main on startup');
+    }
+    else {
+        console.warn(`Could not sync integration with main on startup: ${syncResult.error}`);
+        // Non-fatal — stale code is better than not starting
+    }
+    // Orphan strategy worktree cleanup is handled by rebuildStrategyWorktreeState()
+    // which runs after initGit(). No separate cleanup pass needed here.
+    console.log('Git subsystem initialized');
+}
+//# sourceMappingURL=git.js.map

package/dist/git.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"git.js","sourceRoot":"","sources":["../src/git.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAIH,oDAAoD;AACpD,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAEvF,8CAA8C;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAE/D,mEAAmE;AAEnE,2CAA2C;AAC3C,OAAO,EAAE,UAAU,EAAE,sBAAsB,EAAgF,MAAM,gBAAgB,CAAC;AAElJ,qDAAqD;AACrD,OAAO,EACL,qBAAqB,EACrB,uBAAuB,EAEvB,oBAAoB,EACpB,oBAAoB,EACpB,mBAAmB,EACnB,kBAAkB,EAClB,aAAa,EACb,cAAc,GACf,MAAM,qBAAqB,CAAC;AAE7B,mCAAmC;AACnC,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,uBAAuB,EACvB,YAAY,GACb,MAAM,iBAAiB,CAAC;AAEzB,iCAAiC;AACjC,OAAO,EACL,kBAAkB,EAElB,kBAAkB,EAClB,cAAc,EACd,6BAA6B,GAC9B,MAAM,gBAAgB,CAAC;AAExB,oDAAoD;AACpD,OAAO,EACL,uBAAuB,GACxB,MAAM,sBAAsB,CAAC;AAE9B,4EAA4E;AAC5E,OAAO,EACL,iBAAiB,EACjB,mBAAmB,EACnB,oBAAoB,EACpB,cAAc,EACd,uBAAuB,EACvB,cAAc,EACd,yBAAyB,EACzB,6BAA6B,EAC7B,wBAAwB,EACxB,cAAc,EACd,gBAAgB,EAChB,0BAA0B,EAC1B,8BAA8B,GAG/B,MAAM,eAAe,CAAC;AAEvB,mEAAmE;AAEnE;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,MAAoB;IAChD,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;IAE7C,0CAA0C;IAC1C,kBAAkB,CAAC;QACjB,SAAS,EAAE,MAAM,CAAC,kBAAkB;QACpC,mBAAmB,EAAE,MAAM,CAAC,4BAA4B;KACzD,CAAC,CAAC;IAEH,mCAAmC;IACnC,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAE1B,+BAA+B;IAC/B,cAAc,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAEhC,mCAAmC;IACnC,MAAM,uBAAuB,CAAC,MAAM,CAAC,CAAC;IAEtC,mEAAmE;IACnE,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAE5B,0DAA0D;IAC1D,MAAM,UAAU,GAAG,MAAM,uBAAuB,CAAC,MAAM,CAAC,CAAC;IACzD,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC;QACvB,OAAO,CAAC,GAAG,CAAC,gDAAgD,CAAC,CAAC;IAChE,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,IAAI,CAAC,oDAAoD,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC;QACrF,qDAAqD;IACvD,CAAC;IAED,gFAAgF;IAChF,oEAAoE;IAEpE,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;AAC3C,CAAC"}

package/dist/guard-engine.d.ts

@@ -0,0 +1,19 @@
+/**
+ * Guard evaluation engine for the daemon -- re-export facade.
+ *
+ * The implementation has been decomposed into focused modules:
+ *   - condition-evaluators.ts  -- leaf condition evaluation (dispatch map)
+ *   - guard-evaluator.ts       -- condition tree traversal + orchestrator
+ *   - evaluation-context.ts    -- EvaluationContext type + context builders
+ *   - trigger-executor.ts      -- trigger action executors + template interpolation
+ *
+ * This file re-exports the public API so existing consumers
+ * (`delivery-guards.ts`, `delivery-lifecycle.ts`, tests) continue to work
+ * without import changes.
+ */
+export { evaluateLeafCondition, toSafeNumber, compareValues, } from './condition-evaluators.js';
+export { GuardEvaluationError, evaluateGuardConditionTree, evaluateGuardsAtTransition, } from './guard-evaluator.js';
+export type { EvaluationContext } from './evaluation-context.js';
+export { buildFactoryEvaluationContext, buildEvaluationContext, } from './evaluation-context.js';
+export { interpolateTemplate, executeBlockTransition, executeEmitWarning, executeSpawnAgent, executeCreateIssue, executeTriggers, } from './trigger-executor.js';
+//# sourceMappingURL=guard-engine.d.ts.map

package/dist/guard-engine.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"guard-engine.d.ts","sourceRoot":"","sources":["../src/guard-engine.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAGH,OAAO,EACL,qBAAqB,EACrB,YAAY,EACZ,aAAa,GACd,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EACL,oBAAoB,EACpB,0BAA0B,EAC1B,0BAA0B,GAC3B,MAAM,sBAAsB,CAAC;AAG9B,YAAY,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EACL,6BAA6B,EAC7B,sBAAsB,GACvB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EACL,mBAAmB,EACnB,sBAAsB,EACtB,kBAAkB,EAClB,iBAAiB,EACjB,kBAAkB,EAClB,eAAe,GAChB,MAAM,uBAAuB,CAAC"}

package/dist/guard-engine.js

@@ -0,0 +1,21 @@
+/**
+ * Guard evaluation engine for the daemon -- re-export facade.
+ *
+ * The implementation has been decomposed into focused modules:
+ *   - condition-evaluators.ts  -- leaf condition evaluation (dispatch map)
+ *   - guard-evaluator.ts       -- condition tree traversal + orchestrator
+ *   - evaluation-context.ts    -- EvaluationContext type + context builders
+ *   - trigger-executor.ts      -- trigger action executors + template interpolation
+ *
+ * This file re-exports the public API so existing consumers
+ * (`delivery-guards.ts`, `delivery-lifecycle.ts`, tests) continue to work
+ * without import changes.
+ */
+// ── Condition evaluators ────────────────────────────────────────
+export { evaluateLeafCondition, toSafeNumber, compareValues, } from './condition-evaluators.js';
+// ── Guard evaluation (tree traversal + orchestrator) ────────────
+export { GuardEvaluationError, evaluateGuardConditionTree, evaluateGuardsAtTransition, } from './guard-evaluator.js';
+export { buildFactoryEvaluationContext, buildEvaluationContext, } from './evaluation-context.js';
+// ── Trigger executors ───────────────────────────────────────────
+export { interpolateTemplate, executeBlockTransition, executeEmitWarning, executeSpawnAgent, executeCreateIssue, executeTriggers, } from './trigger-executor.js';
+//# sourceMappingURL=guard-engine.js.map

package/dist/guard-engine.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"guard-engine.js","sourceRoot":"","sources":["../src/guard-engine.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,mEAAmE;AACnE,OAAO,EACL,qBAAqB,EACrB,YAAY,EACZ,aAAa,GACd,MAAM,2BAA2B,CAAC;AAEnC,mEAAmE;AACnE,OAAO,EACL,oBAAoB,EACpB,0BAA0B,EAC1B,0BAA0B,GAC3B,MAAM,sBAAsB,CAAC;AAI9B,OAAO,EACL,6BAA6B,EAC7B,sBAAsB,GACvB,MAAM,yBAAyB,CAAC;AAEjC,mEAAmE;AACnE,OAAO,EACL,mBAAmB,EACnB,sBAAsB,EACtB,kBAAkB,EAClB,iBAAiB,EACjB,kBAAkB,EAClB,eAAe,GAChB,MAAM,uBAAuB,CAAC"}

package/dist/guard-evaluator.d.ts

@@ -0,0 +1,47 @@
+/**
+ * Core condition tree evaluation logic for the guard engine.
+ *
+ * Contains the main evaluateGuardConditionTree function that traverses
+ * AND/OR/NOT trees and dispatches to leaf condition evaluators, plus the
+ * high-level guard evaluation orchestrator (evaluateGuardsAtTransition).
+ *
+ * Extracted from guard-engine.ts to improve maintainability.
+ */
+import type { WorkflowGuard, GuardConditionNode, TransitionGuardResult, ConditionEvalResult } from './types.js';
+import type { EvaluationContext } from './evaluation-context.js';
+/**
+ * Error thrown when guard evaluation fails.
+ * Carries the fetched guards (if available) so callers can determine
+ * failure mode based on enforcement levels.
+ */
+export declare class GuardEvaluationError extends Error {
+    readonly cause: unknown;
+    /** Guards that were successfully fetched before the error, if any. */
+    readonly fetchedGuards: WorkflowGuard[] | null;
+    constructor(message: string, cause: unknown, 
+    /** Guards that were successfully fetched before the error, if any. */
+    fetchedGuards: WorkflowGuard[] | null);
+    /** Whether any fetched guard has hard enforcement. */
+    get hasHardEnforcementGuards(): boolean;
+    /** Names of fetched guards (for error messages). */
+    get guardNames(): string[];
+}
+/**
+ * Evaluate a JSONB condition tree for a guard.
+ *
+ * The JSONB tree uses nested children arrays rather than
+ * parent_condition_id references. Root-level nodes are combined
+ * with AND by default.
+ */
+export declare function evaluateGuardConditionTree(conditions: GuardConditionNode[], ctx: EvaluationContext): {
+    passed: boolean;
+    details: ConditionEvalResult[];
+};
+/**
+ * Evaluate all guards at a workflow transition.
+ *
+ * Returns a TransitionGuardResult indicating whether the transition
+ * should proceed and what triggers need to be executed.
+ */
+export declare function evaluateGuardsAtTransition(deliveryId: string, organizationId: string, transitionId: string, lastExitCode: number): Promise<TransitionGuardResult>;
+//# sourceMappingURL=guard-evaluator.d.ts.map

package/dist/guard-evaluator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"guard-evaluator.d.ts","sourceRoot":"","sources":["../src/guard-evaluator.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EACV,aAAa,EAEb,kBAAkB,EAElB,qBAAqB,EAErB,mBAAmB,EACpB,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAajE;;;;GAIG;AACH,qBAAa,oBAAqB,SAAQ,KAAK;aAG3B,KAAK,EAAE,OAAO;IAC9B,sEAAsE;aACtD,aAAa,EAAE,aAAa,EAAE,GAAG,IAAI;gBAHrD,OAAO,EAAE,MAAM,EACC,KAAK,EAAE,OAAO;IAC9B,sEAAsE;IACtD,aAAa,EAAE,aAAa,EAAE,GAAG,IAAI;IAMvD,sDAAsD;IACtD,IAAI,wBAAwB,IAAI,OAAO,CAEtC;IAED,oDAAoD;IACpD,IAAI,UAAU,IAAI,MAAM,EAAE,CAEzB;CACF;AAuCD;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CACxC,UAAU,EAAE,kBAAkB,EAAE,EAChC,GAAG,EAAE,iBAAiB,GACrB;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,mBAAmB,EAAE,CAAA;CAAE,CAcrD;AAMD;;;;;GAKG;AACH,wBAAsB,0BAA0B,CAC9C,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,qBAAqB,CAAC,CA4HhC"}