chore: resolve stale rebase conflicts and fix types.ts overload error

- Resolve unresolved merge-conflict markers left in the onboarding UI
  files from an earlier aborted rebase; take the version from #2725
  (merged) in all three cases, since that matches the now-live UI.
- Remove three stale src/app/... files that were moved to apps/web/...
  upstream but lingered as "deleted by us" conflicts.
- Fix tsgo overload error in services/gastown/src/types.ts: the
  .default({}) on the refinery sub-schema wasn't satisfied by the
  empty-object literal because the inner shape has no required
  optional fields from the compiler's perspective. Spell out the
  defaults explicitly.

Author: jrf0110

apps/web/src/app/(app)/gastown/onboarding/OnboardingStepModel.tsx

@@ -351,22 +351,42 @@ export function OnboardingStepModel() {
   // Sync custom model state up to context whenever any field changes
   function handleSetCustomDefault(value: string) {
     setCustomDefault(value);
-    setCustomModels({ defaultModel: value, mayor: customMayor, refinery: customRefinery, polecat: customPolecat });
+    setCustomModels({
+      defaultModel: value,
+      mayor: customMayor,
+      refinery: customRefinery,
+      polecat: customPolecat,
+    });
   }
 
   function handleSetCustomMayor(value: string) {
     setCustomMayor(value);
-    setCustomModels({ defaultModel: customDefault, mayor: value, refinery: customRefinery, polecat: customPolecat });
+    setCustomModels({
+      defaultModel: customDefault,
+      mayor: value,
+      refinery: customRefinery,
+      polecat: customPolecat,
+    });
   }
 
   function handleSetCustomRefinery(value: string) {
     setCustomRefinery(value);
-    setCustomModels({ defaultModel: customDefault, mayor: customMayor, refinery: value, polecat: customPolecat });
+    setCustomModels({
+      defaultModel: customDefault,
+      mayor: customMayor,
+      refinery: value,
+      polecat: customPolecat,
+    });
   }
 
   function handleSetCustomPolecat(value: string) {
     setCustomPolecat(value);
-    setCustomModels({ defaultModel: customDefault, mayor: customMayor, refinery: customRefinery, polecat: value });
+    setCustomModels({
+      defaultModel: customDefault,
+      mayor: customMayor,
+      refinery: customRefinery,
+      polecat: value,
+    });
   }
 
   return (

apps/web/src/app/(app)/gastown/onboarding/onboarding.test.ts

@@ -218,7 +218,10 @@ describe('presetToConfig', () => {
   });
 
   test('uses defaultModel as fallback for unset role overrides', () => {
-    const config = presetToConfig('custom', { defaultModel: 'openai/gpt-4.1', mayor: 'openai/gpt-4.1' });
+    const config = presetToConfig('custom', {
+      defaultModel: 'openai/gpt-4.1',
+      mayor: 'openai/gpt-4.1',
+    });
     expect(config.default_model).toBe('openai/gpt-4.1');
     expect(config.role_models).toEqual({
       mayor: 'openai/gpt-4.1',

services/gastown/src/types.ts

@@ -291,7 +291,15 @@ export const TownConfigSchema = z.object({
        *  0 = immediate, null = disabled (require manual merge). */
       auto_merge_delay_minutes: z.number().int().min(0).nullable().default(5),
     })
-    .default({}),
+    .default({
+      gates: [],
+      auto_merge: true,
+      require_clean_merge: true,
+      code_review: true,
+      review_mode: 'comments',
+      auto_resolve_pr_feedback: true,
+      auto_merge_delay_minutes: 5,
+    }),
 
   /** Alarm interval when agents are active (seconds) */
   alarm_interval_active: z.number().int().min(5).max(600).optional(),