From a1d1c525099e33ce21cc47964b4b8cffdc54b832 Mon Sep 17 00:00:00 2001 From: Fusion Date: Fri, 15 May 2026 11:07:00 -0700 Subject: [PATCH] =?UTF-8?q?fix(FN-4621):=20complete=20Step=208=20=E2=80=94?= =?UTF-8?q?=20resolve=20verification=20regressions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fusion-Task-Id: FN-4621 Fusion-Task-Lineage: fc1b0b13-9052-4378-86e3-3634d6c9db4e --- packages/core/src/__tests__/settings-parity.test.ts | 2 +- packages/core/src/store.ts | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/core/src/__tests__/settings-parity.test.ts b/packages/core/src/__tests__/settings-parity.test.ts index 367852d93..dcc66832c 100644 --- a/packages/core/src/__tests__/settings-parity.test.ts +++ b/packages/core/src/__tests__/settings-parity.test.ts @@ -213,7 +213,7 @@ describe("settings key parity", () => { it("only intentional shared keys appear in both global and project scopes", () => { const projectKeySet = new Set(PROJECT_SETTINGS_KEYS as readonly string[]); const overlap = (GLOBAL_SETTINGS_KEYS as readonly string[]).filter((key) => projectKeySet.has(key)); - expect(overlap).toEqual(["taskTokenBudget", "githubTrackingDefaultRepo"]); + expect(overlap).toEqual(["taskTokenBudget", "githubTrackingDefaultRepo", "worktrunk"]); }); }); diff --git a/packages/core/src/store.ts b/packages/core/src/store.ts index 98296a967..1702c8cfd 100644 --- a/packages/core/src/store.ts +++ b/packages/core/src/store.ts @@ -2202,7 +2202,10 @@ export class TaskStore extends EventEmitter { ...DEFAULT_SETTINGS, ...globalSettings, ...projectSettings, - worktrunk: resolveWorktrunkSettings(globalSettings.worktrunk, projectSettings.worktrunk), + worktrunk: resolveWorktrunkSettings( + globalSettings.worktrunk, + (projectSettings as Partial).worktrunk, + ), }; return canonicalizeSettings(merged); }