fix(#1657): recover malformed (non-object) ~/.gsd/defaults.json in finishInstall (#1661)

* fix(#1657): recover malformed (non-object) ~/.gsd/defaults.json in finishInstall

JSON.parse of defaults.json succeeds for valid-JSON-but-non-object values (null, [],
42, "str"), which then bypassed the parse catch: null threw a TypeError on property
access (swallowed by the outer try/catch), and array/number/string had resolve_model_ids
set on a non-object whose JSON.stringify round-trip kept the broken shape. The non-Claude
finishInstall step now resets any non-object (null, non-object, or array) parse result to
{} before reading/writing, so the file is repaired and resolve_model_ids defaults normally.
Regression folded into the owning tests/bug-410-install-defaults-test-mode-guard.test.cjs
(parameterized over null/[]/42/"str").

* chore(#1657): backfill changeset pr ref to 1661

.changeset/gentle-jaguars-munch.md

@@ -0,0 +1,5 @@
+---
+type: Fixed
+pr: 1661
+---
+**`gsd install`/upgrade now recovers a malformed `~/.gsd/defaults.json` instead of leaving it broken** — a `defaults.json` containing a valid-JSON-but-non-object value (`null`, `[]`, a number, or a string) bypassed the parse `catch` and flowed through unrecovered: `null` threw a TypeError (swallowed by the outer guard, logging a confusing "Could not write" warning and leaving the file as `null`), while `[]`/`42`/`"str"` silently kept their broken shape on every install. The non-Claude finishInstall step now resets any non-object parse result to a fresh `{}` before reading/writing it, so the file is repaired and `resolve_model_ids` defaults normally.

bin/install.js

@@ -11322,6 +11322,14 @@ function finishInstall(settingsPath, settings, statuslineCommand, shouldInstallS
       fs.mkdirSync(gsdDir, { recursive: true });
       let defaults = {};
       try { defaults = JSON.parse(fs.readFileSync(defaultsPath, 'utf8')); } catch { /* new file */ }
+      // Recover a malformed (valid-JSON-but-non-object) defaults.json to a fresh object so
+      // the write below succeeds and the file is no longer broken. Without this, `null` /
+      // `[]` / a number / a string bypass the parse catch and either throw a TypeError on
+      // property access (swallowed by the outer try/catch, leaving the file broken) or get
+      // a property set that won't round-trip through JSON.stringify. (#1657)
+      if (defaults === null || typeof defaults !== 'object' || Array.isArray(defaults)) {
+        defaults = {};
+      }
       // Three-valued domain: false/absent → aliases; true → full IDs; "omit" → ''.
       // Honor ONLY an explicit canonical `true` opt-in (full model IDs) and an existing
       // "omit"; default everything else — absent, falsy, OR any non-canonical value — to

tests/bug-410-install-defaults-test-mode-guard.test.cjs

@@ -254,3 +254,40 @@ describe('Bug #1569: non-Claude finishInstall preserves explicit resolve_model_i
     });
   });
 });
+
+// Bug #1657 — finishInstall reads ~/.gsd/defaults.json with JSON.parse but did not
+// validate the result is a plain object. A valid-JSON-but-non-object value (null, [],
+// 42, "str") bypassed the catch and flowed through, leaving the malformed file on disk
+// unrecovered (and, for null, throwing a TypeError swallowed by the outer try/catch).
+// Folded into the owning install-defaults test (no new top-level bug-NNNN file).
+describe('Bug #1657: finishInstall recovers a malformed (non-object) defaults.json', () => {
+  function seedDefaultsRaw(raw) {
+    fs.mkdirSync(GSD_DIR, { recursive: true });
+    fs.writeFileSync(DEFAULTS_PATH, raw, 'utf8');
+  }
+  function runAndRead(runtime) {
+    const saved = process.env.GSD_TEST_MODE;
+    delete process.env.GSD_TEST_MODE;
+    const log = console.log; console.log = () => {};
+    let threw = null;
+    try {
+      installModule.finishInstall(SETTINGS_PATH, {}, null, false, runtime, true, null);
+    } catch (e) { threw = e.message; } finally { console.log = log; process.env.GSD_TEST_MODE = saved; }
+    let after = null;
+    try { after = JSON.parse(fs.readFileSync(DEFAULTS_PATH, 'utf8')); } catch (e) { after = 'UNPARSEABLE: ' + e.message; }
+    return { threw, after };
+  }
+
+  for (const [label, raw] of [['null', 'null'], ['array', '[]'], ['number', '42'], ['string', '"oops"']]) {
+    test(`seed ${label} (${raw}) recovers to a valid object with resolve_model_ids:omit`, () => {
+      seedDefaultsRaw(raw);
+      const { threw, after } = runAndRead('codex');
+      assert.equal(threw, null, `must not throw for seed ${label} (got: ${threw})`);
+      assert.equal(
+        after !== null && typeof after === 'object' && !Array.isArray(after) && after.resolve_model_ids === 'omit',
+        true,
+        `seed ${label} must recover to { resolve_model_ids: 'omit' }, got: ${JSON.stringify(after)}`,
+      );
+    });
+  }
+});