@telora/daemon 0.21.26 → 0.21.82

package/dist/merge/merge-back-loop.js.map

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

package/dist/merge/merge-detector.d.ts

@@ -0,0 +1,55 @@
+/**
+ * Merge detection for focus branches.
+ *
+ * Scans the integration branch for merge commits that originated from
+ * focus worktree branches. Records newly detected merges via the
+ * product-api so they appear in the focus commit history.
+ *
+ * Called from the daemon poll loop. Uses fire-and-forget recording
+ * to avoid blocking the poll cycle.
+ */
+import type { DaemonConfig } from '../types/index.js';
+/**
+ * Parsed merge commit from git log.
+ */
+export interface DetectedMerge {
+    /** The merge commit SHA on the integration branch. */
+    mergeCommitSha: string;
+    /** ISO timestamp of the merge commit. */
+    mergedAt: string;
+    /** Git author name of the merge commit. */
+    authorName: string;
+    /** Git author email of the merge commit. */
+    authorEmail: string;
+    /** SHAs of commits included in this merge (from second parent). */
+    constituentCommitShas: string[];
+}
+/**
+ * Pure parse + classification core extracted from findMergeCommitsForBranch.
+ *
+ * Given the raw `git log --merges --first-parent --format=%H|%aI|%an|%ae|%P`
+ * output, the set of commits unique to the focus branch, and a callback that
+ * yields the constituent commits for a merge, selects the merges that actually
+ * came from this focus. This is the MISCLASSIFICATION-prone logic, isolated so
+ * it can be tested without a git process:
+ *   - malformed lines (< 5 pipe fields) are skipped;
+ *   - non-merge commits (< 2 parents) are skipped;
+ *   - a merge is attributed to this focus ONLY when its SECOND parent is a
+ *     commit unique to the focus branch -- this is what prevents matching an
+ *     unrelated historical merge from another branch;
+ *   - constituents are resolved lazily and only for attributed merges.
+ *
+ * Order is preserved from the input (git returns newest-first).
+ */
+export declare function selectFocusMerges(mergeLogOutput: string, focusCommits: ReadonlySet<string>, getConstituents: (firstParent: string, secondParent: string) => string[]): DetectedMerge[];
+/**
+ * Detect new merge commits for all active focuses.
+ *
+ * For each focus with a known worktree branch, scans the integration
+ * branch for merge commits from that branch. Records any new merges
+ * via the product-api with merged_by='detected'.
+ *
+ * Called from the poll loop in listener.ts.
+ */
+export declare function detectFocusMerges(config: DaemonConfig): Promise<void>;
+//# sourceMappingURL=merge-detector.d.ts.map

package/dist/merge/merge-detector.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-detector.d.ts","sourceRoot":"","sources":["../../src/merge/merge-detector.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAoBtD;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,sDAAsD;IACtD,cAAc,EAAE,MAAM,CAAC;IACvB,yCAAyC;IACzC,QAAQ,EAAE,MAAM,CAAC;IACjB,2CAA2C;IAC3C,UAAU,EAAE,MAAM,CAAC;IACnB,4CAA4C;IAC5C,WAAW,EAAE,MAAM,CAAC;IACpB,mEAAmE;IACnE,qBAAqB,EAAE,MAAM,EAAE,CAAC;CACjC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,iBAAiB,CAC/B,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,WAAW,CAAC,MAAM,CAAC,EACjC,eAAe,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,KAAK,MAAM,EAAE,GACvE,aAAa,EAAE,CAiCjB;AAwID;;;;;;;;GAQG;AACH,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAgE3E"}

package/dist/merge/merge-detector.js

