Skip to content

fix(chat): list only models the agent supports in Composer #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NeilJo-GY merged 1 commit into from
Aug 31, 2026
Merged

fix(chat): list only models the agent supports in Composer #66

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 16 additions & 32 deletions packages/agent-chat/src/ranch-shell/RanchChatShell.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,15 +521,17 @@ function modelFitsComposerPath(
const vendor = modelVendorId(mid).toLowerCase();
if (args.official) {
if (isByoVendor(vendor, args.byoVendor)) return false;
if (args.officialIds.some((item) => sameModelId(item, mid))) return true;
if (args.catalogIds.some((item) => sameModelId(item, mid))) return true;
return !!vendor;
return (
args.officialIds.some((item) => sameModelId(item, mid)) ||
args.fallback.some((item) => sameModelId(item, mid)) ||
sameModelId(mid, args.listed)
);
}
if (args.openRouterByo) {
if (sameModelId(mid, args.listed)) return true;
if (args.catalogIds.some((item) => sameModelId(item, mid))) return true;
if (args.fallback.some((item) => sameModelId(item, mid))) return true;
return !!vendor;
return (
args.fallback.some((item) => sameModelId(item, mid)) ||
sameModelId(mid, args.listed)
);
}
if (vendor && !isByoVendor(vendor, args.byoVendor)) return false;
return (
Expand Down Expand Up @@ -561,8 +563,8 @@ function pickComposerModelForPath(args: {
if (args.wanted && modelFitsComposerPath(args.wanted, path)) {
return (
args.fallback.find((item) => sameModelId(item, args.wanted)) ||
args.catalogIds.find((item) => sameModelId(item, args.wanted)) ||
args.wanted
args.officialIds.find((item) => sameModelId(item, args.wanted)) ||
(sameModelId(args.wanted, args.listed) ? args.listed : null)
);
}
if (
Expand Down Expand Up @@ -4784,31 +4786,13 @@ export function RanchChatShell(props: RanchChatShellProps) {
composerModel.supported_models,
);
const options = (() => {
const fromApi =
(official || openRouterByo) && composerCatalog.length
? composerCatalog.map((row) => row.id)
: composerModel.supported_models.length
? composerModel.supported_models
: [listed].filter(Boolean);
const fromApi = composerModel.supported_models.length
? composerModel.supported_models
: [listed].filter(Boolean);
const seen = new Set<string>();
const out: string[] = [];
const byoVendor = modelVendorId(composerModel.runtime_model_id).toLowerCase();
const extras = [listed, selectedModelId].filter(
(id): id is string =>
!!id &&
!!id.trim() &&
(!official || officialV0SupportsModel(id)) &&
modelFitsComposerPath(id, {
official,
openRouterByo,
byoVendor,
officialIds: composerModel.official_models,
catalogIds: composerCatalog.map((row) => row.id),
fallback: fromApi,
listed: listed || null,
}),
);
for (const id of [...extras, ...fromApi]) {
for (const id of [listed, ...fromApi]) {
if (!id || !id.trim()) continue;
const k = id.toLowerCase();
if (seen.has(k)) continue;
seen.add(k);
Expand Down
Loading