gsxdsm d75f861f24 FN-6199: harden AI merge worktree cleanup ...

Guarantee AI merge clean-room worktrees are pruned on merge completion and swept by task state.

- prune pre-existing same-task AI merge temp worktrees before starting a new merge and audit cleanup outcomes
- add task-aware tempdir sweep rules with a short grace period for done or archived tasks and immediate cleanup for deleted tasks
- extend merger and self-healing coverage and document the updated stale worktree policy

Files changed:
 .changeset/ai-merge-cleanup-sweep.md               |   5 +
 docs/architecture.md                               |   2 +-
 packages/engine/src/__tests__/merger-ai-cleanup.test.ts | 109 ++++++++++++++++++--
 packages/engine/src/__tests__/self-healing-tempdir-sweep.test.ts   | 112 ++++++++++++++++++++-
 packages/engine/src/merger-ai.ts                   |  63 ++++++++++++
 packages/engine/src/self-healing.ts                |  26 ++++-
 6 files changed, 300 insertions(+), 17 deletions(-)

Fusion-Task-Id: FN-6199

Fusion-Task-Lineage: 659cc52f-0994-4315-a187-6c865bbe3983

2026-06-10 10:57:02 -07:00

..

__tests__

FN-6199: harden AI merge worktree cleanup

2026-06-10 10:57:02 -07:00

auto-recovery-handlers

fix(engine): un-deadcode bootstrap-misbinding auto-recovery fallback

2026-05-23 02:29:38 -07:00

cli-agent

fix(review): schema-version gate, output-filter escape-bypass, generic double-wrap, follow-up resolution

2026-06-05 03:41:54 -07:00

experiment

FN-5782: wire branch groups into merge routing

2026-05-31 13:50:23 -07:00

external-integrations

feat(FN-5321): add evidence gap detector for external integration manifests

2026-05-20 15:54:44 -07:00

ipc

FN-5703: forward task:deleted events through in-process runtime

2026-05-29 20:05:14 -07:00

notification

FN-6093: fix ntfy workflow notification delivery

2026-06-09 12:50:26 -07:00

providers

FN-5638: migrate pi-ai and pi-coding-agent packages to @earendil-works scope

2026-05-28 21:23:48 -07:00

recovery

feat(FN-5349): add integration branch resolver with auto-recovery fallback

2026-05-21 12:04:58 -07:00

remote-access

feat(FN-5189): complete Step 3 — migrate supervised spawns

2026-05-19 17:19:02 -07:00

research

fix: Replace htmlUrl with url in gh search repos query

2026-05-23 22:09:25 -03:00

runtimes

FN-6070: fix completion-handoff limbo recovery accounting

2026-06-09 03:44:20 -07:00

sandbox

fix(FN-6043): recover stuck task processing

2026-06-08 18:14:48 -07:00

spec-validation

feat(FN-5321): add evidence gap detector for external integration manifests

2026-05-20 15:54:44 -07:00

test

…

types/node-pty

feat(engine): extract shared PTY native-asset loader and redactSecrets (U16)

2026-06-04 22:53:02 -07:00

active-session-registry.ts

fix(FN-5256): keep live task worktrees through pause/resume races

2026-05-21 09:06:23 -07:00

agent-action-gate.ts

…

agent-assignment.ts

FN-5941: stop missions stalling on incompatible/custom-role agents

2026-06-03 17:14:42 -07:00

agent-heartbeat.ts

FN-5977: expose goal retrieval tools across engine agents

2026-06-07 18:51:46 -07:00

agent-instructions.ts

feat(FN-4393): complete Step 3 — branch memory inclusion by mode

2026-05-13 23:41:35 -07:00

agent-logger.ts

feat(FN-4062): add global thinking log setting to persist agent reasoning a

2026-05-11 21:48:26 -07:00

agent-memory-index.ts

feat(FN-4393): complete Step 2 — add memory index builder

2026-05-13 23:41:35 -07:00

agent-reflection.ts

…

agent-runtime.ts

