Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions open-sse/handlers/chatCore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1705,14 +1705,16 @@ export async function handleChatCore({
comboConfig as unknown as { name: string; models: unknown[] },
allCombosData as unknown as { name: string; models: unknown[] }[]
);
comboTargetLimits = targets.map((t: { modelStr?: string; provider?: string }) =>
// Fall back to ResolvedComboTarget.provider when modelStr lacks a
// provider/ prefix — parseModel alone returns provider:null (#8716).
getComboTargetTokenLimit({
modelStr: t.modelStr,
provider: t.provider,
})
);
// Fall back to ResolvedComboTarget.provider when modelStr lacks a
// provider/ prefix — parseModel alone returns provider:null (#8716).
comboTargetLimits = targets
.map((t: { modelStr?: string; provider?: string }) =>
getComboTargetTokenLimit({ modelStr: t.modelStr, provider: t.provider })
)
.filter(
(limit): limit is number =>
typeof limit === "number" && Number.isFinite(limit) && limit > 0
);
}
// chatCore executes per concrete target (handleSingleModel resolves
// provider/effectiveModel before delegating). Compress against THIS
Expand Down
21 changes: 21 additions & 0 deletions tests/unit/resolveComboContextLimit.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import test from "node:test";
import assert from "node:assert/strict";
import { resolveComboContextLimit } from "../../open-sse/services/contextManager.ts";

test("resolveComboContextLimit handles array of combo target objects ({ name, models }) in comboTargetLimits", () => {
const result = resolveComboContextLimit({
provider: "unknown_provider",
model: "unknown_model",
comboTargetLimits: [
{ name: "subcombo1", models: [{ provider: "openai", model: "gpt-4" }] },
{ name: "subcombo2", models: [{ provider: "anthropic", model: "claude-3-5-sonnet" }] },
] as unknown as number[],
});

// Default fallback limit for unknown provider should be returned without throwing NaN or crash
assert.equal(typeof result.limit, "number");
assert.ok(!Number.isNaN(result.limit));
assert.ok(result.limit > 0);
assert.equal(result.source, "fallback");
});

Loading