w0wl0lxd · w0wl0lxd · Aug 1, 2026 · Aug 1, 2026 · Aug 1, 2026 · Aug 1, 2026
diff --git a/changelog.d/286.fixed.md b/changelog.d/286.fixed.md
@@ -0,0 +1 @@
+fixed: Merge origin/main into fix/live-task-router-classification, resolving conflicts in fusion orchestration and tool dispatch
diff --git a/changelog.d/311.fixed.md b/changelog.d/311.fixed.md
diff --git a/changelog.d/fusion-beta-orchestration.added.md b/changelog.d/fusion-beta-orchestration.added.md
@@ -0,0 +1 @@
+Add opt-in Fusion sidekick orchestration with typed lifecycle events, guarded delegation, lead review and fallback, usage accounting, and live UI phase updates.
diff --git a/flake.lock b/flake.lock
diff --git a/n00n-agent/src/agent/run.rs b/n00n-agent/src/agent/run.rs
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		fixed: Merge origin/main into fix/live-task-router-classification, resolving conflicts in fusion orchestration and tool dispatch
coderabbitai Bot Aug 5, 2026 Copy link Copy Markdown Contributor Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. 📐 Maintainability & Code Quality \| 🟡 Minor \| ⚡ Quick win Replace the merge-log text with a user-facing change description. Line [1] describes a branch merge and conflict resolution. It does not describe the behavior fixed for users. Replace the internal branch name and merge details with the live task progress or tool-dispatch behavior delivered by this change. Based on learnings, `changelog.d` fragments are user-facing release-note entries, so this line should describe the fix rather than the merge process. 🧰 Tools 🪛 markdownlint-cli2 (0.23.2) [warning] 1-1: First line in a file should be a top-level heading (MD041, first-line-heading, first-line-h1) 🤖 Prompt for AI Agents Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@changelog.d/286.fixed.md` at line 1, Replace the merge and conflict-resolution text in the changelog fragment with a concise user-facing description of the live task progress or tool-dispatch behavior fixed by this change, removing internal branch names and merge details. Source: Learnings
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Add opt-in Fusion sidekick orchestration with typed lifecycle events, guarded delegation, lead review and fallback, usage accounting, and live UI phase updates.