@@ -0,0 +1,222 @@
+/**
+ * Merge detection for focus branches.
+ *
+ * Scans the integration branch for merge commits that originated from
+ * focus worktree branches. Records newly detected merges via the
+ * product-api so they appear in the focus commit history.
+ *
+ * Called from the daemon poll loop. Uses fire-and-forget recording
+ * to avoid blocking the poll cycle.
+ */
+import { runGitSync } from '../git/index.js';
+import { repoHasCommits } from '../git/index.js';
+import { getActiveFocuses } from '../queries/deliveries.js';
+import { getAllFocusWorktrees } from '../focus/focus-worktree-state.js';
+import { callApi } from '../queries/shared.js';
+import { createLogger } from '../shell/log.js';
+const log = createLogger({ module: 'merge-detector' });
+/** Short timeout for git operations to avoid blocking the poll loop. */
+const GIT_TIMEOUT_MS = 10_000;
+/**
+ * Per-focus tracking of the last merge commit SHA we've processed.
+ * Avoids re-scanning the full integration history on every poll cycle.
+ */
+const lastCheckedMergeSha = new Map();
+/**
+ * Pure parse + classification core extracted from findMergeCommitsForBranch.
+ *
+ * Given the raw `git log --merges --first-parent --format=%H|%aI|%an|%ae|%P`
+ * output, the set of commits unique to the focus branch, and a callback that
+ * yields the constituent commits for a merge, selects the merges that actually
+ * came from this focus. This is the MISCLASSIFICATION-prone logic, isolated so
+ * it can be tested without a git process:
+ *   - malformed lines (< 5 pipe fields) are skipped;
+ *   - non-merge commits (< 2 parents) are skipped;
+ *   - a merge is attributed to this focus ONLY when its SECOND parent is a
+ *     commit unique to the focus branch -- this is what prevents matching an
+ *     unrelated historical merge from another branch;
+ *   - constituents are resolved lazily and only for attributed merges.
+ *
+ * Order is preserved from the input (git returns newest-first).
+ */
+export function selectFocusMerges(mergeLogOutput, focusCommits, getConstituents) {
+    // If the focus branch has no unique commits, there's nothing to detect.
+    if (focusCommits.size === 0)
+        return [];
+    const lines = mergeLogOutput.trim().split('\n').filter(Boolean);
+    const merges = [];
+    for (const line of lines) {
+        const parts = line.split('|');
+        if (parts.length < 5)
+            continue;
+        const [sha, date, authorName, authorEmail, parentStr] = parts;
+        const parents = parentStr.split(' ').filter(Boolean);
+        // A merge commit has 2+ parents. The second parent is the merged branch.
+        if (parents.length < 2)
+            continue;
+        const secondParent = parents[1];
+        // Only match if the second parent is a commit unique to the focus branch.
+        // This prevents matching historical merges from other branches.
+        if (!focusCommits.has(secondParent))
+            continue;
+        merges.push({
+            mergeCommitSha: sha,
+            mergedAt: date,
+            authorName,
+            authorEmail,
+            constituentCommitShas: getConstituents(parents[0], secondParent),
+        });
+    }
+    return merges;
+}
+/**
+ * Find merge commits on the integration branch that merged a specific
+ * focus branch.
+ *
+ * Uses `git log --merges --first-parent` on the integration branch,
+ * then checks each merge commit's second parent to see if it came from
+ * the focus branch.
+ */
+function findMergeCommitsForBranch(repoPath, integrationBranch, focusBranch, sinceSha) {
+    // Find the fork point: where the focus branch diverged from integration.
+    // Only merges after this point can be from this focus's work.
+    const forkResult = runGitSync(['merge-base', integrationBranch, focusBranch], repoPath, { timeoutMs: GIT_TIMEOUT_MS });
+    if (!forkResult.success || !forkResult.output.trim()) {
+        return [];
+    }
+    const forkPoint = forkResult.output.trim();
+    // Use the more recent of sinceSha and forkPoint as the scan start
+    const scanStart = sinceSha ?? forkPoint;
+    // Find merge commits on integration after the scan start
+    // Format: SHA|ISO date|author name|author email|parent SHAs
+    const logResult = runGitSync([
+        'log',
+        '--merges',
+        '--first-parent',
+        '--format=%H|%aI|%an|%ae|%P',
+        `${scanStart}..${integrationBranch}`,
+    ], repoPath, { timeoutMs: GIT_TIMEOUT_MS });
+    if (!logResult.success || !logResult.output.trim()) {
+        return [];
+    }
+    // Get the set of commits unique to the focus branch (not on integration).
+    // A merge is from this focus only if its second parent is one of these.
+    const branchCommitsResult = runGitSync(['log', '--format=%H', `${integrationBranch}..${focusBranch}`], repoPath, { timeoutMs: GIT_TIMEOUT_MS });
+    const focusCommits = new Set(branchCommitsResult.success
+        ? branchCommitsResult.output.trim().split('\n').filter(Boolean)
+        : []);
+    // Parse + attribute via the pure core; constituents are resolved lazily for
+    // attributed merges only (all commits reachable from the second parent but
+    // not the first -- i.e. the commits that were merged in).
+    return selectFocusMerges(logResult.output, focusCommits, (firstParent, secondParent) => {
+        const constituentResult = runGitSync(['log', '--format=%H', `${firstParent}..${secondParent}`], repoPath, { timeoutMs: GIT_TIMEOUT_MS });
+        return constituentResult.success
+            ? constituentResult.output.trim().split('\n').filter(Boolean)
+            : [];
+    });
+}
+/**
+ * Record a detected merge via the product-api.
+ * Fire-and-forget: logs errors but does not throw.
+ */
+function recordMerge(focusId, merge) {
+    callApi('daemon_record_focus_merge', {
+        focusId,
+        fields: {
+            mergeCommitSha: merge.mergeCommitSha,
+            commitShas: merge.constituentCommitShas,
+            mergedBy: 'detected',
+            branchName: null,
+        },
+    }).catch((err) => {
+        // ON CONFLICT DO NOTHING at the DB level handles dedup,
+        // so 409/conflict errors are expected and harmless.
+        const msg = err.message ?? '';
+        if (msg.includes('conflict') || msg.includes('duplicate')) {
+            log.debug(`[merge-detector] Duplicate merge record for ${merge.mergeCommitSha.slice(0, 8)} ` +
+                `on focus ${focusId.slice(0, 8)} (expected)`);
+        }
+        else {
+            log.warn(`[merge-detector] Failed to record merge ${merge.mergeCommitSha.slice(0, 8)} ` +
+                `for focus ${focusId.slice(0, 8)}: ${msg}`);
+        }
+    });
+}
+/**
+ * Fetch the most recent recorded merge SHA for a focus from the API.
+ * Returns null if no merges have been recorded yet or the API action
+ * is not yet available.
+ */
+async function getLastRecordedMergeSha(focusId) {
+    try {
+        const result = await callApi('focus_merge_list', { focusId, limit: 1 });
+        if (result.merges && result.merges.length > 0) {
+            return result.merges[0].mergeCommitSha;
+        }
+        return null;
+    }
+    catch (err) {
+        // API action may not exist yet (TEL-9 is adding it).
+        // Fall back to in-memory tracking.
+        log.debug(`[merge-detector] focus_merge_list not available for ${focusId.slice(0, 8)}: ` +
+            `${err.message}`);
+        return null;
+    }
+}
+/**
+ * Detect new merge commits for all active focuses.
+ *
+ * For each focus with a known worktree branch, scans the integration
+ * branch for merge commits from that branch. Records any new merges
+ * via the product-api with merged_by='detected'.
+ *
+ * Called from the poll loop in listener.ts.
+ */
+export async function detectFocusMerges(config) {
+    const { repoPath, integrationBranch } = config;
+    // Empty repos have nothing to scan.
+    if (!repoHasCommits(repoPath))
+        return;
+    // Get all active focuses to determine which branches to scan
+    let focuses;
+    try {
+        focuses = await getActiveFocuses(config.organizationId, config.productId);
+    }
+    catch (err) {
+        log.warn('Failed to fetch active focuses:', err.message);
+        return;
+    }
+    if (focuses.length === 0)
+        return;
+    // Build a map of focus ID -> branch name from worktree state
+    const worktrees = getAllFocusWorktrees();
+    for (const focus of focuses) {
+        const worktreeInfo = worktrees.get(focus.focus_id);
+        if (!worktreeInfo)
+            continue;
+        const branchName = worktreeInfo.branchName;
+        // Verify the branch exists in the repo
+        const branchCheck = runGitSync(['rev-parse', '--verify', branchName], repoPath, { timeoutMs: GIT_TIMEOUT_MS });
+        if (!branchCheck.success)
+            continue;
+        // Determine starting point: prefer in-memory cache, fall back to API
+        let sinceSha = lastCheckedMergeSha.get(focus.focus_id);
+        if (!sinceSha) {
+            sinceSha = await getLastRecordedMergeSha(focus.focus_id) ?? undefined;
+        }
+        // Find new merge commits
+        const merges = findMergeCommitsForBranch(repoPath, integrationBranch, branchName, sinceSha);
+        if (merges.length === 0)
+            continue;
+        log.info(`[merge-detector] Found ${merges.length} new merge(s) for focus ` +
+            `"${focus.focus_name}" (${focus.focus_id.slice(0, 8)})`);
+        // Record each merge (fire-and-forget)
+        for (const merge of merges) {
+            recordMerge(focus.focus_id, merge);
+        }
+        // Update last-checked pointer to the most recent merge
+        // Merges are returned in reverse chronological order (newest first)
+        lastCheckedMergeSha.set(focus.focus_id, merges[0].mergeCommitSha);
+    }
+}
+//# sourceMappingURL=merge-detector.js.map