FN-5638: migrate pi-ai and pi-coding-agent packages to @earendil-works scope

2026-05-28 21:23:48 -07:00

agent-self-improve.ts

…

agent-session-helpers.ts

FN-5638: migrate pi-ai and pi-coding-agent packages to @earendil-works scope

2026-05-28 21:23:48 -07:00

agent-tools.ts

FN-6164: route agent task title summarization through the store

2026-06-09 22:18:48 -07:00

already-merged-detector.ts

fix(FN-branch-group): address PR review feedback (#1357)

2026-06-03 13:51:13 -07:00

auth-storage.ts

FN-5924: throttle OAuth expiry alerts across restarts

2026-06-02 23:13:16 -07:00

auto-claim-snapshot.ts

fix(FN-5137): complete Step 2-3 — guard deleted tasks in snapshot and executor

2026-05-19 07:45:12 -07:00

auto-merge-fact-providers.ts

feat(engine): add workflow extension plugin seams

2026-06-07 20:43:44 -07:00

auto-recovery.ts

feat(FN-5348): remove cwd-main integration mode fallback

2026-05-21 12:49:50 -07:00

backlog-pressure-reporter.ts

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

2026-05-18 12:31:21 -07:00

base-commit-capture.ts

fix(engine): capture baseCommitSha against local main, not origin/main

2026-06-03 15:24:03 -07:00

branch-attribution.ts

fix(FN-5304): guard against silent no-op landed-file attribution mismatches

2026-05-20 08:23:40 -07:00

branch-autocorrect.ts

fix(FN-5456): tidy autocorrect shell quoting and disambiguate checkout

2026-05-23 00:03:12 -07:00

branch-conflicts.ts

FN-6139: remove unused _baseSha parameter

2026-06-09 15:21:39 -07:00

cli-agent-validator.ts

feat(engine): cli-agent one-shot sessions for validator, planning, and CE (U9)

2026-06-05 00:15:57 -07:00

code-node-runner.ts

fix: address PR review feedback (#1424)

2026-06-04 16:16:50 -07:00

concurrency.ts

fix(FN-6043): address stuck task PR feedback

2026-06-08 20:29:37 -07:00

context-limit-detector.ts

…

cron-runner.ts

…

custom-providers.ts

FN-5833: fix custom Responses API model lookup

2026-06-01 08:23:02 -07:00

dependency-blocked-todo-reporter.ts

fix(FN-5091): harden maxAutoMergeRetries settings parsing

2026-05-19 03:21:18 -07:00

effective-node.ts

…

effective-settings.ts

feat(engine): per-task effective workflow settings — resolver, two-tier entry merge, fallback alignment

2026-06-04 22:37:51 -07:00

engine-errors.ts

fix: address PR review feedback (#1467)

2026-06-07 23:03:38 -07:00

engine-singleton-lock.ts

feat(engine): guard one engine per project per machine

2026-05-19 22:50:39 -07:00

ephemeral-worker-manager.ts

fix: avoid same-column task move errors and keep durable agents active

2026-05-14 19:26:58 -07:00

error-classifier.ts

chore(FN-4350): import dependency content from fusion/fn-4326

2026-05-13 12:30:45 -07:00

eval-followups.ts

feat(FN-5232): add deterministic verification-followup deduplication to pre

2026-05-19 19:28:05 -07:00

evaluator-evidence.ts

FN-5697: retry transient auto-merge failures and fix migration versioning

2026-05-29 10:23:59 -07:00

evaluator.ts

…

executor.ts

FN-6141: stop treating benign workflow-graph exits as failures

2026-06-09 15:27:57 -07:00

experiment-executor.ts

feat(FN-4219): complete Step 4 — add experiment executor runtime

2026-05-14 00:58:44 -07:00

fallback-model-observer.ts

…

gating-classifications.ts

FN-5977: expose goal retrieval tools across engine agents

2026-06-07 18:51:46 -07:00

goal-anchoring-audit.ts

FN-5758: add cited-goal audit aggregation and runtime route

2026-05-30 22:53:24 -07:00

goal-context-injector.ts

FN-5651: add single-seam goal-context injector for system prompts

2026-05-29 07:11:00 -07:00

goal-injection-diagnostics.ts

FN-5959: bridge task goal provenance from mission links

2026-06-03 15:32:29 -07:00

gridlock-detector.ts

…

group-merge-coordinator.ts

fix(FN-branch-group): repair CI failures — execFile mock compatibility, TaskCard narrowing, e2e memo race

2026-06-03 17:57:00 -07:00

heartbeat-procedure-resolver.ts

feat(FN-4400): complete Step 3 — add heartbeat prompt template resolver

2026-05-14 04:32:42 -07:00

heartbeat-prompt-trim.ts

fix(FN-4400): preserve triggering comment headings in trim helper

2026-05-14 04:32:43 -07:00

hold-release.ts

fix(FN-6082): restore workflow overlap blocking

2026-06-09 08:02:56 -07:00

hybrid-executor-gate.ts

perf(dashboard): speed up startup and eliminate API request storms

2026-05-26 21:57:31 -07:00

hybrid-executor.ts

feat(FN-4813): complete Step 5 — add isolation transition runtime restart path

2026-05-16 17:31:09 -07:00

index.ts

feat(FN-6035): route execution through workflow primitives

2026-06-08 19:13:14 -07:00

integration-branch.ts

feat(FN-5349): add integration branch resolver with auto-recovery fallback

2026-05-21 12:04:58 -07:00

interactive-ai-session.ts

feat(engine): cli-agent one-shot sessions for validator, planning, and CE (U9)

2026-06-05 00:15:57 -07:00

logger.ts

feat(pr): node-agnostic PR reconcile + hold-release firing (U4)

2026-06-05 20:05:29 -07:00

merge-trait.ts

fix(core): shared workflow-IR resolver, prod branch persistence + pruning, latest-run JOIN, sweep reservation-leak fix (#1402 #1407 #1412 #1413)

2026-06-04 07:34:02 -07:00

merger-ai.ts

FN-6199: harden AI merge worktree cleanup

2026-06-10 10:57:02 -07:00

merger-audit-recovery.ts

fix(FN-4186): stabilize workspace lint and test baselines

2026-05-13 20:20:26 -07:00

merger-auto-prerebase.ts

fix(FN-5627): always rebase behind branches before squash (safety fallback)

2026-05-28 15:04:41 -07:00

merger-bare-subject.ts

fix(engine): harden merge finalize SQLite bind and recover bare merge subjects

2026-05-26 21:57:31 -07:00

merger-diff-volume-gate.ts

feat(FN-4072): add diff volume gate to merger

2026-05-12 18:26:58 -07:00

merger-integration-worktree.ts

fix(merger): harden reuse-handoff autostash against shell injection and edit loss

2026-05-22 14:44:21 -07:00

merger-orphan-rehome.ts

feat(merger): auto-rehome FF-recoverable orphan commits in contamination recovery

2026-05-23 09:59:50 -07:00

merger-overlap-guard.ts

feat(FN-4071): add overlap guard to prevent concurrent merge conflicts

2026-05-12 09:06:54 -07:00

merger-ref-update-advance.ts

fix(FN-5627): close merger TOCTOU + add fast-path reachability gate

2026-05-28 13:02:30 -07:00

merger-scope-auto-widen.ts

feat(FN-5226): add scope auto-widen layer 2.5 to merger for attribution-bas

2026-05-21 16:30:31 -07:00

merger-squash-audit.ts

feat(FN-4069): add direct merge commit routing to merger

2026-05-12 17:04:33 -07:00

merger.ts

FN-6193: guard merger settings lookup for deleted tasks

2026-06-10 08:07:25 -07:00

mesh-lease-manager.ts

fix(FN-4826): complete Step 6 — stabilize audit emission and tests

2026-05-16 23:45:17 -07:00

mission-autopilot.ts

FN-5941: stop missions stalling on incompatible/custom-role agents

2026-06-03 17:14:42 -07:00

mission-execution-loop.ts

feat(engine): per-task effective workflow settings — resolver, two-tier entry merge, fallback alignment

2026-06-04 22:37:51 -07:00

mission-feature-sync.ts

FN-5715: gate mission feature completion on assertion validation

2026-05-30 09:43:02 -07:00

node-dispatch-validation.ts

…

node-health-monitor.ts

…

node-routing-policy.ts

feat(FN-4813): complete Step 3 — add owning-node handoff policy

2026-05-16 17:31:09 -07:00

notifier.ts

FN-6093: fix ntfy workflow notification delivery

2026-06-09 12:50:26 -07:00

peer-exchange-service.ts

…

permanent-agent-gating.ts

…

pi.ts

FN-6158: handle Codex auth-tier model incompatibility

2026-06-09 21:16:42 -07:00

plugin-parser-adapter.ts

feat(engine): U12e+U14 — parse-steps node handler, plugin parser adapter, code node runner (esbuild + child-process harness)

2026-06-04 12:44:43 -07:00

plugin-runner.ts

fix(engine): address workflow extension PR feedback

2026-06-07 21:19:10 -07:00

plugin-trait-adapter.ts

fix(core): shared workflow-IR resolver, prod branch persistence + pruning, latest-run JOIN, sweep reservation-leak fix (#1402 #1407 #1412 #1413)

2026-06-04 07:34:02 -07:00

plugin-workflow-extension-adapter.ts

fix(engine): address workflow extension PR feedback

2026-06-07 21:19:10 -07:00

pr-comment-handler.ts

feat(FN-5232): add deterministic verification-followup deduplication to pre

2026-05-19 19:28:05 -07:00

pr-monitor-gh.ts

…

pr-monitor.ts

…

pr-nodes.ts

fix(lint): empty-interface PrSourceDescriptor → type alias, drop unused eslint-disable directives

2026-06-06 00:15:28 -07:00

pr-reconcile.ts

feat(pr): node-agnostic PR reconcile + hold-release firing (U4)

2026-06-05 20:05:29 -07:00

pr-response-run-ops.ts

fix(review): apply autofix feedback

2026-06-05 22:49:39 -07:00

pr-response-run.ts

feat(pr): security-hardened review-response run — pr-respond body (U5)

2026-06-05 20:20:25 -07:00

project-engine-manager.ts

feat(pr): node-agnostic PR reconcile + hold-release firing (U4)

2026-06-05 20:05:29 -07:00

project-engine.ts

fix(FN-6035): address workflow primitive review feedback

2026-06-08 21:16:32 -07:00

project-manager.ts

FN-5703: forward task:deleted events through in-process runtime

2026-05-29 20:05:14 -07:00

project-runtime.ts

merge: main (workflow editor 109 / cli_sessions 110-111 / workflow_settings 112) — renumber PR-entity migration to 113, union core exports, TaskCard prNode + cliSessionState badges, executor PrNodeDeps + CliAgentRuntime options

2026-06-05 23:06:46 -07:00

prompt-layers.ts

FN-5653: inject active goal context into heartbeat and executor prompts

2026-05-29 20:05:14 -07:00

pty-native.ts

feat(engine): extract shared PTY native-asset loader and redactSecrets (U16)

2026-06-04 22:53:02 -07:00

rate-limit-retry.ts

…

recovery-policy.ts

…

research-dispatcher.ts

feat(FN-4221): complete Step 3 — wire research dispatcher into engine

2026-05-13 21:52:40 -07:00

research-orchestrator.ts

…

research-step-runner.ts

…

restart-recovery-coordinator.ts

perf(dashboard): cache gh CLI checks and defer SQLite integrity scan

2026-05-26 23:41:28 -07:00

retry-burned-logger.ts

fix(FN-4545): wire retry-burn logging and complete handler coverage

2026-05-14 22:16:44 -07:00

retry-with-backoff.ts

fix: address PR review feedback (#1467)

2026-06-07 23:03:38 -07:00

reviewer.ts

FN-6134: extend surface-enumeration gates to UI affordance changes

2026-06-09 15:12:26 -07:00

room-ambiguity.ts

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

2026-05-17 02:08:01 -07:00

room-coordination.ts

feat(FN-5425): add coordination notice system for multi-agent room task fil

2026-05-21 00:17:33 -07:00

routine-runner.ts

test(FN-4689): complete Step 2 — add routine sandbox audit tests

2026-05-15 16:38:45 -07:00

routine-scheduler.ts

…

run-audit.ts

FN-6188: harden AI merge temp worktree cleanup

2026-06-10 05:13:40 -07:00

run-verification-tool.ts

fix(FN-6043): address stuck task PR feedback

2026-06-08 20:29:37 -07:00

runtime-primitives.ts

feat(FN-6035): route execution through workflow primitives

2026-06-08 19:13:14 -07:00

runtime-resolution.ts

FN-5638: migrate pi-ai and pi-coding-agent packages to @earendil-works scope

2026-05-28 21:23:48 -07:00

scheduler.ts

FN-6177: remove queued-concurrency scheduler audit

2026-06-10 00:39:22 -07:00

secrets-env-writer.ts

chore: minor cleanups — docs index, test-project fixture, empty catches, triage timestamp guard

2026-05-19 14:22:11 -07:00

self-healing.ts

FN-6199: harden AI merge worktree cleanup

2026-06-10 10:57:02 -07:00

session-skill-context.ts

…

session-token-usage.ts

FN-5638: migrate pi-ai and pi-coding-agent packages to @earendil-works scope

2026-05-28 21:23:48 -07:00

shell-utils.ts

…

skill-resolver.ts

FN-6140: downgrade missing skill diagnostics to info

2026-06-09 15:50:53 -07:00

smart-pull.ts

feat(engine): export smartPull() library for stash-aware fast-forward

2026-05-23 14:26:57 -07:00

spec-staleness.ts

fix(engine): preserve parked progress through stale-spec checks

2026-05-30 21:53:00 -07:00

stale-task-reporter.ts

feat(FN-4465): complete Step 3 — scheduler stale task reporter

2026-05-14 05:55:16 -07:00

step-integration.ts

fix(review): apply code-review fixes — runId/foreachNodeId wiring, worktree-leak cleanup, rework re-execution, instance pruning, SIGKILL fallback, type dedup, board memo split, agent-native field-schema context + fn_workflow_get

2026-06-04 14:01:55 -07:00

step-runner.ts

feat(engine,core): U5+U6+U12core — step-review verdict handler, graph-source projection discipline, pluggable step-parser registry

2026-06-04 12:26:05 -07:00

step-session-executor.ts

FN-6117: expose task attachments in workflow step prompts

2026-06-09 13:31:30 -07:00

streaming-delta.ts

FN-5803: normalize streamed sentence spacing across message boundaries

2026-05-31 23:24:53 -07:00

stuck-task-detector.ts

fix(FN-5994): prevent verification hangs

2026-06-08 09:44:00 -07:00

task-agent-sync.ts

feat(FN-4296): complete Step 1 — add task moved agent link sync module

2026-05-14 05:35:34 -07:00

task-completion.ts

feat(FN-4091): fix stale blocker in WorkflowResultsTab

2026-05-12 17:24:44 -07:00

token-budget-enforcer.ts

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

2026-05-14 08:24:01 -07:00

token-cap-detector.ts

FN-5638: migrate pi-ai and pi-coding-agent packages to @earendil-works scope

2026-05-28 21:23:48 -07:00

tool-availability.ts

FN-5638: migrate pi-ai and pi-coding-agent packages to @earendil-works scope

2026-05-28 21:23:48 -07:00

transient-error-detector.ts

FN-6158: handle Codex auth-tier model incompatibility

2026-06-09 21:16:42 -07:00

transient-merge-error-classifier.ts

fix(FN-5627): suppress ntfy notifications for transient merge failures the engine auto-recovers

2026-05-28 15:39:23 -07:00

triage-preflight.ts

fix(FN-4892): harden intake auto-archive fail-open behavior

2026-05-18 00:53:23 -07:00

triage.ts

FN-6168: expose workflow routing in triage

2026-06-09 22:34:34 -07:00

unlinked-missions-advisory-reporter.ts

FN-6050: stop re-emitting existing mission advisories

2026-06-09 03:53:34 -07:00

usage-limit-detector.ts

…

verification-followup-dedup.ts

feat(FN-5232): add deterministic verification-followup deduplication to pre

2026-05-19 19:28:05 -07:00

verification-utils.ts

feat(FN-4643): complete Step 4 — delegate verification streaming to sandbox backend

2026-05-15 12:12:50 -07:00

web-fetch.ts

…

workflow-authoritative-driver.ts

fix(FN-6035): model pre-merge workflow steps in builtin coding

2026-06-08 22:02:26 -07:00

workflow-graph-branches.ts

fix(core): shared workflow-IR resolver, prod branch persistence + pruning, latest-run JOIN, sweep reservation-leak fix (#1402 #1407 #1412 #1413)

2026-06-04 07:34:02 -07:00

workflow-graph-executor.ts

FN-6031: add workflow notification nodes

2026-06-09 01:57:16 -07:00

workflow-graph-foreach.ts

FN-6087: skip completed foreach steps on resume

2026-06-09 09:00:46 -07:00

workflow-graph-loop.ts

fix(FN-0000): address workflow loop review feedback

2026-06-08 00:19:50 -07:00

workflow-graph-task-runner.ts

FN-6031: add workflow notification nodes

2026-06-09 01:57:16 -07:00

workflow-node-handlers.ts

FN-6031: add workflow notification nodes

2026-06-09 01:57:16 -07:00

workflow-parity-observer.ts

FN-5768: add dual-observe workflow parity instrumentation

2026-05-31 08:32:01 -07:00

workflow-step-tool-policy.ts

FN-5638: migrate pi-ai and pi-coding-agent packages to @earendil-works scope

2026-05-28 21:23:48 -07:00

workflow-task-runtime.ts

fix(FN-6035): address workflow primitive review feedback

2026-06-08 21:16:32 -07:00

worktree-acquisition.ts

FN-5818: fix shared-branch-group execution to use per-task working branches

2026-06-01 01:37:25 -07:00

worktree-backend.ts

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

2026-05-22 22:43:26 -07:00

worktree-db-hydrate.ts

feat(FN-5128): complete Step 2 — add soft-delete guard to hydration

2026-05-19 05:57:57 -07:00

worktree-desktop-artifacts.ts

feat(FN-4938): complete Step 2 — add helper and wire cleanup

2026-05-18 01:50:22 -07:00

worktree-hooks.ts

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

2026-05-22 22:43:26 -07:00

worktree-names.ts

feat(engine): U10 — parallel step execution: dependency scheduler, per-instance worktrees, ordered integration, conflict→rework (KTD-11)

2026-06-04 13:04:15 -07:00

worktree-paths.ts

feat(FN-4623): complete Step 3 — add backend-aware path resolution

2026-05-15 19:37:48 -07:00

worktree-pool.ts

fix(ci): widen Column to ColumnId in plugins + drop unused import after #1403 widening

2026-06-04 08:40:10 -07:00

worktree-prune.ts

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

2026-05-18 11:01:32 -07:00

worktree-ref-sync.ts

fix(engine,dashboard): close 7 review findings on merger auto-sync

2026-05-23 15:13:17 -07:00

worktree-stale-lock.ts

feat(FN-4830): complete Step 1 — add stale lock helper

2026-05-16 20:54:33 -07:00

worktree-stale-registration.ts

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

2026-05-18 15:51:01 -07:00

worktrunk-failure-handler.ts

feat(FN-4626): complete Step 5 — align worktrunk failure payload shape

2026-05-15 22:18:09 -07:00

worktrunk-installer.ts

feat(FN-5321): add evidence gap detector for external integration manifests

2026-05-20 15:54:44 -07:00