@telora/daemon 0.20.4 → 0.20.19

package/dist/focus-loop-registry.js

@@ -22,10 +22,14 @@ import { runCascadeProseTick, runNegativeBranchTick } from './cascade-restatemen
 import { runPrdControllerTickAll } from './prd/index.js';
 import { runMergeBackTick } from './merge-back-loop.js';
 import { runDriftEvalTick, runPendingDriftEvalRequestsTick } from './drift-eval-loop.js';
+import { runDriftRatifyTick } from './drift-ratify-loop.js';
+import { runShortfallDispositionTick } from './shortfall-disposition-loop.js';
 import { runSensorSweepTick } from './sensor-sweep.js';
 import { runCiSensorTick } from './ci-sensor-loop.js';
 import { reconcileDaemonProducts, buildReconcileDeps } from './config-reconcile.js';
 import { buildDefaultSecurityScanDeps, runSecurityScanTick, } from './security-scan-engine.js';
+import { createLogger } from './log.js';
+const log = createLogger({ module: 'prd-controller' });
 export const LOOP_REGISTRY = [
     // 1. Stuck-team watchdog (60s). Defense-in-depth for the session-slot
     //    pipeline: a team wedged in `shutting_down` pins its governor slot
@@ -43,10 +47,10 @@ export const LOOP_REGISTRY = [
                     thresholdMs: stuckShutdownTimeoutMs,
                 });
                 if (result.reaped > 0) {
-                    console.warn(`[stuck-shutdown-watchdog] reaped ${result.reaped} team(s) stuck in ` +
+                    log.warn(`[stuck-shutdown-watchdog] reaped ${result.reaped} team(s) stuck in ` +
                         `shutting_down past ${stuckShutdownTimeoutMs}ms: ${result.reapedFocusIds.join(', ')}`);
                 }
-            }, 60_000, 'stuck-shutdown-watchdog'));
+            }, 60_000, 'stuck-shutdown-watchdog', { skipIfRunning: true }));
         },
     },
     // 2. Differential Focus Spec: cybernetic loop tick (60s).
@@ -59,7 +63,7 @@ export const LOOP_REGISTRY = [
         register(engine, config) {
             engine.intervals.push(safeInterval(async () => {
                 await engine.tickFocusLoop(config);
-            }, 60_000, 'focus-loop'));
+            }, 60_000, 'focus-loop', { skipIfRunning: true }));
         },
     },
     // 3. Differential Focus Spec: pluggable delivery verification tick (60s).
@@ -74,13 +78,13 @@ export const LOOP_REGISTRY = [
                 try {
                     const counts = await runVerificationTick(config);
                     if (counts.checked > 0) {
-                        console.log(`[verification] tick: checked=${counts.checked} passed=${counts.passed} failed=${counts.failed} pending=${counts.pending} escalated=${counts.escalated}`);
+                        log.info(`[verification] tick: checked=${counts.checked} passed=${counts.passed} failed=${counts.failed} pending=${counts.pending} escalated=${counts.escalated}`);
                     }
                 }
                 catch (err) {
-                    console.warn('[verification] tick failed:', err.message);
+                    log.warn('[verification] tick failed:', err.message);
                 }
-            }, 60_000, 'verification-loop'));
+            }, 60_000, 'verification-loop', { skipIfRunning: true }));
         },
     },
     // 4. FRT-rethink-on-flip: eager cascade-prose reconciliation tick (60s).
@@ -95,13 +99,13 @@ export const LOOP_REGISTRY = [
                 try {
                     const counts = await runCascadeProseTick(config);
                     if (counts.authored > 0) {
-                        console.log(`[frt-prose] tick: treesScanned=${counts.treesScanned} authored=${counts.authored}`);
+                        log.info(`[frt-prose] tick: treesScanned=${counts.treesScanned} authored=${counts.authored}`);
                     }
                 }
                 catch (err) {
-                    console.warn('[frt-prose] tick failed:', err.message);
+                    log.warn('[frt-prose] tick failed:', err.message);
                 }
-            }, 60_000, 'frt-prose-loop'));
+            }, 60_000, 'frt-prose-loop', { skipIfRunning: true }));
         },
     },
     // 5. Negative-branch reservation tick (5 minutes). Shares the
@@ -114,13 +118,13 @@ export const LOOP_REGISTRY = [
                 try {
                     const counts = await runNegativeBranchTick(config);
                     if (counts.proposed > 0) {
-                        console.log(`[negative-branch] tick: treesScanned=${counts.treesScanned} proposed=${counts.proposed}`);
+                        log.info(`[negative-branch] tick: treesScanned=${counts.treesScanned} proposed=${counts.proposed}`);
                     }
                 }
                 catch (err) {
-                    console.warn('[negative-branch] tick failed:', err.message);
+                    log.warn('[negative-branch] tick failed:', err.message);
                 }
-            }, 300_000, 'negative-branch-loop'));
+            }, 300_000, 'negative-branch-loop', { skipIfRunning: true }));
         },
     },
     // 6. Staged Assembly PRD layer: PRD-lifecycle controller tick (60s).
