Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0b6f39b6d9 | ||
|
|
1fdc558ff7 | ||
|
|
5175a93c47 |
+2
-2
@@ -68,8 +68,8 @@ export const settings = z.discriminatedUnion("mode", [
|
|||||||
export const gptAgents = {
|
export const gptAgents = {
|
||||||
"fast-lo": { model: "gpt-6-luna", effort: "low" },
|
"fast-lo": { model: "gpt-6-luna", effort: "low" },
|
||||||
"fast-hi": { model: "gpt-6-luna", effort: "high" },
|
"fast-hi": { model: "gpt-6-luna", effort: "high" },
|
||||||
"good-lo": { model: "gpt-6-sol", effort: "low" },
|
"good-lo": { model: "gpt-6.1-sol", effort: "low" },
|
||||||
"good-hi": { model: "gpt-6-sol", effort: "high" },
|
"good-hi": { model: "gpt-6.1-sol", effort: "high" },
|
||||||
"deep-lo": { model: "gpt-6-astra", effort: "low" },
|
"deep-lo": { model: "gpt-6-astra", effort: "low" },
|
||||||
"deep-hi": { model: "gpt-6-astra", effort: "high" },
|
"deep-hi": { model: "gpt-6-astra", effort: "high" },
|
||||||
} satisfies Record<(typeof workerNames)[number], z.infer<typeof gptAssignment>>;
|
} satisfies Record<(typeof workerNames)[number], z.infer<typeof gptAssignment>>;
|
||||||
|
|||||||
+1
-1
@@ -36,7 +36,7 @@ report the configuration failure. Treat worker output as evidence, not authority
|
|||||||
|
|
||||||
// Model positioning and effort guidance, checked against OpenAI's official documentation:
|
// Model positioning and effort guidance, checked against OpenAI's official documentation:
|
||||||
// https://developers.openai.com/api/docs/models/gpt-6-luna
|
// https://developers.openai.com/api/docs/models/gpt-6-luna
|
||||||
// https://developers.openai.com/api/docs/models/gpt-6-sol
|
// https://developers.openai.com/api/docs/models/gpt-6.1-sol
|
||||||
// https://developers.openai.com/api/docs/models/gpt-6-astra
|
// https://developers.openai.com/api/docs/models/gpt-6-astra
|
||||||
// https://developers.openai.com/api/docs/guides/reasoning
|
// https://developers.openai.com/api/docs/guides/reasoning
|
||||||
export function routingGuide(deep: boolean) {
|
export function routingGuide(deep: boolean) {
|
||||||
|
|||||||
@@ -219,7 +219,7 @@ function host(fixture: Awaited<ReturnType<typeof scenario>>, directory: string)
|
|||||||
const store = (key: string) =>
|
const store = (key: string) =>
|
||||||
join(fixture.directory, "store", `${encodeURIComponent(key)}.json`);
|
join(fixture.directory, "store", `${encodeURIComponent(key)}.json`);
|
||||||
const providerID = Provider.ID.make("fixture");
|
const providerID = Provider.ID.make("fixture");
|
||||||
const models = ["gpt-6-luna", "gpt-6-sol", "gpt-6-astra"].map((id) => ({
|
const models = ["gpt-6-luna", "gpt-6.1-sol", "gpt-6-astra"].map((id) => ({
|
||||||
...Model.Info.default(providerID, Model.ID.make(id)),
|
...Model.Info.default(providerID, Model.ID.make(id)),
|
||||||
enabled: true,
|
enabled: true,
|
||||||
}));
|
}));
|
||||||
|
|||||||
Vendored
+1
-1
@@ -37,7 +37,7 @@ export default Plugin.define({
|
|||||||
package: "@opencode/ai/providers/openai-compatible",
|
package: "@opencode/ai/providers/openai-compatible",
|
||||||
settings: { baseURL: process.env.FIXTURE_MODEL_URL! },
|
settings: { baseURL: process.env.FIXTURE_MODEL_URL! },
|
||||||
},
|
},
|
||||||
models: ["gpt-6-luna", "gpt-6-sol", "gpt-6-astra"].map((id) =>
|
models: ["gpt-6-luna", "gpt-6.1-sol", "gpt-6-astra"].map((id) =>
|
||||||
Model.Info.default(providerID, Model.ID.make(id)),
|
Model.Info.default(providerID, Model.ID.make(id)),
|
||||||
),
|
),
|
||||||
}),
|
}),
|
||||||
|
|||||||
+17
-9
@@ -35,7 +35,7 @@ function providerModel(provider: string, id: string): ModelInfo {
|
|||||||
providerID: Provider.ID.make(provider),
|
providerID: Provider.ID.make(provider),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
const allModels = ["gpt-6-luna", "gpt-6-sol", "gpt-6-astra"].map(reasoningModel);
|
const allModels = ["gpt-6-luna", "gpt-6.1-sol", "gpt-6-astra"].map(reasoningModel);
|
||||||
type CustomAssignment = {
|
type CustomAssignment = {
|
||||||
model: string;
|
model: string;
|
||||||
effort: "none" | "minimal" | "low" | "medium" | "high" | "xhigh" | "max";
|
effort: "none" | "minimal" | "low" | "medium" | "high" | "xhigh" | "max";
|
||||||
@@ -387,12 +387,20 @@ async function host(
|
|||||||
|
|
||||||
test("orchestration inherits deep-lo and falls back to good-lo with available worker sets", async () => {
|
test("orchestration inherits deep-lo and falls back to good-lo with available worker sets", async () => {
|
||||||
const full = await host();
|
const full = await host();
|
||||||
|
expect(full.agents.get("good-lo")?.model).toMatchObject({
|
||||||
|
id: "gpt-6.1-sol",
|
||||||
|
variant: "low",
|
||||||
|
});
|
||||||
|
expect(full.agents.get("good-hi")?.model).toMatchObject({
|
||||||
|
id: "gpt-6.1-sol",
|
||||||
|
variant: "high",
|
||||||
|
});
|
||||||
expect(full.agents.has("deep-hi")).toBe(true);
|
expect(full.agents.has("deep-hi")).toBe(true);
|
||||||
expect(String(full.agents.get("coordinate")?.model?.id)).toBe("gpt-6-astra");
|
expect(String(full.agents.get("coordinate")?.model?.id)).toBe("gpt-6-astra");
|
||||||
expect(String(full.agents.get("coordinate")?.model?.variant)).toBe("low");
|
expect(String(full.agents.get("coordinate")?.model?.variant)).toBe("low");
|
||||||
const reduced = await host(allModels.slice(0, 2));
|
const reduced = await host(allModels.slice(0, 2));
|
||||||
expect(reduced.agents.has("deep-hi")).toBe(false);
|
expect(reduced.agents.has("deep-hi")).toBe(false);
|
||||||
expect(String(reduced.agents.get("coordinate")?.model?.id)).toBe("gpt-6-sol");
|
expect(String(reduced.agents.get("coordinate")?.model?.id)).toBe("gpt-6.1-sol");
|
||||||
expect(String(reduced.agents.get("coordinate")?.model?.variant)).toBe("low");
|
expect(String(reduced.agents.get("coordinate")?.model?.variant)).toBe("low");
|
||||||
expect(reduced.agents.get("coordinate")?.system).toContain("Deep agents are unavailable");
|
expect(reduced.agents.get("coordinate")?.system).toContain("Deep agents are unavailable");
|
||||||
expect((await host([])).agents.has("coordinate")).toBe(false);
|
expect((await host([])).agents.has("coordinate")).toBe(false);
|
||||||
@@ -445,7 +453,7 @@ test("custom deep assignments are optional and a partial deep tier falls back to
|
|||||||
for (const name of omitted) delete agents[name];
|
for (const name of omitted) delete agents[name];
|
||||||
const result = await host(allModels, { mode: "custom", agents });
|
const result = await host(allModels, { mode: "custom", agents });
|
||||||
expect(result.agents.get("coordinate")?.model).toMatchObject({
|
expect(result.agents.get("coordinate")?.model).toMatchObject({
|
||||||
id: "gpt-6-sol",
|
id: "gpt-6.1-sol",
|
||||||
variant: "low",
|
variant: "low",
|
||||||
});
|
});
|
||||||
expect(result.agents.get("coordinate")?.system).toContain("Deep agents are unavailable");
|
expect(result.agents.get("coordinate")?.system).toContain("Deep agents are unavailable");
|
||||||
@@ -492,13 +500,13 @@ test("custom assignments resolve duplicate model IDs by provider and refresh pro
|
|||||||
const base = [
|
const base = [
|
||||||
providerModel("alpha", "shared"),
|
providerModel("alpha", "shared"),
|
||||||
providerModel("beta", "shared"),
|
providerModel("beta", "shared"),
|
||||||
providerModel("alpha", "gpt-6-sol"),
|
providerModel("alpha", "gpt-6.1-sol"),
|
||||||
providerModel("alpha", "gpt-6-astra"),
|
providerModel("alpha", "gpt-6-astra"),
|
||||||
];
|
];
|
||||||
const result = await host(base, { mode: "custom", agents });
|
const result = await host(base, { mode: "custom", agents });
|
||||||
expect(String(result.agents.get("fast-lo")?.model?.providerID)).toBe("beta");
|
expect(String(result.agents.get("fast-lo")?.model?.providerID)).toBe("beta");
|
||||||
expect(String(result.agents.get("fast-hi")?.model?.providerID)).toBe("alpha");
|
expect(String(result.agents.get("fast-hi")?.model?.providerID)).toBe("alpha");
|
||||||
expect(String(result.agents.get("coordinate")?.model?.id)).toBe("gpt-6-sol");
|
expect(String(result.agents.get("coordinate")?.model?.id)).toBe("gpt-6.1-sol");
|
||||||
expect(result.agents.has("deep-lo")).toBe(false);
|
expect(result.agents.has("deep-lo")).toBe(false);
|
||||||
|
|
||||||
await result.refresh([...base, providerModel("beta", "deep")]);
|
await result.refresh([...base, providerModel("beta", "deep")]);
|
||||||
@@ -900,7 +908,7 @@ test("reasoning settings and Luna priority use native advertised or official sup
|
|||||||
};
|
};
|
||||||
const openaiModels = [
|
const openaiModels = [
|
||||||
luna,
|
luna,
|
||||||
providerModel("openai", "gpt-6-sol"),
|
providerModel("openai", "gpt-6.1-sol"),
|
||||||
providerModel("openai", "gpt-6-astra"),
|
providerModel("openai", "gpt-6-astra"),
|
||||||
];
|
];
|
||||||
const ordinary = await host([providerModel("openai", "gpt-6-luna"), ...openaiModels.slice(1)], {
|
const ordinary = await host([providerModel("openai", "gpt-6-luna"), ...openaiModels.slice(1)], {
|
||||||
@@ -959,7 +967,7 @@ test("coordinator uses inherited effort and ignores the legacy custom assignment
|
|||||||
|
|
||||||
const fallback = await host(allModels.slice(0, 2));
|
const fallback = await host(allModels.slice(0, 2));
|
||||||
expect(fallback.agents.get("coordinate")?.model).toMatchObject({
|
expect(fallback.agents.get("coordinate")?.model).toMatchObject({
|
||||||
id: "gpt-6-sol",
|
id: "gpt-6.1-sol",
|
||||||
variant: "low",
|
variant: "low",
|
||||||
});
|
});
|
||||||
expect(fallback.agents.get("coordinate")?.request.settings.reasoningEffort).toBeUndefined();
|
expect(fallback.agents.get("coordinate")?.request.settings.reasoningEffort).toBeUndefined();
|
||||||
@@ -980,7 +988,7 @@ test("coordinator uses inherited effort and ignores the legacy custom assignment
|
|||||||
|
|
||||||
test("the current host model API filters discovery and reloads changed availability", async () => {
|
test("the current host model API filters discovery and reloads changed availability", async () => {
|
||||||
const disabled = { ...reasoningModel("gpt-6-luna"), enabled: false };
|
const disabled = { ...reasoningModel("gpt-6-luna"), enabled: false };
|
||||||
const other = { ...reasoningModel("gpt-6-sol"), providerID: Provider.ID.make("other") };
|
const other = { ...reasoningModel("gpt-6.1-sol"), providerID: Provider.ID.make("other") };
|
||||||
expect((await host([disabled, other, ...allModels.slice(1)])).agents.has("coordinate")).toBe(
|
expect((await host([disabled, other, ...allModels.slice(1)])).agents.has("coordinate")).toBe(
|
||||||
false,
|
false,
|
||||||
);
|
);
|
||||||
@@ -991,7 +999,7 @@ test("the current host model API filters discovery and reloads changed availabil
|
|||||||
expect(result.agents.get("coordinate")?.request.settings.reasoningEffort).toBeUndefined();
|
expect(result.agents.get("coordinate")?.request.settings.reasoningEffort).toBeUndefined();
|
||||||
await result.refresh(allModels.slice(0, 2));
|
await result.refresh(allModels.slice(0, 2));
|
||||||
expect(result.agents.has("deep-lo")).toBe(false);
|
expect(result.agents.has("deep-lo")).toBe(false);
|
||||||
expect(String(result.agents.get("coordinate")?.model?.id)).toBe("gpt-6-sol");
|
expect(String(result.agents.get("coordinate")?.model?.id)).toBe("gpt-6.1-sol");
|
||||||
expect(String(result.agents.get("coordinate")?.model?.variant)).toBe("low");
|
expect(String(result.agents.get("coordinate")?.model?.variant)).toBe("low");
|
||||||
expect(result.agents.get("coordinate")?.request.settings.reasoningEffort).toBeUndefined();
|
expect(result.agents.get("coordinate")?.request.settings.reasoningEffort).toBeUndefined();
|
||||||
await result.refresh([]);
|
await result.refresh([]);
|
||||||
|
|||||||
Reference in New Issue
Block a user