* fix(#1569): preserve explicit resolve_model_ids in non-Claude installs The non-Claude finishInstall step keyed its resolve_model_ids:"omit" write on !== "omit", so an explicit true opt-in (resolveModelInternal returns full model IDs) was silently clobbered on every install/upgrade across all 14 non-Claude runtimes, making generated agent manifests inherit the active chat model instead of pinning the resolved model. Now only absent/falsy is defaulted to "omit"; an explicit true (and an existing "omit") is preserved. Regression test parameterizes across codex/opencode/gemini and covers the absent/false/idempotent/ claude/malformed boundaries. * chore(#1569): backfill changeset pr ref to 1653 * fix(#1569): default non-canonical resolve_model_ids values to omit (codex review) Adversarial review (codex, gpt-5.5/high) flagged that the original allowlist-by- enumeration condition (undefined/null/false -> omit) preserved malformed values (0, "", "yes", {}) instead of defaulting them to omit, letting them leak Claude aliases a non-Claude runtime cannot resolve. Switch to an allowlist condition (existing !== true && existing !== 'omit') so only an explicit canonical true opt-in and an existing omit are preserved; everything else defaults to the safe non-Claude omit. Adds a parameterized test over [0, "", "yes", {}].
This commit is contained in:
@@ -11307,10 +11307,14 @@ function finishInstall(settingsPath, settings, statuslineCommand, shouldInstallS
|
||||
configureKiloPermissions(isGlobal, configDir);
|
||||
}
|
||||
|
||||
// For non-Claude runtimes, set resolve_model_ids: "omit" in ~/.gsd/defaults.json
|
||||
// so resolveModelInternal() returns '' instead of Claude aliases (opus/sonnet/haiku)
|
||||
// that the runtime can't resolve. Users can still use model_overrides for explicit IDs.
|
||||
// See #1156. Guard matches the #130-class pattern on configureOpencodePermissions above.
|
||||
// For non-Claude runtimes, DEFAULT resolve_model_ids to "omit" in ~/.gsd/defaults.json
|
||||
// when it is absent or falsy, so resolveModelInternal() returns '' instead of Claude
|
||||
// aliases (opus/sonnet/haiku) the runtime can't resolve. An explicit `true` opt-in
|
||||
// (resolveModelInternal returns full materialized model IDs) MUST be preserved —
|
||||
// rewriting it to "omit" would make generated agent manifests inherit the active
|
||||
// chat model instead of pinning the resolved model. See #1156 (default-to-omit
|
||||
// intent) and #1569 (preserve explicit true). Guard matches the #130-class pattern
|
||||
// on configureOpencodePermissions above.
|
||||
if (runtime !== 'claude' && !process.env.GSD_TEST_MODE) {
|
||||
const gsdDir = path.join(os.homedir(), '.gsd');
|
||||
const defaultsPath = path.join(gsdDir, 'defaults.json');
|
||||
@@ -11318,7 +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 */ }
|
||||
if (defaults.resolve_model_ids !== 'omit') {
|
||||
// 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
|
||||
// "omit", the safe non-Claude default. Allowlist-based so malformed values
|
||||
// (0, "", "yes", {}, …) don't leak Claude aliases the runtime can't resolve (#1569).
|
||||
const existing = defaults.resolve_model_ids;
|
||||
const shouldDefaultToOmit = existing !== true && existing !== 'omit';
|
||||
if (shouldDefaultToOmit) {
|
||||
defaults.resolve_model_ids = 'omit';
|
||||
fs.writeFileSync(defaultsPath, JSON.stringify(defaults, null, 2) + '\n');
|
||||
console.log(` ${green}✓${reset} Set resolve_model_ids: "omit" in ~/.gsd/defaults.json`);
|
||||
|
||||
Reference in New Issue
Block a user