* test(#2069): add fail-first regression for global-defaults dropped keys Adds four failing-first regression cases to tests/defaults-json-fallback.test.cjs: - model_policy forwarded from ~/.gsd/defaults.json - model_profile_overrides forwarded from ~/.gsd/defaults.json - runtime forwarded from ~/.gsd/defaults.json - parity: model_policy survives identically whether it lives in the global defaults or in a project's .planning/config.json All four fail on unfixed code (Branch D of loadConfigResolved builds _globalBaseCfg from a whitelist that omits these three keys). The project-config path at config-loader.cts:602-604 already forwards them, so the global path should too. * fix(#2069): forward model_policy, model_profile_overrides, runtime from global defaults The _globalBaseCfg whitelist in Branch D of loadConfigResolved previously omitted three keys that the project-config path forwards parsed['…']: - runtime - model_profile_overrides - model_policy so ~/.gsd/defaults.json silently dropped them. A machine-wide model policy (or runtime / profile overrides) was honored inside a project (where .planning/config.json carries it) but ignored for out-of-project runs — resolve-model fell back to the profile default with no warning. Adds the three entries to _globalBaseCfg in the same (globalDefaults['…']) || null shape as the sibling keys and the project-config path, so global defaults honor them identically. Regression tests in the prior commit (#2069 fail-first) demonstrate the fix on the same suite that previously failed. * test(#2069): extend parity test to all three previously-dropped keys Code review (subagent) flagged that the parity test only asserted model_policy shape-parity between global-defaults and project-config paths. A future regression breaking just runtime or just model_profile_overrides shape (e.g. someone changing parsed['runtime'] to ?? null in the project path) would slip a single-key test. Extends the parity test to assert deepStrictEqual / strictEqual across all three keys: model_policy, model_profile_overrides, runtime. Same two-dir setup, three cheap assertions. * chore(changeset): backfill pr:2442 in .changeset/sturdy-seals-fly.md
This commit is contained in:
5
.changeset/sturdy-seals-fly.md
Normal file
5
.changeset/sturdy-seals-fly.md
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
type: Fixed
|
||||||
|
pr: 2442
|
||||||
|
---
|
||||||
|
**`~/.gsd/defaults.json` no longer silently drops `model_policy`, `model_profile_overrides`, and `runtime`** — the global-defaults path of config load now forwards these three keys identically to a project's `.planning/config.json`, so a machine-wide model policy / runtime / overrides specified globally is honored even outside a project. (#2069)
|
||||||
@@ -731,6 +731,14 @@ function loadConfigResolved(cwd: string, options: Record<string, unknown> = {}):
|
|||||||
fast_mode: (globalDefaults['fast_mode']) || null,
|
fast_mode: (globalDefaults['fast_mode']) || null,
|
||||||
agent_skills: (globalDefaults['agent_skills']) || {},
|
agent_skills: (globalDefaults['agent_skills']) || {},
|
||||||
response_language: (globalDefaults['response_language']) || null,
|
response_language: (globalDefaults['response_language']) || null,
|
||||||
|
// #2069: forward model_policy / model_profile_overrides / runtime so the global-defaults
|
||||||
|
// path is at parity with the project-config path (which forwards these three from
|
||||||
|
// parsed['…'] at the top of this function). Without these entries, ~/.gsd/defaults.json
|
||||||
|
// silently drops them — model_policy/provider/budget etc. are honored when set in a
|
||||||
|
// project but ignored when set globally.
|
||||||
|
runtime: (globalDefaults['runtime']) || null,
|
||||||
|
model_profile_overrides: (globalDefaults['model_profile_overrides']) || null,
|
||||||
|
model_policy: (globalDefaults['model_policy']) || null,
|
||||||
};
|
};
|
||||||
// Branch D: global-defaults
|
// Branch D: global-defaults
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -140,4 +140,107 @@ describe('loadConfig ~/.gsd/defaults.json fallback (#1683)', () => {
|
|||||||
assert.strictEqual(config.model_profile, 'balanced');
|
assert.strictEqual(config.model_profile, 'balanced');
|
||||||
assert.strictEqual(config.context_window, 200000);
|
assert.strictEqual(config.context_window, 200000);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// ─── #2069: global-defaults must forward model_policy / model_profile_overrides / runtime ─
|
||||||
|
// The _globalBaseCfg whitelist in Branch D of loadConfigResolved previously omitted these
|
||||||
|
// three keys, so they were silently dropped from ~/.gsd/defaults.json while the identical
|
||||||
|
// keys in a project's .planning/config.json were honored. The tests below are fail-first:
|
||||||
|
// each asserts the global path forwards its key, mirroring the project-config parity test.
|
||||||
|
|
||||||
|
test('#2069 defaults.json model_policy → forwarded from global defaults', (t) => {
|
||||||
|
const tmpDir = createBareTmpDir();
|
||||||
|
const policy = { provider: 'anthropic', budget: 'high' };
|
||||||
|
|
||||||
|
const gsdDir = path.join(tmpDir, '.gsd');
|
||||||
|
fs.mkdirSync(gsdDir, { recursive: true });
|
||||||
|
fs.writeFileSync(
|
||||||
|
path.join(gsdDir, 'defaults.json'),
|
||||||
|
JSON.stringify({ model_policy: policy })
|
||||||
|
);
|
||||||
|
|
||||||
|
process.env.GSD_HOME = tmpDir;
|
||||||
|
t.after(() => { delete process.env.GSD_HOME; cleanup(tmpDir); });
|
||||||
|
|
||||||
|
const config = loadConfig(tmpDir);
|
||||||
|
assert.deepStrictEqual(config.model_policy, policy);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('#2069 defaults.json model_profile_overrides → forwarded from global defaults', (t) => {
|
||||||
|
const tmpDir = createBareTmpDir();
|
||||||
|
const overrides = { claude: { planner: { model: 'claude-opus-4-5' } } };
|
||||||
|
|
||||||
|
const gsdDir = path.join(tmpDir, '.gsd');
|
||||||
|
fs.mkdirSync(gsdDir, { recursive: true });
|
||||||
|
fs.writeFileSync(
|
||||||
|
path.join(gsdDir, 'defaults.json'),
|
||||||
|
JSON.stringify({ model_profile_overrides: overrides })
|
||||||
|
);
|
||||||
|
|
||||||
|
process.env.GSD_HOME = tmpDir;
|
||||||
|
t.after(() => { delete process.env.GSD_HOME; cleanup(tmpDir); });
|
||||||
|
|
||||||
|
const config = loadConfig(tmpDir);
|
||||||
|
assert.deepStrictEqual(config.model_profile_overrides, overrides);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('#2069 defaults.json runtime → forwarded from global defaults', (t) => {
|
||||||
|
const tmpDir = createBareTmpDir();
|
||||||
|
const runtime = 'codex';
|
||||||
|
|
||||||
|
const gsdDir = path.join(tmpDir, '.gsd');
|
||||||
|
fs.mkdirSync(gsdDir, { recursive: true });
|
||||||
|
fs.writeFileSync(
|
||||||
|
path.join(gsdDir, 'defaults.json'),
|
||||||
|
JSON.stringify({ runtime })
|
||||||
|
);
|
||||||
|
|
||||||
|
process.env.GSD_HOME = tmpDir;
|
||||||
|
t.after(() => { delete process.env.GSD_HOME; cleanup(tmpDir); });
|
||||||
|
|
||||||
|
const config = loadConfig(tmpDir);
|
||||||
|
assert.strictEqual(config.runtime, runtime);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('#2069 defaults.json parity: model_policy / model_profile_overrides / runtime survive identically to project-config path', (t) => {
|
||||||
|
// Identical values in ~/.gsd/defaults.json (no .planning/) vs .planning/config.json (no defaults.json)
|
||||||
|
// must produce identical config.<key> for each of the three previously-dropped keys. A future
|
||||||
|
// regression breaking shape-parity for just one key — e.g. changing the project path to
|
||||||
|
// `parsed['runtime'] ?? null` — would slip a single-key test, so all three are asserted here.
|
||||||
|
const policy = { provider: 'anthropic', budget: 'low' };
|
||||||
|
const overrides = { claude: { planner: { model: 'claude-opus-4-5' } } };
|
||||||
|
const runtime = 'codex';
|
||||||
|
|
||||||
|
// Global path: ~/.gsd/defaults.json only, no .planning/
|
||||||
|
const globalDir = createBareTmpDir();
|
||||||
|
const globalGsdDir = path.join(globalDir, '.gsd');
|
||||||
|
fs.mkdirSync(globalGsdDir, { recursive: true });
|
||||||
|
fs.writeFileSync(
|
||||||
|
path.join(globalGsdDir, 'defaults.json'),
|
||||||
|
JSON.stringify({ model_policy: policy, model_profile_overrides: overrides, runtime })
|
||||||
|
);
|
||||||
|
|
||||||
|
process.env.GSD_HOME = globalDir;
|
||||||
|
const globalConfig = loadConfig(globalDir);
|
||||||
|
delete process.env.GSD_HOME;
|
||||||
|
t.after(() => { cleanup(globalDir); });
|
||||||
|
|
||||||
|
// Project path: .planning/config.json only, no defaults.json
|
||||||
|
const projectDir = createBareTmpDir();
|
||||||
|
fs.mkdirSync(path.join(projectDir, '.planning'), { recursive: true });
|
||||||
|
fs.writeFileSync(
|
||||||
|
path.join(projectDir, '.planning', 'config.json'),
|
||||||
|
JSON.stringify({ model_policy: policy, model_profile_overrides: overrides, runtime })
|
||||||
|
);
|
||||||
|
|
||||||
|
// GSD_HOME pointing somewhere with no defaults.json so the project path is the sole source.
|
||||||
|
const emptyHome = createBareTmpDir();
|
||||||
|
process.env.GSD_HOME = emptyHome;
|
||||||
|
const projectConfig = loadConfig(projectDir);
|
||||||
|
delete process.env.GSD_HOME;
|
||||||
|
t.after(() => { cleanup(projectDir); cleanup(emptyHome); });
|
||||||
|
|
||||||
|
assert.deepStrictEqual(globalConfig.model_policy, projectConfig.model_policy);
|
||||||
|
assert.deepStrictEqual(globalConfig.model_profile_overrides, projectConfig.model_profile_overrides);
|
||||||
|
assert.strictEqual(globalConfig.runtime, projectConfig.runtime);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user