smashimo/oh-my-pi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(catalog): restore cached request-model variants via requestModelId

Browse Source 
Copilot -1m long-context variants are synthesized with transport
headers and a requestModelId to a bundled base. The v10 cache omits
headers; the writer only matched a same-id static entry, so these
variants were flagged unrestorable and dropped on the next offline
read, vanishing from the picker with a "Could not restore model"
warning. The startup registry loader dropped them the same way.

Restore/match headers through requestModelId in the cache writer, the
model-manager restore path, and the coding-agent startup loader, and
bypass a stale unrestorable marker written by the old id-only writer.

Fixes #6284
This commit is contained in:
roboomp
2026-07-22 10:57:47 +00:00
parent 7b141199d5
commit d9bab7ce8b
7 changed files with 147 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/coding-agent/test/model-discovery.test.ts
+31 -1
View File
@@ -6,7 +6,8 @@ import { Effort, type FetchImpl, type Model } from "@oh-my-pi/pi-ai";
import type { OAuthCredentials } from "@oh-my-pi/pi-ai/oauth/types";
import { buildModel } from "@oh-my-pi/pi-catalog/build";
import { writeModelCache } from "@oh-my-pi/pi-catalog/model-cache";
import type { OpenAICompat } from "@oh-my-pi/pi-catalog/types";
import { getBundledModel } from "@oh-my-pi/pi-catalog/models";
import type { ModelSpec, OpenAICompat } from "@oh-my-pi/pi-catalog/types";
import { applyLlamaCppQwenThinking } from "@oh-my-pi/pi-coding-agent/config/model-discovery";
import { kNoAuth, ModelRegistry } from "@oh-my-pi/pi-coding-agent/config/model-registry";
import { resetSettingsForTest } from "@oh-my-pi/pi-coding-agent/config/settings";
@@ -2133,4 +2134,33 @@ describe("ModelRegistry runtime discovery", () => {
expect(registry.find("litellm-test", "team-gpt")?.contextWindow).toBe(200_000);
expect(registry.find("litellm-test", "deployment-id")).toBeUndefined();
});
test("startup restores a legacy stale-marked Copilot -1m variant via requestModelId", () => {
// Regression for #6037/#6284: a synthesized Copilot `-1m` long-context
// variant keeps the base model's transport headers via `requestModelId`.
// The v10 cache omits headers, and legacy rows written by the old id-only
// writer flag the variant unrestorable (its base is a different id). The
// startup loader must still recover the headers from the bundled base and
// keep the model selectable instead of dropping it.
const bundledBase = getBundledModel("github-copilot", "gpt-5.6-sol");
if (!bundledBase?.headers) {
throw new Error("Expected bundled Copilot base to carry transport headers");
}
const cachedVariant = buildModel({
...(bundledBase as ModelSpec<"openai-responses">),
id: "gpt-5.6-sol-1m",
name: "GPT-5.6 Sol (1M)",
requestModelId: "gpt-5.6-sol",
contextWindow: 1_050_000,
});
// Emulate a legacy write: the variant has no same-id static header source,
// so it is flagged unrestorable even though its base carries the headers.
writeModelCache("github-copilot", Date.now(), [cachedVariant], true, "", cacheDbPath);
const registry = new ModelRegistry(authStorage, modelsJsonPath);
const restored = registry.find("github-copilot", "gpt-5.6-sol-1m");
expect(restored).toBeDefined();
expect(restored?.headers).toEqual(bundledBase.headers);
});
});