@@ -138,7 +142,7 @@ export const LOOP_REGISTRY = [
                         counts.armed > 0 ||
                         counts.obstaclesCleared > 0 ||
                         counts.prdsDone > 0) {
-                        console.log(`[prd-controller] tick: obstaclesEvaluated=${counts.obstaclesEvaluated} ` +
+                        log.info(`[prd-controller] tick: obstaclesEvaluated=${counts.obstaclesEvaluated} ` +
                             `obstaclesCleared=${counts.obstaclesCleared} materialized=${counts.materialized} ` +
                             `armed=${counts.armed} skippedNoRole=${counts.skippedNoRole} prdsDone=${counts.prdsDone}`);
                     }
@@ -147,16 +151,16 @@ export const LOOP_REGISTRY = [
                     // (no materialize/arm/clear/done happened). Warn loudly and name the
                     // fix so an operator who is not filing-escalation-watching still sees it.
                     if (counts.skippedNoRole > 0) {
-                        console.warn(`[prd-controller] ${counts.skippedNoRole} frontier focus/foci could NOT be armed: ` +
+                        log.warn(`[prd-controller] ${counts.skippedNoRole} frontier focus/foci could NOT be armed: ` +
                             'No arm role is set on the PRD (prds.assigned_agent_role_id is null -- PRD is not Played). ' +
                             'Play the PRD: telora_prd update prdId=<uuid> assignedAgentRoleId=<agent_roles uuid>. ' +
                             `(prdsBlockedNoRole=${counts.prdsBlockedNoRole})`);
                     }
                 }
                 catch (err) {
-                    console.warn('[prd-controller] tick failed:', err.message);
+                    log.warn('tick failed:', err.message);
                 }
-            }, 60_000, 'prd-controller'));
+            }, 60_000, 'prd-controller', { skipIfRunning: true }));
         },
     },
     // 7. Continuous merge-back loop (60s).
@@ -172,9 +176,9 @@ export const LOOP_REGISTRY = [
                     await runMergeBackTick(config);
                 }
                 catch (err) {
-                    console.warn('[merge-back-loop] tick failed:', err.message);
+                    log.warn('[merge-back-loop] tick failed:', err.message);
                 }
-            }, 60_000, 'merge-back-loop'));
+            }, 60_000, 'merge-back-loop', { skipIfRunning: true }));
         },
     },
     // 8. Differential Surface: drift-evaluation loop (10 minutes) + on-demand
@@ -191,9 +195,9 @@ export const LOOP_REGISTRY = [
                     await runDriftEvalTick(config);
                 }
                 catch (err) {
-                    console.warn('[drift-eval-loop] tick failed:', err.message);
+                    log.warn('[drift-eval-loop] tick failed:', err.message);
                 }
-            }, 600_000, 'drift-eval-loop'));
+            }, 600_000, 'drift-eval-loop', { skipIfRunning: true }));
             // On-demand requests poll (30 seconds). Drains
             // product_focuses.drift_eval_requested_at signals emitted by the
             // Re-evaluate button so the user sees results within seconds rather
@@ -203,9 +207,56 @@ export const LOOP_REGISTRY = [
                     await runPendingDriftEvalRequestsTick(config);
                 }
                 catch (err) {
-                    console.warn('[drift-eval-loop] request tick failed:', err.message);
+                    log.warn('[drift-eval-loop] request tick failed:', err.message);
                 }
-            }, 30_000, 'drift-eval-requests'));
+            }, 30_000, 'drift-eval-requests', { skipIfRunning: true }));
+        },
+    },
+    // 8b. Drift auto-ratification loop (60 seconds). Ratifies the safe majority
+    //     of the drift stream (per drift-ratify-policy.ts) with a system actor so
+    //     the tree tracks observed reality at machine speed instead of pooling in
+    //     `proposed`. Inward shortfalls and anything unclassifiable are left
+    //     untouched. Cadence is tight because the whole point is that the queue
+    //     never pools beyond the current tick; the work per tick is one list plus
+    //     one ratify per safe proposal.
+    {
+        guard: 'TELORA_DRIFT_RATIFY_LOOP',
+        announce: {
+            enabled: 'Drift auto-ratify loop tick: enabled (set TELORA_DRIFT_RATIFY_LOOP=0 to disable)',
+            disabled: 'Drift auto-ratify loop tick: disabled (TELORA_DRIFT_RATIFY_LOOP=0)',
+        },
+        register(engine, config) {
+            engine.intervals.push(safeInterval(async () => {
+                try {
+                    await runDriftRatifyTick(config);
+                }
+                catch (err) {
+                    log.warn('[drift-ratify-loop] tick failed:', err.message);
+                }
+            }, 60_000, 'drift-ratify-loop', { skipIfRunning: true }));
+        },
+    },
+    // 8c. Scoped shortfall-disposition pass (5 minutes). A focus carrying an
+    //     undisposed shortfall cannot converge -- the completion gate withholds
+    //     done. This arms a one-shot pass whose only mandate is disposing them, so
+    //     the hold self-heals instead of wedging. Slower cadence than the ratify
+    //     tick: arming spawns a team, so this is expensive work, and a held focus
+    //     is not urgent by the second.
+    {
+        guard: 'TELORA_SHORTFALL_DISPOSITION_LOOP',
+        announce: {
+            enabled: 'Shortfall-disposition loop tick: enabled (set TELORA_SHORTFALL_DISPOSITION_LOOP=0 to disable)',
+            disabled: 'Shortfall-disposition loop tick: disabled (TELORA_SHORTFALL_DISPOSITION_LOOP=0)',
+        },
+        register(engine, config) {
+            engine.intervals.push(safeInterval(async () => {
+                try {
+                    await runShortfallDispositionTick(config);
+                }
+                catch (err) {
+                    log.warn('[shortfall-disposition] tick failed:', err.message);
+                }
+            }, 300_000, 'shortfall-disposition-loop', { skipIfRunning: true }));
         },
     },
     // 9. Artifact-health sensor sweep (30 minutes).
