Skip to content
Open
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
25 changes: 20 additions & 5 deletions src/CodexAcpClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -376,15 +376,30 @@ export class CodexAcpClient {
* Falls back to model defaults if parameters are missing or unsupported.
*/
createModelId(availableModels: Model[], modelId: string | null, reasoningEffort: ReasoningEffort | null): ModelId {
const selectedModel =
availableModels.find(m => m.id === modelId) ??
availableModels.find(m => m.isDefault);
const selectedModel = availableModels.find(m => m.id === modelId);
if (selectedModel) {
return ModelId.create(selectedModel.id, reasoningEffort ?? selectedModel.defaultReasoningEffort);
}

// The configured model is not in Codex's advertised catalog. This is
// expected for custom providers (e.g. a self-hosted or third-party
// model), whose model ids the catalog does not enumerate. Keep the
// requested model id instead of silently substituting the built-in
// default. This mirrors the Codex CLI, which keeps the configured model
// and merely warns "Model metadata not found. Defaulting to fallback
// metadata." Substituting the default here pins a wrong model id onto
// every turn and makes requests to custom-provider endpoints fail with
// "unknown model".
if (modelId) {
return ModelId.create(modelId, reasoningEffort ?? "medium");
}

if (!selectedModel) {
const defaultModel = availableModels.find(m => m.isDefault);
if (!defaultModel) {
throw new Error(`Model selection failed: No model found for ID "${modelId}" and no default model is defined.`);
}

return ModelId.create(selectedModel.id, reasoningEffort ?? selectedModel.defaultReasoningEffort);
return ModelId.create(defaultModel.id, reasoningEffort ?? defaultModel.defaultReasoningEffort);
}

async subscribeToSessionEvents(
Expand Down
10 changes: 10 additions & 0 deletions src/__tests__/CodexACPAgent/CodexAcpClient.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -966,6 +966,16 @@ describe('ACP server test', { timeout: 40_000 }, () => {
expect(result).toEqual(ModelId.create('5.2-codex', 'medium'));
});

it('should keep a model id that is not in the advertised catalog (custom provider)', () => {
const result = fixture.getCodexAcpClient().createModelId(mockModels, 'MiniMax-M3', 'high');
expect(result).toEqual(ModelId.create('MiniMax-M3', 'high'));
});

it('should default the effort for an uncatalogued model when reasoningEffort is null', () => {
const result = fixture.getCodexAcpClient().createModelId(mockModels, 'MiniMax-M3', null);
expect(result).toEqual(ModelId.create('MiniMax-M3', 'medium'));
});

/**
* Sets up a mock fixture with turnStart/awaitTurnCompleted spied on,
* and a given session state. Returns the fixture and turnStart spy.
Expand Down