package/dist/merge/merge-detector.js.map

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

package/dist/merge/merge-failure-classify.d.ts

@@ -0,0 +1,48 @@
+/**
+ * Merge-failure classification.
+ *
+ * A filing states only what the machine established. When an automatic merge
+ * fails, the detector already holds the raw git error -- it must discriminate
+ * on that error before choosing an escalation kind, rather than asserting
+ * "merge conflict" for every failure. A merge that fails because the remote ref
+ * does not exist is a CONFIGURATION gap, not a content conflict; filing it as a
+ * merge_conflict prescribes a remedy ("resolve the conflict, then mark resolved
+ * to trigger a retry") whose precondition the machine never verified -- so the
+ * retry re-fails and re-files.
+ *
+ * This module turns the git error string into a verdict the caller can act on
+ * without re-diagnosing it.
+ */
+export type MergeFailureClass = 'content_conflict' | 'missing_ref' | 'unrelated_histories' | 'hook_rejected' | 'worktree_dirty' | 'unknown';
+export interface MergeFailureClassification {
+    /** The discriminated condition the git error actually describes. */
+    class: MergeFailureClass;
+    /**
+     * True ONLY for a genuine content conflict -- the sole case a merge_conflict
+     * git state + conflict-resolution escalation is warranted.
+     */
+    isContentConflict: boolean;
+    /**
+     * True when the failure is a missing / unconfigured integration ref (the
+     * merge target branch does not exist). This is a configuration gap, surfaced
+     * as state -- never an operator escalation (config gaps are state, not
+     * escalations).
+     */
+    isConfigGap: boolean;
+    /**
+     * True for a DETERMINISTIC failure that repeats identically until some state
+     * changes -- a commit-msg hook rejection or a dirty merge worktree. Re-running
+     * the same merge unchanged re-fails the same way, so the merge-back loop must
+     * signal + throttle rather than retry at full poll rate. (worktree_dirty is
+     * self-cleared by the pre-merge recovery, so its recurrence signals recovery
+     * itself is not holding; hook_rejected the daemon cannot clear on its own.)
+     */
+    isDeterministic: boolean;
+}
+/**
+ * Classify an automatic-merge failure from the git error the caller already
+ * holds. Never throws; an empty / unrecognized error classifies as 'unknown',
+ * which the caller surfaces WITHOUT asserting a merge_conflict verdict.
+ */
+export declare function classifyMergeFailure(mergeError: string | null | undefined): MergeFailureClassification;
+//# sourceMappingURL=merge-failure-classify.d.ts.map