@@ -220,14 +271,14 @@ export const LOOP_REGISTRY = [
                 try {
                     const counts = await runSensorSweepTick(config);
                     if (counts.snapshotsWritten > 0) {
-                        console.log(`[sensor-sweep] tick: productsScanned=${counts.productsScanned} ` +
+                        log.info(`[sensor-sweep] tick: productsScanned=${counts.productsScanned} ` +
                             `snapshotsWritten=${counts.snapshotsWritten} skippedUnchanged=${counts.skippedUnchanged}`);
                     }
                 }
                 catch (err) {
-                    console.warn('[sensor-sweep] tick failed:', err.message);
+                    log.warn('[sensor-sweep] tick failed:', err.message);
                 }
-            }, 1_800_000, 'sensor-sweep-loop'));
+            }, 1_800_000, 'sensor-sweep-loop', { skipIfRunning: true }));
         },
     },
     // 9b. CI-result sensor (5 minutes). Reads the integration tip's git-native CI
@@ -244,14 +295,14 @@ export const LOOP_REGISTRY = [
                 try {
                     const counts = await runCiSensorTick(config);
                     if (counts.escalationsFiled > 0 || counts.escalationsResolved > 0) {
-                        console.log(`[ci-sensor] tick: productsChecked=${counts.productsChecked} ` +
+                        log.info(`[ci-sensor] tick: productsChecked=${counts.productsChecked} ` +
                             `filed=${counts.escalationsFiled} resolved=${counts.escalationsResolved}`);
                     }
                 }
                 catch (err) {
-                    console.warn('[ci-sensor] tick failed:', err.message);
+                    log.warn('[ci-sensor] tick failed:', err.message);
                 }
-            }, 300_000, 'ci-sensor-loop'));
+            }, 300_000, 'ci-sensor-loop', { skipIfRunning: true }));
         },
     },
     // 10. Security scan loop (per-product cron cadence inside) + on-demand
@@ -266,7 +317,7 @@ export const LOOP_REGISTRY = [
         register(engine, config) {
             const intervalHours = loadEnvConfig().TELORA_SECURITY_SCAN_INTERVAL_HOURS;
             const intervalMs = Math.round(intervalHours * 3_600_000);
-            console.log(`Security scan loop tick: enabled, every ${intervalHours}h ` +
+            log.info(`Security scan loop tick: enabled, every ${intervalHours}h ` +
                 '(set TELORA_SECURITY_SCAN_LOOP=0 to disable, ' +
                 'TELORA_SECURITY_SCAN_INTERVAL_HOURS=<hours> to retune) ' +
                 '-- priming on startup so cron is honored across daemon restarts');
@@ -282,9 +333,9 @@ export const LOOP_REGISTRY = [
                     await runSecurityScanTick(securityScanDeps);
                 }
                 catch (err) {
-                    console.warn('[security-scan-loop] tick failed:', err.message);
+                    log.warn('[security-scan-loop] tick failed:', err.message);
                 }
-            }, intervalMs, 'security-scan-loop', { immediate: true }));
+            }, intervalMs, 'security-scan-loop', { immediate: true, skipIfRunning: true }));
             // On-demand requests poll (30 seconds). Drains
             // security_scan_configs.manual_run_requested_at signals emitted by
             // the "Run scan now" button so the user sees the scan start within
@@ -296,9 +347,9 @@ export const LOOP_REGISTRY = [
                     await runSecurityScanTick(securityScanDeps, { manualOnly: true });
                 }
                 catch (err) {
-                    console.warn('[security-scan-requests] tick failed:', err.message);
+                    log.warn('[security-scan-requests] tick failed:', err.message);
                 }
