Skip to content
Merged
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
29 changes: 23 additions & 6 deletions integration-tests/acp-integration.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -401,11 +401,14 @@ function setupAcpTest(
expect(setModeResult3).toBeDefined();
expect(setModeResult3.modeId).toBe('default');

// Test 7: Set model using first available model
const firstModel = newSession.models.availableModels[0];
// Test 7: Set model using openai model instead of first available model (index=0) which could be qwen-oauth requiring login
const openaiModel = newSession.models.availableModels.find((model) =>
model.modelId.includes('openai'),
);
expect(openaiModel).toBeDefined();
const setModelResult = (await sendRequest('session/set_model', {
sessionId: newSession.sessionId,
modelId: firstModel.modelId,
modelId: openaiModel!.modelId,
})) as { modelId: string };
expect(setModelResult).toBeDefined();
expect(setModelResult.modelId).toBeTruthy();
Expand Down Expand Up @@ -433,10 +436,24 @@ function setupAcpTest(
},
});

// Create a new session first
const newSession = (await sendRequest('session/new', {
cwd: rig.testDir!,
mcpServers: [],
})) as {
sessionId: string;
models: {
availableModels: Array<{ modelId: string }>;
};
};

// Attempt to set the first model (which might be qwen-oauth requiring login) without authenticating
// This should trigger an auth error with authMethods in the response
const firstModel = newSession.models.availableModels[0];
await expect(
sendRequest('session/new', {
cwd: rig.testDir!,
mcpServers: [],
sendRequest('session/set_model', {
sessionId: newSession.sessionId,
modelId: firstModel.modelId,
}),
).rejects.toMatchObject({
response: {
Expand Down