fix(FN-4621): complete Step 8 — resolve verification regressions

Fusion-Task-Id: FN-4621
Fusion-Task-Lineage: fc1b0b13-9052-4378-86e3-3634d6c9db4e

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"]);
   });
 });
 

packages/core/src/store.ts

@@ -2202,7 +2202,10 @@ export class TaskStore extends EventEmitter<TaskStoreEvents> {
       ...DEFAULT_SETTINGS,
       ...globalSettings,
       ...projectSettings,
-      worktrunk: resolveWorktrunkSettings(globalSettings.worktrunk, projectSettings.worktrunk),
+      worktrunk: resolveWorktrunkSettings(
+        globalSettings.worktrunk,
+        (projectSettings as Partial<Settings>).worktrunk,
+      ),
     };
     return canonicalizeSettings(merged);
   }