-            }, 30_000, 'security-scan-requests'));
+            }, 30_000, 'security-scan-requests', { skipIfRunning: true }));
         },
     },
     // 11. Config self-heal: prune products deleted from the backend (60s).
@@ -314,14 +365,14 @@ export const LOOP_REGISTRY = [
                 try {
                     const result = await reconcileDaemonProducts(config, reconcileDeps);
                     if (result.pruned.length > 0) {
-                        console.log(`[config-reconcile] tick: checked=${result.checked} pruned=${result.pruned.length} ` +
+                        log.info(`[config-reconcile] tick: checked=${result.checked} pruned=${result.pruned.length} ` +
                             `(${result.pruned.join(', ')}) kept=${result.kept}`);
                     }
                 }
                 catch (err) {
-                    console.warn('[config-reconcile] tick failed:', err.message);
+                    log.warn('[config-reconcile] tick failed:', err.message);
                 }
-            }, 60_000, 'config-reconcile'));
+            }, 60_000, 'config-reconcile', { skipIfRunning: true }));
         },
     },
 ];

package/dist/focus-loop-registry.js.map

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

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

@@ -1 +1 @@
-{"version":3,"file":"focus-merge.d.ts","sourceRoot":"","sources":["../src/focus-merge.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EACV,YAAY,EACZ,cAAc,EAEd,6BAA6B,EAC9B,MAAM,YAAY,CAAC;AAEpB,OAAO,EAA0B,cAAc,EAA8B,MAAM,eAAe,CAAC;AAInG,OAAO,EACL,gBAAgB,EAChB,8BAA8B,EAI/B,MAAM,qBAAqB,CAAC;AAK7B,OAAO,EAAE,6BAA6B,EAAE,MAAM,qBAAqB,CAAC;AAEpE;;;;GAIG;AACH,MAAM,WAAW,sBAAsB;IACrC,6BAA6B,CAAC,EAAE,OAAO,6BAA6B,CAAC;IACrE,gBAAgB,CAAC,EAAE,OAAO,gBAAgB,CAAC;IAC3C,8BAA8B,CAAC,EAAE,OAAO,8BAA8B,CAAC;CACxE;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE;IACN,YAAY,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACxC,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,EAAE,MAAM,CAAC;CAC3B,EACD,IAAI,GAAE,sBAA2B,GAChC,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAkE/B;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;;;GAIG;AACH,wBAAsB,wBAAwB,CAC5C,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC,CASf;AAED;;;;GAIG;AACH,MAAM,WAAW,2BAA2B;IAC1C,gBAAgB,CAAC,EAAE,OAAO,gBAAgB,CAAC;IAC3C,8BAA8B,CAAC,EAAE,OAAO,8BAA8B,CAAC;IACvE,cAAc,CAAC,EAAE,OAAO,cAAc,CAAC;CACxC;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,mBAAmB,EAC3B,IAAI,GAAE,2BAAgC,GACrC,OAAO,CAAC,IAAI,CAAC,CA4Df;AAiCD;;;;;;;;;;GAUG;AACH,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC,IAAI,CAAC,CAiHf;AAUD;;;;;;;;GAQG;AACH,wBAAsB,yBAAyB,CAC7C,SAAS,EAAE,cAAc,EACzB,aAAa,EAAE,MAAM,EAAE,EACvB,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,MAAM,EACzB,SAAS,GAAE,MAA6C,GACvD,OAAO,CAAC,6BAA6B,CAAC,CA4DxC;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,YAAY,EACpB,SAAS,EAAE,cAAc,EACzB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,MAAM,EAAE,GAC1B,OAAO,CAAC;IAAE,cAAc,EAAE,OAAO,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAAC,CAqL1D"}
+{"version":3,"file":"focus-merge.d.ts","sourceRoot":"","sources":["../src/focus-merge.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EACV,YAAY,EACZ,cAAc,EAEd,6BAA6B,EAC9B,MAAM,YAAY,CAAC;AAEpB,OAAO,EAA0B,cAAc,EAA8B,MAAM,eAAe,CAAC;AAInG,OAAO,EACL,gBAAgB,EAChB,8BAA8B,EAI/B,MAAM,qBAAqB,CAAC;AAK7B,OAAO,EAAE,6BAA6B,EAAE,MAAM,qBAAqB,CAAC;AAMpE;;;;GAIG;AACH,MAAM,WAAW,sBAAsB;IACrC,6BAA6B,CAAC,EAAE,OAAO,6BAA6B,CAAC;IACrE,gBAAgB,CAAC,EAAE,OAAO,gBAAgB,CAAC;IAC3C,8BAA8B,CAAC,EAAE,OAAO,8BAA8B,CAAC;CACxE;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE;IACN,YAAY,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACxC,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,EAAE,MAAM,CAAC;CAC3B,EACD,IAAI,GAAE,sBAA2B,GAChC,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAkE/B;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;;;GAIG;AACH,wBAAsB,wBAAwB,CAC5C,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC,CASf;AAED;;;;GAIG;AACH,MAAM,WAAW,2BAA2B;IAC1C,gBAAgB,CAAC,EAAE,OAAO,gBAAgB,CAAC;IAC3C,8BAA8B,CAAC,EAAE,OAAO,8BAA8B,CAAC;IACvE,cAAc,CAAC,EAAE,OAAO,cAAc,CAAC;CACxC;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,mBAAmB,EAC3B,IAAI,GAAE,2BAAgC,GACrC,OAAO,CAAC,IAAI,CAAC,CA4Df;AAiCD;;;;;;;;;;GAUG;AACH,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC,IAAI,CAAC,CAiHf;AAUD;;;;;;;;GAQG;AACH,wBAAsB,yBAAyB,CAC7C,SAAS,EAAE,cAAc,EACzB,aAAa,EAAE,MAAM,EAAE,EACvB,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,MAAM,EACzB,SAAS,GAAE,MAA6C,GACvD,OAAO,CAAC,6BAA6B,CAAC,CA4DxC;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,YAAY,EACpB,SAAS,EAAE,cAAc,EACzB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,MAAM,EAAE,GAC1B,OAAO,CAAC;IAAE,cAAc,EAAE,OAAO,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAAC,CAyL1D"}

package/dist/focus-merge.js

@@ -15,6 +15,8 @@ import { withRetry, sendMessage, ESCALATION_REASONS, ESCALATION_DISPOSITIONS } f
 import { spawnResolutionAgent } from './spawner/index.js';
 import { getFocusWorktree } from './focus-worktree-state.js';
 import { worktreeHasUncommittedChanges } from './worktree/index.js';
+import { createLogger } from './log.js';
+const log = createLogger({ module: 'focus-merge' });
 /**
  * Refuse a focus-branch merge when the worktree still has uncommitted changes.
  *
@@ -37,7 +39,7 @@ export async function refuseMergeIfWorktreeDirty(params, deps = {}) {
     if (!worktreePath || !hasUncommitted(worktreePath)) {
         return { refused: false };
     }
-    console.warn(`[focus-merge] REFUSING merge of "${deliveryName}" (${branchName} -> ${integrationBranch}): ` +
+    log.warn(`[focus-merge] REFUSING merge of "${deliveryName}" (${branchName} -> ${integrationBranch}): ` +
         `worktree ${worktreePath} has uncommitted changes.`);
     // Durable, focus-grain dedup: at most one open worktree-dirty escalation per
     // FOCUS, collapsed across the sibling classes (advance_blocked /
@@ -51,7 +53,7 @@ export async function refuseMergeIfWorktreeDirty(params, deps = {}) {
         alreadyOpen = await hasOpenEsc(focusId);
     }
     catch (err) {
-        console.warn(`[focus-merge] Open worktree-dirty escalation lookup failed for "${deliveryName}", proceeding to file: ${err.message}`);
+        log.warn(`[focus-merge] Open worktree-dirty escalation lookup failed for "${deliveryName}", proceeding to file: ${err.message}`);
     }
     if (alreadyOpen) {
         return { refused: true };
@@ -76,10 +78,10 @@ export async function refuseMergeIfWorktreeDirty(params, deps = {}) {
             whatWasTried: `Daemon was about to merge ${branchName} into ${integrationBranch} but \`git status --porcelain\` reported uncommitted changes in ${worktreePath}.`,
             helpNeeded: `Inspect ${worktreePath}; commit or discard the uncommitted changes (for a read-only audit, discard them), then the merge can be retried.`,
         }), { maxAttempts: 3, label: `escalation-dirty-worktree-merge-${deliveryId}` });
-        console.log(`[focus-merge] Filed dirty-worktree merge-refusal escalation for "${deliveryName}"`);
+        log.info(`Filed dirty-worktree merge-refusal escalation for "${deliveryName}"`);
     }
     catch (err) {
-        console.error(`[focus-merge] Failed to file dirty-worktree merge-refusal escalation for "${deliveryName}": ${err.message}`);
+        log.error(`[focus-merge] Failed to file dirty-worktree merge-refusal escalation for "${deliveryName}": ${err.message}`);
     }
     return { refused: true };
 }
@@ -93,7 +95,7 @@ export async function reportMergeConflictState(deliveryId, branchName) {
         await reportGitState(deliveryId, 'merge_conflict', branchName);
     }
     catch (err) {
-        console.warn(`[focus-merge] reportGitState merge_conflict failed for ${deliveryId}:`, err.message);
+        log.warn(`[focus-merge] reportGitState merge_conflict failed for ${deliveryId}:`, err.message);
     }
 }
 /**
@@ -119,7 +121,7 @@ export async function escalateMergeConflict(params, deps = {}) {
         await reportState(deliveryId, 'merge_conflict', branchName);
     }
     catch (err) {
-        console.warn(`[focus-merge] reportGitState merge_conflict failed for ${deliveryId}:`, err.message);
+        log.warn(`[focus-merge] reportGitState merge_conflict failed for ${deliveryId}:`, err.message);
     }
     // Durable, focus-grain dedup across the sibling classes. Fail open: if the
     // lookup errors we proceed to file rather than swallow a genuine first
@@ -129,10 +131,10 @@ export async function escalateMergeConflict(params, deps = {}) {
         alreadyOpen = await hasOpenEsc(focusId);
     }
     catch (err) {
-        console.warn(`[focus-merge] Open worktree-dirty escalation lookup failed for "${deliveryName}", proceeding to file: ${err.message}`);
+        log.warn(`[focus-merge] Open worktree-dirty escalation lookup failed for "${deliveryName}", proceeding to file: ${err.message}`);
     }
     if (alreadyOpen) {
-        console.log(`[focus-merge] Worktree-dirty escalation already open for focus ${focusId}, skipping duplicate merge-conflict row`);
+        log.info(`Worktree-dirty escalation already open for focus ${focusId}, skipping duplicate merge-conflict row`);
         return;
     }
     try {
@@ -153,10 +155,10 @@ export async function escalateMergeConflict(params, deps = {}) {
             whatWasTried: `Attempted automatic merge of ${branchName} into ${integrationBranch}.`,
             helpNeeded: `Resolve the merge conflicts between ${branchName} and ${integrationBranch}, then mark this escalation as resolved.`,
         }), { maxAttempts: 3, label: `escalation-focus-merge-conflict-${deliveryId}` });
-        console.log(`[focus-merge] Created merge conflict escalation for delivery "${deliveryName}"`);
+        log.info(`Created merge conflict escalation for delivery "${deliveryName}"`);
     }
     catch (err) {
-        console.error(`[focus-merge] Failed to create merge conflict escalation for "${deliveryName}": ${err.message}`);
+        log.error(`[focus-merge] Failed to create merge conflict escalation for "${deliveryName}": ${err.message}`);
     }
 }
 /**
@@ -173,10 +175,10 @@ function resolveMergeConflictEscalations(deliveries) {
         resolveOpenWorktreeDirtyEscalations(focusId, [MERGE_CONFLICT_ESCALATION_KIND])
             .then((n) => {
             if (n > 0) {
-                console.log(`[focus-merge] Merge resolved for focus ${focusId}; auto-resolved ${n} merge-conflict escalation(s).`);
+                log.info(`[focus-merge] Merge resolved for focus ${focusId}; auto-resolved ${n} merge-conflict escalation(s).`);
             }
         })
-            .catch((err) => console.warn(`[focus-merge] Auto-resolve of merge-conflict escalation failed for focus ${focusId}: ${err.message}`));
+            .catch((err) => log.warn(`[focus-merge] Auto-resolve of merge-conflict escalation failed for focus ${focusId}: ${err.message}`));
     }
 }
 /**
@@ -196,7 +198,7 @@ export async function checkResolvedMergeConflicts(config) {
         conflictDeliveries = await getMergeConflictDeliveries(config.organizationId, config.productId);
     }
     catch (err) {
-        console.warn(`[focus-merge] Failed to fetch merge conflict deliveries:`, err.message);
+        log.warn(`[focus-merge] Failed to fetch merge conflict deliveries:`, err.message);
         return;
     }
     if (conflictDeliveries.length === 0)
@@ -212,7 +214,7 @@ export async function checkResolvedMergeConflicts(config) {
     }
     for (const [branchName, deliveries] of byBranch) {
         const representative = deliveries[0];
-        console.log(`[focus-merge] Retrying merge for branch ${branchName} ` +
+        log.info(`[focus-merge] Retrying merge for branch ${branchName} ` +
             `(${deliveries.length} delivery/ies in merge_conflict state)`);
         const mergeResult = await mergeToIntegration({
             config,
@@ -221,23 +223,23 @@ export async function checkResolvedMergeConflicts(config) {
             deliveryId: representative.delivery_id,
         });
         if (mergeResult.success) {
-            console.log(`[focus-merge] Merge retry succeeded for branch ${branchName}`);
+            log.info(`[focus-merge] Merge retry succeeded for branch ${branchName}`);
             // Update all deliveries in this branch group. Dedup is durable now (an
             // open escalation suppresses re-filing); now that the merge succeeded we
             // also auto-resolve the open merge_conflict escalation(s) for the focus so
             // a resolved-in-fact conflict stops sitting in the human inbox.
             for (const d of deliveries) {
-                reportGitState(d.delivery_id, 'merged_to_integration').catch((err) => console.warn(`[focus-merge] reportGitState merged_to_integration failed for ${d.delivery_id}:`, err.message));
+                reportGitState(d.delivery_id, 'merged_to_integration').catch((err) => log.warn(`[focus-merge] reportGitState merged_to_integration failed for ${d.delivery_id}:`, err.message));
             }
             resolveMergeConflictEscalations(deliveries);
         }
         else {
-            console.log(`[focus-merge] Merge retry still failing for branch ${branchName}: ${mergeResult.error ?? 'unknown'}`);
+            log.info(`[focus-merge] Merge retry still failing for branch ${branchName}: ${mergeResult.error ?? 'unknown'}`);
             // Attempt fallback resolution agent if a worktree exists for this focus
             if (representative.focus_id) {
                 const worktreeInfo = getFocusWorktree(representative.focus_id);
                 if (worktreeInfo) {
-                    console.log(`[focus-merge] Spawning fallback resolution agent for branch ${branchName}`);
+                    log.info(`[focus-merge] Spawning fallback resolution agent for branch ${branchName}`);
                     // Merge integration back into the focus worktree to surface conflicts
                     const mergeBackResult = await mergeBackFromIntegration({
                         worktreePath: worktreeInfo.worktreePath,
@@ -263,9 +265,9 @@ export async function checkResolvedMergeConflicts(config) {
                                 deliveryId: representative.delivery_id,
                             });
                             if (retryResult.success) {
-                                console.log(`[focus-merge] Merge succeeded after fallback resolution for branch ${branchName}`);
+                                log.info(`Merge succeeded after fallback resolution for branch ${branchName}`);
                                 for (const d of deliveries) {
-                                    reportGitState(d.delivery_id, 'merged_to_integration').catch((err) => console.warn(`[focus-merge] reportGitState failed for ${d.delivery_id}:`, err.message));
+                                    reportGitState(d.delivery_id, 'merged_to_integration').catch((err) => log.warn(`reportGitState failed for ${d.delivery_id}:`, err.message));
                                 }
                                 resolveMergeConflictEscalations(deliveries);
                             }
@@ -312,7 +314,7 @@ export async function requestTeamLeadResolution(teamState, conflictFiles, branch
             `5. If typecheck or the targeted tests fail, fix the issues, commit, and re-run\n\n` +
             `Do NOT run git merge --abort. Your goal is to produce a clean merge commit that passes typecheck and the targeted tests.`;
         sendMessage(leadStdin, message);
-        console.log(`[focus-merge] Sent merge conflict resolution request to team lead for "${focusName}"`);
+        log.info(`Sent merge conflict resolution request to team lead for "${focusName}"`);
         // Poll git state to detect resolution
         const deadline = Date.now() + timeoutMs;
         const preResolutionHead = runGitSync(['rev-parse', 'HEAD'], worktreePath).output;
@@ -327,13 +329,13 @@ export async function requestTeamLeadResolution(teamState, conflictFiles, branch
                 // No unmerged files -- check if HEAD advanced (merge commit created)
                 const currentHead = runGitSync(['rev-parse', 'HEAD'], worktreePath).output;
                 if (currentHead !== preResolutionHead) {
-                    console.log(`[focus-merge] Team lead resolved merge conflicts for "${focusName}"`);
+                    log.info(`Team lead resolved merge conflicts for "${focusName}"`);
                     return { resolved: true };
                 }
             }
         }
         // Timeout expired
-        console.warn(`[focus-merge] Team lead did not resolve merge conflicts within ${timeoutMs / 1000}s for "${focusName}"`);
+        log.warn(`[focus-merge] Team lead did not resolve merge conflicts within ${timeoutMs / 1000}s for "${focusName}"`);
         return { resolved: false, reason: `Resolution timeout (${timeoutMs / 1000}s)` };
     }
     finally {
@@ -356,6 +358,10 @@ export async function requestTeamLeadResolution(teamState, conflictFiles, branch
  * `shouldAttemptMerge`, not here.
  */
 export async function mergeFocusBranch(config, teamState, sessionId, branchName, workedDeliveryIds) {
+    log.info(`Merging focus branch ${branchName} for "${teamState.focusName}"`, {
+        focusId: teamState.focusId,
+        sessionId,
+    });
     // Pick a representative delivery for merge operations (workflow lookup,
     // escalation references, mergeDeliveryBranch). Prefer a worked delivery;
     // fall back to any known delivery on the focus. Only return early if the
@@ -389,7 +395,7 @@ export async function mergeFocusBranch(config, teamState, sessionId, branchName,
         workflow = await fetchEffectiveWorkflow(representativeDeliveryId);
     }
     catch (err) {
-        console.warn(`[focus-executor] Failed to fetch workflow for merge, using fallback:`, err.message);
+        log.warn(`[focus-executor] Failed to fetch workflow for merge, using fallback:`, err.message);
         workflow = { id: 'fallback', stages: [] };
     }
     // ── Merge-back: sync integration into focus branch before merging out ──
@@ -402,14 +408,14 @@ export async function mergeFocusBranch(config, teamState, sessionId, branchName,
         });
         if (mergeBackResult.status === 'conflict') {
             const conflictFiles = mergeBackResult.conflictFiles ?? [];
-            console.log(`[focus-merge] Merge-back produced conflicts for "${teamState.focusName}": ` +
+            log.info(`[focus-merge] Merge-back produced conflicts for "${teamState.focusName}": ` +
                 `${conflictFiles.join(', ') || 'unknown files'}`);
             // If team lead is alive, delegate resolution to them
             if (teamState.leadStdin && teamState.phase === 'executing') {
                 const resolution = await requestTeamLeadResolution(teamState, conflictFiles, branchName, config.integrationBranch);
                 if (resolution.resolved) {
                     // Agent committed the merge resolution, proceed to integration merge
-                    console.log(`[focus-merge] Conflict resolved by team lead for "${teamState.focusName}", proceeding`);
+                    log.info(`Conflict resolved by team lead for "${teamState.focusName}", proceeding`);
                 }
                 else {
                     // Team lead could not resolve -- escalate
@@ -428,11 +434,11 @@ export async function mergeFocusBranch(config, teamState, sessionId, branchName,
             }
             else {
                 // No active team lead -- spawn a short-lived resolution agent
-                console.log(`[focus-merge] No active team lead for "${teamState.focusName}", spawning fallback resolution agent`);
+                log.info(`No active team lead for "${teamState.focusName}", spawning fallback resolution agent`);
                 // Report resolving_conflict state for all unmerged deliveries
                 for (const deliveryId of teamState.knownDeliveryIds) {
                     if (!teamState.mergedDeliveryIds.has(deliveryId)) {
-                        reportGitState(deliveryId, 'resolving_conflict').catch(err => console.warn(`[focus-merge] reportGitState resolving_conflict failed for ${deliveryId}:`, err.message));
+                        reportGitState(deliveryId, 'resolving_conflict').catch(err => log.warn(`reportGitState resolving_conflict failed for ${deliveryId}:`, err.message));
                     }
                 }
                 const fallbackResult = await spawnResolutionAgent({
@@ -446,7 +452,7 @@ export async function mergeFocusBranch(config, teamState, sessionId, branchName,
                     focusId: teamState.focusId,
                 });
                 if (fallbackResult.success) {
-                    console.log(`[focus-merge] Fallback resolution agent resolved conflicts for "${teamState.focusName}", proceeding`);
+                    log.info(`Fallback resolution agent resolved conflicts for "${teamState.focusName}", proceeding`);
                 }
                 else {
                     await escalateMergeConflict({
@@ -464,11 +470,11 @@ export async function mergeFocusBranch(config, teamState, sessionId, branchName,
             }
         }
         if (mergeBackResult.status === 'error') {
-            console.error(`[focus-merge] Merge-back error for "${teamState.focusName}": ${mergeBackResult.message}`);
+            log.error(`[focus-merge] Merge-back error for "${teamState.focusName}": ${mergeBackResult.message}`);
             return { mergeSucceeded: false, exitReason: mergeBackResult.message };
         }
         // status === 'clean' -- proceed to merge to integration
-        console.log(`[focus-merge] Merge-back clean for "${teamState.focusName}", proceeding to integration merge`);
+        log.info(`Merge-back clean for "${teamState.focusName}", proceeding to integration merge`);
     }
     const mergeOutcome = await mergeDeliveryBranch({
         config,
@@ -486,11 +492,11 @@ export async function mergeFocusBranch(config, teamState, sessionId, branchName,
     if (mergeOutcome.mergeSucceeded) {
         for (const deliveryId of deliveryIdsForGitState) {
             if (!teamState.mergedDeliveryIds.has(deliveryId)) {
-                reportGitState(deliveryId, 'merged_to_integration').catch(err => console.warn(`[focus-executor] reportGitState merged_to_integration failed for ${deliveryId}:`, err.message));
+                reportGitState(deliveryId, 'merged_to_integration').catch(err => log.warn(`[focus-executor] reportGitState merged_to_integration failed for ${deliveryId}:`, err.message));
                 // Propagate the merge commit SHA to all deliveries so the git state
                 // detector can track their containment in main/remote independently.
                 if (mergeOutcome.commitSha) {
-                    updateDeliveryMergeCommitSha(deliveryId, mergeOutcome.commitSha).catch(err => console.warn(`[focus-merge] updateDeliveryMergeCommitSha failed for ${deliveryId}:`, err.message));
+                    updateDeliveryMergeCommitSha(deliveryId, mergeOutcome.commitSha).catch(err => log.warn(`updateDeliveryMergeCommitSha failed for ${deliveryId}:`, err.message));
                 }
             }
         }
@@ -499,7 +505,7 @@ export async function mergeFocusBranch(config, teamState, sessionId, branchName,
         // Report merge_conflict state for worked deliveries only
         for (const deliveryId of deliveryIdsForGitState) {
             if (!teamState.mergedDeliveryIds.has(deliveryId)) {
-                reportMergeConflictState(deliveryId, branchName).catch(err => console.warn(`[focus-merge] reportMergeConflictState failed for ${deliveryId}:`, err.message));
+                reportMergeConflictState(deliveryId, branchName).catch(err => log.warn(`reportMergeConflictState failed for ${deliveryId}:`, err.message));
             }
         }
     }