gsxdsm c430f95c1d fix(engine): add cross-process merge guard to prevent concurrent merges ...

Multiple engine processes (dashboard + serve) share the same SQLite database
but each has its own in-memory merge queue. Without a cross-process check,
two processes can start merging different tasks simultaneously.

Added store.getActiveMergingTask() as a DB-level check before any merge
starts. The drainMergeQueue defers with pollIntervalMs delay, and both
aiMergeTask and processPullRequestMergeTask have safety-net checks.
Also moved stale merge status cleanup to run regardless of autoMerge setting.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

2026-04-13 20:22:10 -07:00

..

__tests__

feat(FN-1719): rebuild eslint baseline and add memory lessons

2026-04-13 18:21:31 -07:00

ipc

feat(FN-1719): rebuild eslint baseline and add memory lessons

2026-04-13 18:21:31 -07:00

runtimes

feat: expose global execution concurrency limit in settings

2026-04-13 14:23:40 -07:00

agent-heartbeat.test.ts

feat(FN-1663): merge fusion/fn-1663

2026-04-13 15:51:05 -07:00

agent-heartbeat.ts

feat(FN-1663): merge fusion/fn-1663

2026-04-13 15:51:05 -07:00

agent-instructions.ts

chore: snapshot WIP across dashboard, engine, and core

2026-04-10 21:12:40 -07:00

agent-logger.test.ts

feat(KB-332): rename task prefix from KB to FN and branches from kb/ to fusion/

2026-03-31 19:29:47 -07:00

agent-logger.ts

