root/fusion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(FN-3899): add chat rooms with send routing and delete-room UI

Browse Source 
This merge delivers chat rooms with room send routing and delete-room UI in the dashboard (FN-3899), including fixes for bundled plugin view imports and a release changeset. Supporting changes include a merger improvement that tightens scope-warning diff base when baseBranch is missing, companies.sh

Fusion-Task-Id: FN-3899
This commit is contained in:
Fusion
2026-05-09 16:29:11 -07:00
committed by gsxdsm
parent 0db491028e
commit 7ed685a21b
9 changed files with 221 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/engine/src/merger.ts
View File

@@ -5085,7 +5085,7 @@ export async function aiMergeTask(
// Try in-merge fix attempts before propagating
if (error.name === "VerificationError") {
const verificationErr = error as VerificationError;
const maxFixRetries = Math.min(settings.verificationFixRetries ?? 3, 3);
const maxFixRetries = Math.min(settings.verificationFixRetries ?? 2, 3);
if (maxFixRetries > 0 && (verificationErr.verificationResult.testResult || verificationErr.verificationResult.buildResult)) {
mergerLog.log(`${taskId}: deterministic verification failed — attempting in-merge fix (up to ${maxFixRetries} attempts)`);
@@ -5216,7 +5216,7 @@ export async function aiMergeTask(
// Check if it's a build verification failure
if (error.message?.includes("Build verification failed")) {
const maxFixRetries = Math.min(settings.verificationFixRetries ?? 3, 3);
const maxFixRetries = Math.min(settings.verificationFixRetries ?? 2, 3);
// Try in-merge fix before falling back to build retry
if (maxFixRetries > 0 && (effectiveTestCommand || effectiveBuildCommand)) {