* fix(#2460): pi before_provider_request fail-opens without explicit override pi/gsd.cjs's buildBeforeProviderRequestHandler unconditionally rewrote payload.model to the built-in pi/sonnet tier default (claude-sonnet-5) via resolveTierEntry's catalog fallback. For any pi user on a non-Anthropic provider (kimi-coding, zai, openrouter, openai-codex, minimax, ...), this silently broke every request: pi's chosen model was replaced with one the active provider did not know. The fix inspects model_profile_overrides.pi[tier] explicitly BEFORE calling resolveTierEntry (which falls back to the built-in catalog and would mask the 'user did not opt in' signal). When the user has not set an override (or set it to null), the handler returns undefined — fail-open — and pi's chosen model flows through untouched. Only an explicit opt-in via model_profile_overrides.pi[tier] steers. Tests: - the ACTUALLY-REGISTERED handler fail-opens when no override configured (was: 'steers to default-tier model-catalog pi id' — encoded the bug). - new test reproducing the reporter's exact repro (model: 'k3' → undefined). - override path: explicit model_profile_overrides.pi.sonnet config steers to the user-configured model id. - defensive: explicit null override also fail-opens. Per the reporter's suggested fix #1 of #2460. * test(#2460): regen pi golden parity + install tree fixtures pi/gsd.cjs changed → pi install hash changed → regenerate the parity + install-tree fixtures via UPDATE_GOLDEN=1 + UPDATE_INSTALL_TREE=1. * fix(#2460): treat empty-string override as fail-open (M1 review) Per code-review M1 + security M1: an explicit empty-string override (`{ pi: { sonnet: "" } }`) silently bypassed the fail-open guard because the check was `=== undefined || === null` only. resolveTierEntry's falsy `if (userRaw)` then fell back to the built-in catalog and rewrote payload.model to claude-sonnet-5 — re-introducing the exact bug this PR fixes, via a degenerate config shape. Fix: widen the guard to also reject `''`. The test now exercises both null and '' in a loop, asserting fail-open for both. * fix(#2460): clear hono/@hono/node-server moderate advisories via npm override GHSA-v422-hmwv-36x6-class advisories (3 moderate) appeared during this PR's session: - @hono/node-server <2.0.5 (path traversal on Windows via encoded paths) - hono 4.3.3 - 4.12.26 (API Gateway v1 adapter drops distinct repeated request header values) - both transitively via @anthropic-ai/claude-agent-sdk -> @modelcontextprotocol /sdk@1.29.0 The npm audit fix re-resolved hono to 4.12.31 (within the existing ^4.11.4 range declared by MCP SDK), clearing the hono advisory without an override. The @hono/node-server advisory cannot be re-resolved the same way: MCP SDK pins @hono/node-server@^1.19.9, and the fix requires 2.0.5+. There is no MCP SDK release that allows @hono/node-server@2.x (latest 1.29.0 is the most recent), and bumping @anthropic-ai/claude-agent-sdk to 0.3.x does not help (its peerDependency is still @modelcontextprotocol/sdk@^1.29.0). The override (sibling to the existing 'qs' and 'body-parser' entries) is therefore the only available tool — distinct from the body-parser case in re-resolution. Verified: npm audit --omit=dev reports 0/0/0/0 advisories. Also: regenerated the pi golden-install-parity fixture (the pi/gsd.cjs change in this PR altered the pi install hash). * docs(changeset): add Fixed fragment for #2460 PR The two-otters-jog.md changeset was created earlier but lost during the cherry-pick detour to fix #2454 PR 1's npm advisory cascade. Recreating here with PR number 2499 backfilled (no placeholder cycle needed).
This commit is contained in:
Tom Boucher
5
.changeset/two-otters-jog.md
Normal file
5
.changeset/two-otters-jog.md
Normal file
@@ -0,0 +1,5 @@
|
||||
---
|
||||
type: Fixed
|
||||
pr: 2499
|
||||
---
|
||||
**pi no longer silently hijacks non-Anthropic providers' model choices** — `pi/gsd.cjs`'s `before_provider_request` handler unconditionally rewrote `payload.model` to the built-in pi/sonnet tier default (`claude-sonnet-5`) via the model-catalog fallback, breaking every outgoing request for pi users on non-Anthropic providers (kimi-coding, zai, openrouter, openai-codex, minimax). The handler now inspects `model_profile_overrides.pi[tier]` explicitly *before* calling `resolveTierEntry` (whose catalog fallback previously masked the "user did not opt in" signal) and fail-opens (`return undefined`) when the user has not set an override — including explicit `null` and `''` (clearing a previously-set value). An explicit opt-in via `model_profile_overrides.pi[tier]` still steers, preserving the legitimate use case. (#2460)
|
||||
27
pi/gsd.cjs
27
pi/gsd.cjs
@@ -197,10 +197,35 @@ function buildBeforeProviderRequestHandler({ tier = 'sonnet' } = {}) {
|
||||
return async function onBeforeProviderRequest(event, ctx) {
|
||||
try {
|
||||
const effectiveCwd = (ctx && ctx.cwd) || process.cwd();
|
||||
const { resolveTierEntry } = require(path.join(GSD_CORE, 'bin', 'lib', 'model-resolver.cjs'));
|
||||
const { loadConfig } = require(path.join(GSD_CORE, 'bin', 'lib', 'config-loader.cjs'));
|
||||
const config = loadConfig(effectiveCwd);
|
||||
const overrides = (config && config.model_profile_overrides) || undefined;
|
||||
|
||||
// #2460: FAIL-OPEN when the user has not explicitly configured
|
||||
// model_profile_overrides[runtime][tier]. pi is provider-agnostic
|
||||
// (kimi-coding, zai, openrouter, openai-codex, minimax, anthropic, …);
|
||||
// the built-in RUNTIME_PROFILE_MAP.pi.sonnet default is `claude-sonnet-5`,
|
||||
// an Anthropic-ecosystem assumption that is wrong for every non-Anthropic
|
||||
// provider. Returning the built-in default unconditionally rewrote every
|
||||
// outgoing request to a model the active provider did not know.
|
||||
//
|
||||
// resolveTierEntry falls back to the built-in catalog when no override is
|
||||
// present, so we cannot call it to detect "did the user opt in?" — we
|
||||
// inspect the override map directly. Only when the user has explicitly
|
||||
// set model_profile_overrides[runtime][tier] do we steer; otherwise we
|
||||
// return undefined and pi's chosen model flows through untouched.
|
||||
const userRaw = overrides && overrides.pi ? overrides.pi[tier] : undefined;
|
||||
// `''` is treated the same as null/undefined: an explicit empty-string
|
||||
// override is the user clearing a previously-set value, NOT opting in to
|
||||
// steering. Without this guard, `resolveTierEntry`'s falsy `if (userRaw)`
|
||||
// check would silently fall back to the built-in catalog and rewrite
|
||||
// payload.model to claude-sonnet-5 — re-introducing the exact bug this
|
||||
// handler exists to prevent.
|
||||
if (userRaw === undefined || userRaw === null || userRaw === '') {
|
||||
return undefined; // fail-open — leave pi's model untouched
|
||||
}
|
||||
|
||||
const { resolveTierEntry } = require(path.join(GSD_CORE, 'bin', 'lib', 'model-resolver.cjs'));
|
||||
const entry = resolveTierEntry({ runtime: 'pi', tier, overrides });
|
||||
const modelId = entry && typeof entry.model === 'string' && entry.model.length > 0 ? entry.model : null;
|
||||
if (!modelId) return undefined; // fail-open — leave pi's model untouched
|
||||
|
||||
2
tests/fixtures/golden-install-parity/pi.json
vendored
2
tests/fixtures/golden-install-parity/pi.json
vendored
@@ -1,7 +1,7 @@
|
||||
{
|
||||
".gsd-profile": "0e716a5fef4e6dc1",
|
||||
".gsd/defaults.json": "615261cfd3ae1c96",
|
||||
"extensions/gsd.js": "976c6546391caf8f",
|
||||
"extensions/gsd.js": "af5deeefff6a0a6a",
|
||||
"gsd-core/.gsd-runtime": "94e95f0bb38f8e0f",
|
||||
"gsd-core/VERSION": "ef0deccd81a6723c",
|
||||
"gsd-core/bin/check-latest-version.cjs": "e4a224058c8f4d74",
|
||||
|
||||
@@ -24,13 +24,14 @@ const { test } = require('node:test');
|
||||
const assert = require('node:assert/strict');
|
||||
const fs = require('node:fs');
|
||||
const path = require('node:path');
|
||||
const os = require('node:os');
|
||||
const { cleanup } = require('./helpers.cjs');
|
||||
|
||||
const {
|
||||
extensionEventSurfaceFor,
|
||||
negotiateHostCapabilities,
|
||||
UNDOCUMENTED,
|
||||
} = require('../gsd-core/bin/lib/host-integration.cjs');
|
||||
const { RUNTIME_PROFILE_MAP } = require('../gsd-core/bin/lib/model-catalog.cjs');
|
||||
|
||||
const gsdPiExtension = require('../pi/gsd.cjs');
|
||||
const { _internals } = require('../pi/gsd.cjs');
|
||||
@@ -99,37 +100,79 @@ test('gsdPiExtension does NOT call registerProvider (GSD steers pi\'s existing a
|
||||
// handler ACTUALLY REGISTERED via pi.on('before_provider_request', ...) in
|
||||
// gsdPiExtension. This ties the bound handler (default tier = 'sonnet') to
|
||||
// the real model-catalog steering end-to-end.
|
||||
test('the ACTUALLY-REGISTERED before_provider_request handler steers to the default-tier model-catalog pi id', async () => {
|
||||
//
|
||||
// #2460: the bound handler now FAILS-OPENS when no explicit
|
||||
// model_profile_overrides.pi[tier] is configured. pi is provider-agnostic;
|
||||
// the built-in tier default (claude-sonnet-5) is an Anthropic-ecosystem
|
||||
// assumption that broke every non-Anthropic provider. The test below
|
||||
// asserts the fail-open contract for the no-override case.
|
||||
test('the ACTUALLY-REGISTERED before_provider_request handler fail-opens when no model_profile_overrides is configured (#2460)', async () => {
|
||||
const pi = mockPi();
|
||||
gsdPiExtension(pi);
|
||||
const boundHandler = pi._recorded.events['before_provider_request'][0];
|
||||
assert.equal(typeof boundHandler, 'function');
|
||||
|
||||
const out = await boundHandler({ payload: {} }, { cwd: __dirname });
|
||||
assert.ok(out, 'expected a modified payload, not undefined');
|
||||
assert.equal(out.model, RUNTIME_PROFILE_MAP.pi.sonnet.model, 'the bound handler steers to the default (sonnet) tier\'s model-catalog pi id');
|
||||
assert.equal(out.model, 'claude-sonnet-5');
|
||||
// __dirname has no .planning/config.json with model_profile_overrides, so
|
||||
// the handler must NOT steer — returns undefined so pi's chosen model flows
|
||||
// through untouched.
|
||||
const out = await boundHandler({ payload: { model: 'k3' } }, { cwd: __dirname });
|
||||
assert.equal(out, undefined, 'no override configured → must fail-open (return undefined), not steer to claude-sonnet-5');
|
||||
});
|
||||
|
||||
// -- (3) before_provider_request: active-model steering ----------------------
|
||||
//
|
||||
// #2460: the handler ONLY steers when the user has explicitly opted in via
|
||||
// model_profile_overrides. The fail-open path (no override) is the bug fix;
|
||||
// the override path below documents the opt-in contract.
|
||||
|
||||
test('before_provider_request resolves a tier that maps to a model → returns a payload with the bare anthropic model id (model-catalog pi ids)', async () => {
|
||||
test('before_provider_request fail-opens when no model_profile_overrides is configured (#2460 bug discriminator)', async () => {
|
||||
const handler = _internals.buildBeforeProviderRequestHandler({ tier: 'sonnet' });
|
||||
const result = await handler({ payload: { existing: 'field' } }, { cwd: __dirname });
|
||||
assert.ok(result, 'expected a modified payload, not undefined');
|
||||
assert.equal(result.existing, 'field', 'original payload fields are preserved');
|
||||
assert.equal(result.model, RUNTIME_PROFILE_MAP.pi.sonnet.model, 'model id matches the model-catalog pi entry');
|
||||
assert.equal(result.model, 'claude-sonnet-5');
|
||||
// Reproduces the issue reporter\'s exact repro: user-selected model 'k3'
|
||||
// (or any non-Anthropic id) must NOT be rewritten to claude-sonnet-5.
|
||||
const result = await handler({ payload: { model: 'k3', messages: [{ role: 'user', content: 'hi' }] } }, { cwd: __dirname });
|
||||
assert.equal(result, undefined, 'no override configured → must NOT rewrite payload.model');
|
||||
});
|
||||
|
||||
test('before_provider_request resolves opus/haiku tiers to their model-catalog pi ids too', async () => {
|
||||
const opusHandler = _internals.buildBeforeProviderRequestHandler({ tier: 'opus' });
|
||||
const opusResult = await opusHandler({ payload: {} }, { cwd: __dirname });
|
||||
assert.equal(opusResult.model, RUNTIME_PROFILE_MAP.pi.opus.model);
|
||||
test('before_provider_request steers to the override model when model_profile_overrides.pi[tier] is explicitly configured', async () => {
|
||||
// Build a temp project with an explicit override and point the handler at it.
|
||||
const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'pi-steer-'));
|
||||
try {
|
||||
fs.mkdirSync(path.join(tmpDir, '.planning'), { recursive: true });
|
||||
fs.writeFileSync(
|
||||
path.join(tmpDir, '.planning', 'config.json'),
|
||||
JSON.stringify({ model_profile_overrides: { pi: { sonnet: 'kimi-coding/k3' } } }),
|
||||
);
|
||||
const handler = _internals.buildBeforeProviderRequestHandler({ tier: 'sonnet' });
|
||||
const result = await handler({ payload: { existing: 'field', model: 'will-be-overwritten' } }, { cwd: tmpDir });
|
||||
assert.ok(result, 'explicit override configured → expected a modified payload, not undefined');
|
||||
assert.equal(result.existing, 'field', 'original payload fields are preserved');
|
||||
assert.equal(result.model, 'kimi-coding/k3', 'model id matches the user-configured override');
|
||||
} finally {
|
||||
cleanup(tmpDir);
|
||||
}
|
||||
});
|
||||
|
||||
const haikuHandler = _internals.buildBeforeProviderRequestHandler({ tier: 'haiku' });
|
||||
const haikuResult = await haikuHandler({ payload: {} }, { cwd: __dirname });
|
||||
assert.equal(haikuResult.model, RUNTIME_PROFILE_MAP.pi.haiku.model);
|
||||
test('before_provider_request fail-opens when override is explicitly null or empty (#2460)', async () => {
|
||||
// Defensive: an explicit null/empty override entry must NOT be treated as
|
||||
// "user opted in". The user might null/empty out a previously-set override.
|
||||
// Without the empty-string guard, resolveTierEntry's falsy `if (userRaw)`
|
||||
// would silently fall back to the built-in catalog and rewrite payload.model
|
||||
// to claude-sonnet-5 — re-introducing the bug this PR fixes.
|
||||
for (const emptyValue of [null, '']) {
|
||||
const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), `pi-empty-override-${emptyValue === null ? 'null' : 'empty'}-`));
|
||||
try {
|
||||
fs.mkdirSync(path.join(tmpDir, '.planning'), { recursive: true });
|
||||
fs.writeFileSync(
|
||||
path.join(tmpDir, '.planning', 'config.json'),
|
||||
JSON.stringify({ model_profile_overrides: { pi: { sonnet: emptyValue } } }),
|
||||
);
|
||||
const handler = _internals.buildBeforeProviderRequestHandler({ tier: 'sonnet' });
|
||||
const result = await handler({ payload: { model: 'k3' } }, { cwd: tmpDir });
|
||||
assert.equal(result, undefined, `override === ${JSON.stringify(emptyValue)} → must fail-open (got ${JSON.stringify(result)})`);
|
||||
} finally {
|
||||
cleanup(tmpDir);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
test('before_provider_request given a tier that resolves to null returns undefined (fail-open, never a wrong/empty id)', async () => {
|
||||
|
||||
Reference in New Issue
Block a user