Skip to content

feat: skip setModel() when model is provided via query Options #447

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

Open
hatawong wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −2
Open

feat: skip setModel() when model is provided via query Options #447

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
16 changes: 14 additions & 2 deletions src/acp-agent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1425,7 +1425,7 @@ export class ClaudeAcpAgent implements Agent {
);
}

const models = await getAvailableModels(q, initializationResult.models, settingsManager);
const models = await getAvailableModels(q, initializationResult.models, settingsManager, options.model);

const availableModes = [
{
Expand Down Expand Up @@ -1619,6 +1619,7 @@ async function getAvailableModels(
query: Query,
models: ModelInfo[],
settingsManager: SettingsManager,
optionsModel?: string,
): Promise<SessionModelState> {
const settings = settingsManager.getSettings();

Expand All @@ -1631,7 +1632,18 @@ async function getAvailableModels(
}
}

await query.setModel(currentModel.value);
if (optionsModel) {
// Model was already passed via query Options at CLI startup time.
// Resolve it against available models for currentModelId, but skip
// setModel() to avoid triggering a /model command that leaks into
// the event stream.
const match = resolveModelPreference(models, optionsModel);
if (match) {
currentModel = match;
}
} else {
await query.setModel(currentModel.value);
}

return {
availableModels: models.map((model) => ({
Expand Down