Merge pull request #1470 from Lynricsy/fix/categories-model-precedence
fix(delegate-task): honor explicit category model over sisyphus-junior
This commit is contained in:
commit
d14f32f2d5
@ -794,18 +794,22 @@ export async function resolveCategoryExecution(
|
|||||||
let categoryModel: { providerID: string; modelID: string; variant?: string } | undefined
|
let categoryModel: { providerID: string; modelID: string; variant?: string } | undefined
|
||||||
|
|
||||||
const overrideModel = sisyphusJuniorModel
|
const overrideModel = sisyphusJuniorModel
|
||||||
|
const explicitCategoryModel = userCategories?.[args.category!]?.model
|
||||||
|
|
||||||
if (!requirement) {
|
if (!requirement) {
|
||||||
actualModel = overrideModel ?? resolved.model
|
// Precedence: explicit category model > sisyphus-junior default > category resolved model
|
||||||
|
// This keeps `sisyphus-junior.model` useful as a global default while allowing
|
||||||
|
// per-category overrides via `categories[category].model`.
|
||||||
|
actualModel = explicitCategoryModel ?? overrideModel ?? resolved.model
|
||||||
if (actualModel) {
|
if (actualModel) {
|
||||||
modelInfo = overrideModel
|
modelInfo = explicitCategoryModel || overrideModel
|
||||||
? { model: actualModel, type: "user-defined", source: "override" }
|
? { model: actualModel, type: "user-defined", source: "override" }
|
||||||
: { model: actualModel, type: "system-default", source: "system-default" }
|
: { model: actualModel, type: "system-default", source: "system-default" }
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
const resolution = resolveModelPipeline({
|
const resolution = resolveModelPipeline({
|
||||||
intent: {
|
intent: {
|
||||||
userModel: overrideModel ?? userCategories?.[args.category!]?.model,
|
userModel: explicitCategoryModel ?? overrideModel,
|
||||||
categoryDefaultModel: resolved.model,
|
categoryDefaultModel: resolved.model,
|
||||||
},
|
},
|
||||||
constraints: { availableModels },
|
constraints: { availableModels },
|
||||||
|
|||||||
@ -1770,6 +1770,68 @@ describe("sisyphus-task", () => {
|
|||||||
expect(launchInput.model.providerID).toBe("anthropic")
|
expect(launchInput.model.providerID).toBe("anthropic")
|
||||||
expect(launchInput.model.modelID).toBe("claude-sonnet-4-5")
|
expect(launchInput.model.modelID).toBe("claude-sonnet-4-5")
|
||||||
})
|
})
|
||||||
|
|
||||||
|
test("explicit category model takes precedence over sisyphus-junior model", async () => {
|
||||||
|
// given - explicit category model differs from sisyphus-junior override
|
||||||
|
const { createDelegateTask } = require("./tools")
|
||||||
|
let launchInput: any
|
||||||
|
|
||||||
|
const mockManager = {
|
||||||
|
launch: async (input: any) => {
|
||||||
|
launchInput = input
|
||||||
|
return {
|
||||||
|
id: "task-category-precedence",
|
||||||
|
sessionID: "ses_category_precedence_test",
|
||||||
|
description: "Category precedence test",
|
||||||
|
agent: "sisyphus-junior",
|
||||||
|
status: "running",
|
||||||
|
}
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
const mockClient = {
|
||||||
|
app: { agents: async () => ({ data: [] }) },
|
||||||
|
config: { get: async () => ({ data: { model: SYSTEM_DEFAULT_MODEL } }) },
|
||||||
|
model: { list: async () => [] },
|
||||||
|
session: {
|
||||||
|
create: async () => ({ data: { id: "test-session" } }),
|
||||||
|
prompt: async () => ({ data: {} }),
|
||||||
|
messages: async () => ({ data: [] }),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
const tool = createDelegateTask({
|
||||||
|
manager: mockManager,
|
||||||
|
client: mockClient,
|
||||||
|
sisyphusJuniorModel: "anthropic/claude-sonnet-4-5",
|
||||||
|
userCategories: {
|
||||||
|
ultrabrain: { model: "openai/gpt-5.2-codex" },
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
const toolContext = {
|
||||||
|
sessionID: "parent-session",
|
||||||
|
messageID: "parent-message",
|
||||||
|
agent: "sisyphus",
|
||||||
|
abort: new AbortController().signal,
|
||||||
|
}
|
||||||
|
|
||||||
|
// when - using ultrabrain category with explicit model override
|
||||||
|
await tool.execute(
|
||||||
|
{
|
||||||
|
description: "Category precedence test",
|
||||||
|
prompt: "Do something",
|
||||||
|
category: "ultrabrain",
|
||||||
|
run_in_background: true,
|
||||||
|
load_skills: [],
|
||||||
|
},
|
||||||
|
toolContext
|
||||||
|
)
|
||||||
|
|
||||||
|
// then - explicit category model should win
|
||||||
|
expect(launchInput.model.providerID).toBe("openai")
|
||||||
|
expect(launchInput.model.modelID).toBe("gpt-5.2-codex")
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
describe("browserProvider propagation", () => {
|
describe("browserProvider propagation", () => {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user