Skip to content

Add model selection support #93

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
merged 5 commits into from
Oct 15, 2025
+51 −6
Merged

Add model selection support #93

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c9eb9b8
Add model selection support
bennetbo Oct 14, 2025
c847b7b
Use default model or fallback to first in the list
benbrandt Oct 15, 2025
0490392
Add a test to flag if the model list behavior changes
benbrandt Oct 15, 2025
477051d
Lint fixes
benbrandt Oct 15, 2025
3f56c57
Update changelog
benbrandt Oct 15, 2025
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
28 changes: 28 additions & 0 deletions src/acp-agent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
ClientCapabilities,
InitializeRequest,
InitializeResponse,
ModelInfo,
ndJsonStream,
NewSessionRequest,
NewSessionResponse,
Expand All @@ -15,6 +16,8 @@ import {
ReadTextFileRequest,
ReadTextFileResponse,
RequestError,
SetSessionModelRequest,
SetSessionModelResponse,
SetSessionModeRequest,
SetSessionModeResponse,
TerminalHandle,
Expand Down Expand Up @@ -74,6 +77,8 @@ type ToolUseCache = {
[key: string]: { type: "tool_use"; id: string; name: string; input: any };
};

const DEFAULT_MODEL_ID = "default";

// Implement the ACP Agent interface
export class ClaudeAcpAgent implements Agent {
sessions: {
Expand Down Expand Up @@ -189,6 +194,7 @@ export class ClaudeAcpAgent implements Agent {
systemPrompt,
settingSources: ["user", "project", "local"],
permissionPromptToolName: PERMISSION_TOOL_NAME,
model: DEFAULT_MODEL_ID,
stderr: (err) => console.error(err),
// note: although not documented by the types, passing an absolute path
// here works to find zed's managed node version.
Expand Down Expand Up @@ -240,8 +246,14 @@ export class ClaudeAcpAgent implements Agent {
});
});

const models = await getAvailableModels(q);

return {
sessionId,
models: {
availableModels: models,
currentModelId: DEFAULT_MODEL_ID,
},
modes: {
currentModeId: "default",
availableModes: [
Expand Down Expand Up @@ -388,6 +400,13 @@ export class ClaudeAcpAgent implements Agent {
await this.sessions[params.sessionId].query.interrupt();
}

async setSessionModel(params: SetSessionModelRequest): Promise<SetSessionModelResponse | void> {
if (!this.sessions[params.sessionId]) {
throw new Error("Session not found");
}
await this.sessions[params.sessionId].query.setModel(params.modelId);
}

async setSessionMode(params: SetSessionModeRequest): Promise<SetSessionModeResponse> {
if (!this.sessions[params.sessionId]) {
throw new Error("Session not found");
Expand Down Expand Up @@ -428,6 +447,15 @@ export class ClaudeAcpAgent implements Agent {
}
}

async function getAvailableModels(query: Query): Promise<ModelInfo[]> {
const models = await query.supportedModels();
return models.map((model) => ({
modelId: model.value,
name: model.displayName,
description: model.description,
}));
}

async function getAvailableSlashCommands(query: Query): Promise<AvailableCommand[]> {
const UNSUPPORTED_COMMANDS = [
"add-dir",
Expand Down