package/dist/merge/merge-failure-classify.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-failure-classify.d.ts","sourceRoot":"","sources":["../../src/merge/merge-failure-classify.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,MAAM,MAAM,iBAAiB,GACzB,kBAAkB,GAClB,aAAa,GACb,qBAAqB,GACrB,eAAe,GACf,gBAAgB,GAChB,SAAS,CAAC;AAEd,MAAM,WAAW,0BAA0B;IACzC,oEAAoE;IACpE,KAAK,EAAE,iBAAiB,CAAC;IACzB;;;OAGG;IACH,iBAAiB,EAAE,OAAO,CAAC;IAC3B;;;;;OAKG;IACH,WAAW,EAAE,OAAO,CAAC;IACrB;;;;;;;OAOG;IACH,eAAe,EAAE,OAAO,CAAC;CAC1B;AAqDD;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,0BAA0B,CAsBtG"}

package/dist/merge/merge-failure-classify.js

@@ -0,0 +1,89 @@
+/**
+ * Merge-failure classification.
+ *
+ * A filing states only what the machine established. When an automatic merge
+ * fails, the detector already holds the raw git error -- it must discriminate
+ * on that error before choosing an escalation kind, rather than asserting
+ * "merge conflict" for every failure. A merge that fails because the remote ref
+ * does not exist is a CONFIGURATION gap, not a content conflict; filing it as a
+ * merge_conflict prescribes a remedy ("resolve the conflict, then mark resolved
+ * to trigger a retry") whose precondition the machine never verified -- so the
+ * retry re-fails and re-files.
+ *
+ * This module turns the git error string into a verdict the caller can act on
+ * without re-diagnosing it.
+ */
+/**
+ * A missing / unconfigured integration ref. `git` phrases this several ways
+ * depending on whether the target is a local branch, a remote ref, or a raw
+ * revision:
+ *   - "fatal: couldn't find remote ref integration"
+ *   - "fatal: <branch> - not something we can merge"
+ *   - "fatal: ambiguous argument '<ref>': unknown revision or path not in the working tree"
+ *   - "error: pathspec '<ref>' did not match"
+ */
+const MISSING_REF_PATTERNS = [
+    /couldn'?t find remote ref/i,
+    /not something we can merge/i,
+    /unknown revision or path/i,
+    /did not match any file\(s\) known to git/i,
+    /pathspec .* did not match/i,
+];
+/** `git merge` refusing to join two histories with no common ancestor. */
+const UNRELATED_HISTORIES_PATTERN = /unrelated histories/i;
+/**
+ * A commit-msg hook rejected the merge commit. The delivery-trailer guard prints
+ * `COMMIT REFUSED: missing Telora-Delivery trailer`; git then reports
+ * `Not committing merge; use 'git commit' to complete the merge.` and leaves
+ * MERGE_HEAD set. Deterministic: re-running the same merge re-fails identically
+ * until the hook or the commit changes.
+ */
+const HOOK_REJECTION_PATTERNS = [
+    /COMMIT REFUSED/i,
+    /Not committing merge; use ['"]?git commit/i,
+];
+/**
+ * The merge worktree carried local changes that the checkout/merge would
+ * overwrite -- a worktree left dirty by an earlier failed merge. git phrases it
+ * `error: Your local changes to the following files would be overwritten by
+ * merge:`. Deterministic until the worktree is cleaned (the pre-merge recovery
+ * clears it; a recurrence means recovery is not holding).
+ */
+const WORKTREE_DIRTY_PATTERNS = [
+    /local changes to the following files would be overwritten by merge/i,
+    /would be overwritten by merge/i,
+];
+/**
+ * A genuine content conflict: overlapping edits git could not auto-merge.
+ * Checked AFTER the more specific missing-ref / unrelated-histories patterns so
+ * a stray "conflict" in a config-gap message does not misclassify it.
+ */
+const CONTENT_CONFLICT_PATTERN = /conflict/i;
+/**
+ * Classify an automatic-merge failure from the git error the caller already
+ * holds. Never throws; an empty / unrecognized error classifies as 'unknown',
+ * which the caller surfaces WITHOUT asserting a merge_conflict verdict.
+ */
+export function classifyMergeFailure(mergeError) {
+    const err = mergeError ?? '';
+    if (MISSING_REF_PATTERNS.some((re) => re.test(err))) {
+        return { class: 'missing_ref', isContentConflict: false, isConfigGap: true, isDeterministic: false };
+    }
+    if (UNRELATED_HISTORIES_PATTERN.test(err)) {
+        return { class: 'unrelated_histories', isContentConflict: false, isConfigGap: false, isDeterministic: false };
+    }
+    // Named deterministic conditions BEFORE the generic /conflict/i test so a
+    // specific message is not stolen by it (neither string contains 'conflict',
+    // but the ordering property is load-bearing -- keep them ahead of it).
+    if (HOOK_REJECTION_PATTERNS.some((re) => re.test(err))) {
+        return { class: 'hook_rejected', isContentConflict: false, isConfigGap: false, isDeterministic: true };
+    }
+    if (WORKTREE_DIRTY_PATTERNS.some((re) => re.test(err))) {
+        return { class: 'worktree_dirty', isContentConflict: false, isConfigGap: false, isDeterministic: true };
+    }
+    if (CONTENT_CONFLICT_PATTERN.test(err)) {
+        return { class: 'content_conflict', isContentConflict: true, isConfigGap: false, isDeterministic: false };
+    }
+    return { class: 'unknown', isContentConflict: false, isConfigGap: false, isDeterministic: false };
+}
+//# sourceMappingURL=merge-failure-classify.js.map

package/dist/merge/merge-failure-classify.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-failure-classify.js","sourceRoot":"","sources":["../../src/merge/merge-failure-classify.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAoCH;;;;;;;;GAQG;AACH,MAAM,oBAAoB,GAAsB;IAC9C,4BAA4B;IAC5B,6BAA6B;IAC7B,2BAA2B;IAC3B,2CAA2C;IAC3C,4BAA4B;CAC7B,CAAC;AAEF,0EAA0E;AAC1E,MAAM,2BAA2B,GAAG,sBAAsB,CAAC;AAE3D;;;;;;GAMG;AACH,MAAM,uBAAuB,GAAsB;IACjD,iBAAiB;IACjB,4CAA4C;CAC7C,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,uBAAuB,GAAsB;IACjD,qEAAqE;IACrE,gCAAgC;CACjC,CAAC;AAEF;;;;GAIG;AACH,MAAM,wBAAwB,GAAG,WAAW,CAAC;AAE7C;;;;GAIG;AACH,MAAM,UAAU,oBAAoB,CAAC,UAAqC;IACxE,MAAM,GAAG,GAAG,UAAU,IAAI,EAAE,CAAC;IAE7B,IAAI,oBAAoB,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;QACpD,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,iBAAiB,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC;IACvG,CAAC;IACD,IAAI,2BAA2B,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QAC1C,OAAO,EAAE,KAAK,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC;IAChH,CAAC;IACD,0EAA0E;IAC1E,4EAA4E;IAC5E,uEAAuE;IACvE,IAAI,uBAAuB,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;QACvD,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC;IACzG,CAAC;IACD,IAAI,uBAAuB,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;QACvD,OAAO,EAAE,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC;IAC1G,CAAC;IACD,IAAI,wBAAwB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QACvC,OAAO,EAAE,KAAK,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC;IAC5G,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,iBAAiB,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC;AACpG,CAAC"}

package/dist/nexus/endpoint-clearance.d.ts

@@ -27,7 +27,8 @@
  *
  * @module nexus-endpoint-clearance
  */
-import type { DaemonConfig } from '../types.js';
+import type { DaemonConfig } from '../types/index.js';
+import { type CallApiDeps } from '../queries/shared.js';
 /** An endpoint-typed, resolved outgoing request from a consumer product. */
 export interface ResolvedTypedRequest {
     id: string;
@@ -98,8 +99,16 @@ export declare function isEndpointFulfilledForRequest(endpoint: EndpointRegistry
  * every reality-tree obstacle linked to that endpoint.
  */
 export declare function runEndpointClearanceTick(productId: string, deps: EndpointClearanceDeps): Promise<EndpointClearanceResult>;
-/** Production deps backed by the product-api over callApi. */
-export declare function defaultEndpointClearanceDeps(_config: DaemonConfig): EndpointClearanceDeps;
+/**
+ * Production deps backed by the product-api over callApi.
+ *
+ * `apiDeps` is the injectable API-client seam (defaults to {} -> the real
+ * `callApi` singleton). A test injects a fake through `apiDeps.callApi` so the
+ * production deps can be exercised without registering a `mock.module` on
+ * `queries/shared.js` (which would poison the daemon-core mock-loader for the
+ * whole test). Production callers pass one arg and get the real client.
+ */
+export declare function defaultEndpointClearanceDeps(_config: DaemonConfig, apiDeps?: CallApiDeps): EndpointClearanceDeps;
 /** Per-product clearance step invoked from the poll loop (best-effort). */
 export declare function checkEndpointClearance(config: DaemonConfig, deps?: EndpointClearanceDeps): Promise<EndpointClearanceResult>;
 //# sourceMappingURL=endpoint-clearance.d.ts.map

package/dist/nexus/endpoint-clearance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"endpoint-clearance.d.ts","sourceRoot":"","sources":["../../src/nexus/endpoint-clearance.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAUhD,4EAA4E;AAC5E,MAAM,WAAW,oBAAoB;IACnC,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,4EAA4E;IAC5E,wBAAwB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1C;AAED,gEAAgE;AAChE,MAAM,WAAW,mBAAmB;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,gFAAgF;AAChF,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,qBAAqB;IACpC,qFAAqF;IACrF,yBAAyB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAAC;IAC9E,uEAAuE;IACvE,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAAC;IACrE;;;;;;OAMG;IACH,yBAAyB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAAC;IAC/E,yDAAyD;IACzD,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACjD,GAAG,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAED,MAAM,WAAW,uBAAuB;IACtC,kCAAkC;IAClC,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,8EAA8E;IAC9E,kBAAkB,EAAE,MAAM,EAAE,CAAC;CAC9B;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,mBAAmB,GAAG,IAAI,GAAG,OAAO,CAEjF;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,mBAAmB,GAAG,IAAI,EACpC,GAAG,EAAE,oBAAoB,GACxB,OAAO,CAMT;AAED;;;;GAIG;AACH,wBAAsB,wBAAwB,CAC5C,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,qBAAqB,GAC1B,OAAO,CAAC,uBAAuB,CAAC,CAgClC;AAED,8DAA8D;AAC9D,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,YAAY,GAAG,qBAAqB,CA0EzF;AAED,2EAA2E;AAC3E,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,YAAY,EACpB,IAAI,GAAE,qBAA4D,GACjE,OAAO,CAAC,uBAAuB,CAAC,CAIlC"}
+{"version":3,"file":"endpoint-clearance.d.ts","sourceRoot":"","sources":["../../src/nexus/endpoint-clearance.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAW,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AASjE,4EAA4E;AAC5E,MAAM,WAAW,oBAAoB;IACnC,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,4EAA4E;IAC5E,wBAAwB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1C;AAED,gEAAgE;AAChE,MAAM,WAAW,mBAAmB;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,gFAAgF;AAChF,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,qBAAqB;IACpC,qFAAqF;IACrF,yBAAyB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAAC;IAC9E,uEAAuE;IACvE,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAAC;IACrE;;;;;;OAMG;IACH,yBAAyB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAAC;IAC/E,yDAAyD;IACzD,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACjD,GAAG,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAED,MAAM,WAAW,uBAAuB;IACtC,kCAAkC;IAClC,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,8EAA8E;IAC9E,kBAAkB,EAAE,MAAM,EAAE,CAAC;CAC9B;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,mBAAmB,GAAG,IAAI,GAAG,OAAO,CAEjF;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,mBAAmB,GAAG,IAAI,EACpC,GAAG,EAAE,oBAAoB,GACxB,OAAO,CAMT;AAED;;;;GAIG;AACH,wBAAsB,wBAAwB,CAC5C,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,qBAAqB,GAC1B,OAAO,CAAC,uBAAuB,CAAC,CAgClC;AAED;;;;;;;;GAQG;AACH,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,YAAY,EACrB,OAAO,GAAE,WAAgB,GACxB,qBAAqB,CA2EvB;AAED,2EAA2E;AAC3E,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,YAAY,EACpB,IAAI,GAAE,qBAA4D,GACjE,OAAO,CAAC,uBAAuB,CAAC,CAIlC"}

package/dist/nexus/endpoint-clearance.js

@@ -28,7 +28,7 @@
  * @module nexus-endpoint-clearance
  */
 import { callApi } from '../queries/shared.js';
-import { createLogger } from '../log.js';
+import { createLogger } from '../shell/log.js';
 const log = createLogger({ module: 'nexus/endpoint-clearance' });
 /** Statuses in which a typed request is considered fulfilled enough to re-check. */
 const TERMINAL_FULFILLED_STATUSES = new Set(['delivered', 'closed']);
@@ -98,12 +98,21 @@ export async function runEndpointClearanceTick(productId, deps) {
     }
     return { cleared, skippedUnfulfilled };
 }
-/** Production deps backed by the product-api over callApi. */
-export function defaultEndpointClearanceDeps(_config) {
+/**
+ * Production deps backed by the product-api over callApi.
+ *
+ * `apiDeps` is the injectable API-client seam (defaults to {} -> the real
+ * `callApi` singleton). A test injects a fake through `apiDeps.callApi` so the
+ * production deps can be exercised without registering a `mock.module` on
+ * `queries/shared.js` (which would poison the daemon-core mock-loader for the
+ * whole test). Production callers pass one arg and get the real client.
+ */
+export function defaultEndpointClearanceDeps(_config, apiDeps = {}) {
+    const call = apiDeps.callApi ?? callApi;
     return {
         async listResolvedTypedRequests(productId) {
             // Outgoing = this product is the source/consumer. Endpoint-typed + resolved.
-            const res = await callApi('product_request_list', { productId, direction: 'outgoing' });
+            const res = await call('product_request_list', { productId, direction: 'outgoing' });
             return (res.requests ?? [])
                 .filter((r) => r.endpointId != null && TERMINAL_FULFILLED_STATUSES.has(String(r.status ?? '')))
                 .map((r) => ({
@@ -116,7 +125,7 @@ export function defaultEndpointClearanceDeps(_config) {
         },
         async getEndpoint(endpointId) {
             try {
-                const res = await callApi('endpoint_get', { endpointId });
+                const res = await call('endpoint_get', { endpointId });
                 const e = res.endpoint;
                 if (!e)
                     return null;
@@ -128,7 +137,7 @@ export function defaultEndpointClearanceDeps(_config) {
             }
         },
         async findEndpointObstacleLinks(endpointId) {
-            const res = await callApi('reality_tree_link_list', { entityType: 'endpoint', entityId: endpointId });
+            const res = await call('reality_tree_link_list', { entityType: 'endpoint', entityId: endpointId });
             // The reverse lookup carries the joined node block (nodeType + realityTreeId).
             // Keep only obstacle nodes; clearObstacleNode retires unconditionally, so a
             // non-obstacle linked node (entity / desired_effect) must never reach it (TEL-6).
@@ -149,7 +158,7 @@ export function defaultEndpointClearanceDeps(_config) {
                     continue;
                 let active = activeByTree.get(treeId);
                 if (!active) {
-                    const nodesRes = await callApi('reality_tree_node_list', { treeId, nodeType: 'undesired_effect', status: 'active' });
+                    const nodesRes = await call('reality_tree_node_list', { treeId, nodeType: 'undesired_effect', status: 'active' });
                     active = new Set((nodesRes.items ?? []).map((n) => String(n.id)));
                     activeByTree.set(treeId, active);
                 }
@@ -160,7 +169,7 @@ export function defaultEndpointClearanceDeps(_config) {
             return result;
         },
         async clearObstacleNode(nodeId) {
-            await callApi('reality_tree_node_update', { nodeId, status: 'retired' });
+            await call('reality_tree_node_update', { nodeId, status: 'retired' });
         },
         log(message) {
             log.info(message);

package/dist/nexus/endpoint-clearance.js.map

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

package/dist/nexus/escalation-bridge.js

@@ -37,7 +37,7 @@
  */
 import { callApi } from '../queries/shared.js';
 import { ESCALATION_REASONS } from '@telora/daemon-core';
-import { createLogger } from '../log.js';
+import { createLogger } from '../shell/log.js';
 const dlog = createLogger({ module: 'nexus/escalation-bridge' });
 /** Reason types that represent a cross-product (lateral) blocker, not a human decision. */
 const CROSS_PRODUCT_REASONS = new Set([