feat(KB-330): rename internal packages from @kb/* to @fusion/*

2026-03-31 13:33:44 -07:00

agent-reflection.test.ts

feat(FN-1182): add agent reflection service and executor integration

2026-04-08 05:55:36 -07:00

agent-reflection.ts

fix blocking hot path operations

2026-04-11 21:23:36 -07:00

agent-tools.ts

feat(FN-1257): add runContext audit trail for task mutations

2026-04-09 13:59:43 -07:00

concurrency.test.ts

feat(FN-978): add diagnostic logging, semaphore resilience, and executor tests

2026-04-05 13:37:21 -07:00

concurrency.ts

feat(FN-978): add diagnostic logging, semaphore resilience, and executor tests

2026-04-05 13:37:21 -07:00

context-limit-detector.test.ts

feat(FN-1462): add context window exceeds limit pattern to context-limit-detector

2026-04-10 03:02:38 -07:00

context-limit-detector.ts

feat(FN-1462): add context window exceeds limit pattern to context-limit-detector

2026-04-10 03:02:38 -07:00

cron-runner.test.ts

feat(FN-1399): add background memory summarization after task completion

2026-04-09 16:14:44 -07:00

cron-runner.ts

feat(FN-1399): add background memory summarization after task completion

2026-04-09 16:14:44 -07:00

executor.test.ts

feat(FN-1719): rebuild eslint baseline and add memory lessons

2026-04-13 18:21:31 -07:00

executor.ts

feat(FN-1719): rebuild eslint baseline and add memory lessons

2026-04-13 18:21:31 -07:00

hybrid-executor.ts

refactor(FN-1317): rename remaining kb references to fn

2026-04-08 14:38:36 -07:00

index.ts

refactor: replace primary/secondary engine pattern with uniform ProjectEngineManager

2026-04-13 13:32:38 -07:00

logger.test.ts

fix: suppress execution output on stdout

2026-04-11 21:13:16 -07:00

logger.ts

fix: suppress execution output on stdout

2026-04-11 21:13:16 -07:00

merger.test.ts

feat(FN-1632): merge fusion/fn-1632

2026-04-12 15:28:10 -07:00

merger.ts

fix(engine): add cross-process merge guard to prevent concurrent merges

2026-04-13 20:22:10 -07:00

mission-autopilot.test.ts

Harden architecture hot paths

2026-04-12 15:13:27 -07:00

mission-autopilot.ts

Harden architecture hot paths

2026-04-12 15:13:27 -07:00

mission-execution-loop.test.ts

test(FEAT-004-FIX-002): add comprehensive unit tests for MissionExecutionLoop

2026-04-11 20:13:47 -07:00

mission-execution-loop.ts

fix blocking hot path operations

2026-04-11 21:23:36 -07:00

mission-factory-parity.integration.test.ts

feat(FN-1719): rebuild eslint baseline and add memory lessons

2026-04-13 18:21:31 -07:00

mission-feature-sync.ts

Fix mission task status sync

2026-04-13 17:14:06 -07:00

mission-scheduler.test.ts

feat(FN-1454): improve mission autopilot and stale recovery

2026-04-09 18:10:29 -07:00

node-health-monitor.test.ts

fix: suppress execution output on stdout

2026-04-11 21:13:16 -07:00

node-health-monitor.ts

feat(FN-1079): add remote node runtime orchestration

2026-04-07 22:56:09 -07:00

notifier.test.ts

feat(FN-1562): merge fusion/fn-1562

2026-04-10 21:22:59 -07:00

notifier.ts

feat(FN-1562): merge fusion/fn-1562

2026-04-10 21:22:59 -07:00

peer-exchange-service.test.ts

feat(FN-1224): add peer gossip protocol for mesh network synchronization

2026-04-09 13:22:29 -07:00

peer-exchange-service.ts

feat(FN-1224): add peer gossip protocol for mesh network synchronization

2026-04-09 13:22:29 -07:00

pi-create-kb-agent.test.ts

feat(FN-1719): rebuild eslint baseline and add memory lessons

2026-04-13 18:21:31 -07:00

pi.test.ts

feat(FN-882): add loop detection recovery with compact-and-resume

2026-04-04 19:47:48 -07:00

pi.ts

feat(FN-1719): rebuild eslint baseline and add memory lessons

2026-04-13 18:21:31 -07:00

plugin-runner.test.ts

feat(FN-1401): integrate PluginRunner into runtime lifecycle

2026-04-10 02:29:47 -07:00

plugin-runner.ts

feat(FN-1401): integrate PluginRunner into runtime lifecycle

2026-04-10 02:29:47 -07:00

pr-comment-handler.test.ts

feat(KB-341): unify steeringComments and comments into single comments system

2026-04-01 07:44:04 -07:00

pr-comment-handler.ts

feat(engine): harden review pipeline with strict scope, build retry, and E2E tests

2026-04-04 00:29:34 -07:00

pr-monitor.test.ts

feat(FN-840): add closed/merged PR feedback contract and clean up unused code

2026-04-04 02:01:58 -07:00

pr-monitor.ts

feat(FN-840): add closed/merged PR feedback contract and clean up unused code

2026-04-04 02:01:58 -07:00

project-engine-manager.ts

feat(engine): add background project engine reconciliation + global concurrency setting

2026-04-13 18:03:39 -07:00

project-engine.ts

fix(engine): add cross-process merge guard to prevent concurrent merges

2026-04-13 20:22:10 -07:00

project-manager.test.ts

feat(FN-1079): add remote node runtime orchestration

2026-04-07 22:56:09 -07:00

project-manager.ts

feat: multi-project engine runtime improvements

2026-04-12 19:59:12 -07:00

project-runtime.ts

feat: multi-project engine runtime improvements

2026-04-12 19:59:12 -07:00

rate-limit-retry.test.ts

fix(FN-000): harden project migration runtime

2026-04-02 17:55:25 -07:00

rate-limit-retry.ts

feat(FN-705): add rate-limit retry with exponential backoff for AI agents

2026-04-02 13:39:04 -07:00

recovery-policy.test.ts

feat(FN-775): add recoverable-retry with bounded exponential backoff

2026-04-03 07:58:45 -07:00

recovery-policy.ts

feat(FN-775): add recoverable-retry with bounded exponential backoff

2026-04-03 07:58:45 -07:00

restart.integration.test.ts

fix(engine): add cross-process merge guard to prevent concurrent merges

2026-04-13 20:22:10 -07:00

reviewer.test.ts

fix(engine): keep executor prompts scoped to worktrees

2026-04-13 00:03:16 -07:00

reviewer.ts

fix: prevent agents from killing production dashboard on port 4040

2026-04-13 18:00:49 -07:00

routine-runner.test.ts

feat(FN-1269): complete routine engine integration with RoutineRunner and RoutineScheduler

2026-04-10 12:11:55 -07:00

routine-runner.ts

feat(FN-1269): complete routine engine integration with RoutineRunner and RoutineScheduler

2026-04-10 12:11:55 -07:00

routine-scheduler.test.ts

feat(FN-1269): complete routine engine integration with RoutineRunner and RoutineScheduler

2026-04-10 12:11:55 -07:00

routine-scheduler.ts

feat(FN-1269): complete routine engine integration with RoutineRunner and RoutineScheduler

2026-04-10 12:11:55 -07:00

run-audit.integration.test.ts

test(FN-1414): add run-audit integration tests for core and engine

2026-04-10 09:21:38 -07:00

run-audit.ts

test(FN-1414): add run-audit integration tests for core and engine

2026-04-10 09:21:38 -07:00

scheduler.test.ts

Fix mission task status sync

2026-04-13 17:14:06 -07:00

scheduler.ts

Fix mission task status sync

2026-04-13 17:14:06 -07:00

self-healing.test.ts

feat(FN-1719): rebuild eslint baseline and add memory lessons

2026-04-13 18:21:31 -07:00

self-healing.ts

fix(FN-1619): convert remaining engine execSync calls to async execAsync

2026-04-12 17:21:24 -07:00

spec-staleness.test.ts

feat(FN-1646): add stale-spec guard to prevent execution of outdated tasks

2026-04-12 17:49:22 -07:00

spec-staleness.ts

feat(FN-1646): add stale-spec guard to prevent execution of outdated tasks

2026-04-12 17:49:22 -07:00

step-session-executor.test.ts

feat(FN-1719): rebuild eslint baseline and add memory lessons

2026-04-13 18:21:31 -07:00

step-session-executor.ts

feat(FN-1719): rebuild eslint baseline and add memory lessons

2026-04-13 18:21:31 -07:00

stuck-task-detector.test.ts

feat(FN-1461): fix stuck-task retry for step-session mode

2026-04-10 08:58:37 -07:00

stuck-task-detector.ts

feat(FN-1461): fix stuck-task retry for step-session mode

2026-04-10 08:58:37 -07:00

task-completion.ts

Harden architecture hot paths

2026-04-12 15:13:27 -07:00

token-cap-detector.test.ts

feat(FN-1000): add token cap detection for agent task execution

2026-04-05 22:50:03 -07:00

token-cap-detector.ts

feat(FN-1000): add token cap detection for agent task execution

2026-04-05 22:50:03 -07:00

transient-error-detector.test.ts

feat(FN-957): filter silent transient errors from executor and triage logs

2026-04-04 22:03:42 -07:00

transient-error-detector.ts

feat(FN-957): filter silent transient errors from executor and triage logs

2026-04-04 22:03:42 -07:00

triage.test.ts

Fix stranded task retry and respec reset

2026-04-13 11:10:17 -07:00

triage.ts

feat(FN-1719): rebuild eslint baseline and add memory lessons

2026-04-13 18:21:31 -07:00

usage-limit-detector.test.ts

feat(KB-332): rename task prefix from KB to FN and branches from kb/ to fusion/

2026-03-31 19:29:47 -07:00

usage-limit-detector.ts

fix(FN-703): fix overly broad usage limit pattern and add transient error retry

2026-04-02 13:29:48 -07:00

worktree-names.test.ts

refactor(FN-1317): rename remaining kb references to fn

2026-04-08 14:38:36 -07:00

worktree-names.ts

fix: reserve and clear task worktrees correctly

2026-04-05 20:56:58 -07:00

worktree-pool.test.ts

feat(FN-1719): rebuild eslint baseline and add memory lessons

2026-04-13 18:21:31 -07:00

worktree-pool.ts

fix(FN-1619): convert remaining engine execSync calls to async execAsync

2026-04-12 17:21:24 -07:00