Skip to content
Merged
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
29 changes: 18 additions & 11 deletions packages/agent/src/adapters/acp-connection.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { AgentSideConnection, ndJsonStream } from "@agentclientprotocol/sdk";
import { POSTHOG_NOTIFICATIONS } from "../acp-extensions";
import { formatModelId } from "../gateway-models";
import type { SessionLogWriter } from "../session-log-writer";
import type { ProcessSpawnedCallback } from "../types";
import { Logger } from "../utils/logger";
Expand Down Expand Up @@ -36,21 +37,27 @@ export type AcpConnection = {

export type InProcessAcpConnection = AcpConnection;

type ModelOption = { value?: string; name?: string };
type ModelGroup = { group?: string; name?: string; options?: ModelOption[] };

type ConfigOption = {
id?: string;
category?: string | null;
currentValue?: string;
options?: Array<
{ value?: string } | { group?: string; options?: Array<{ value?: string }> }
>;
options?: Array<ModelOption | ModelGroup>;
};

function isGroupedOptions(
options: NonNullable<ConfigOption["options"]>,
): options is Array<{ group?: string; options?: Array<{ value?: string }> }> {
): options is ModelGroup[] {
return options.length > 0 && "group" in options[0];
}

function formatOption(o: ModelOption): ModelOption {
if (!o.value) return o;
return { ...o, name: formatModelId(o.value) };
}

function filterModelConfigOptions(
msg: Record<string, unknown>,
allowedModelIds: Set<string>,
Expand All @@ -74,9 +81,9 @@ function filterModelConfigOptions(
if (isGroupedOptions(options)) {
const filteredOptions = options.map((group) => ({
...group,
options: (group.options ?? []).filter(
(o) => o?.value && allowedModelIds.has(o.value),
),
options: (group.options ?? [])
.filter((o) => o?.value && allowedModelIds.has(o.value))
.map(formatOption),
}));
const flat = filteredOptions.flatMap((g) => g.options ?? []);
const currentAllowed =
Expand All @@ -91,10 +98,10 @@ function filterModelConfigOptions(
};
}

const valueOptions = options as Array<{ value?: string }>;
const filteredOptions = valueOptions.filter(
(o) => o?.value && allowedModelIds.has(o.value),
);
const valueOptions = options as ModelOption[];
const filteredOptions = valueOptions
.filter((o) => o?.value && allowedModelIds.has(o.value))
.map(formatOption);
const currentAllowed =
opt.currentValue && allowedModelIds.has(opt.currentValue);
const nextCurrent =
Expand Down
1 change: 0 additions & 1 deletion packages/agent/src/adapters/claude/claude-agent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ export class ClaudeAcpAgent extends BaseAcpAgent {
list: {},
fork: {},
resume: {},
close: {},
},
_meta: {
posthog: {
Expand Down
2 changes: 1 addition & 1 deletion packages/agent/src/agent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ export class Agent {
sanitizedModel = codexModelIds[0];
}
}
if (!sanitizedModel) {
if (!sanitizedModel && options.adapter !== "codex") {
sanitizedModel = DEFAULT_GATEWAY_MODEL;
}

Expand Down
6 changes: 5 additions & 1 deletion packages/agent/src/gateway-models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,11 @@ export function getProviderName(ownedBy: string): string {
const PROVIDER_PREFIXES = ["anthropic/", "openai/", "google-vertex/"];

export function formatGatewayModelName(model: GatewayModel): string {
let cleanId = model.id;
return formatModelId(model.id);
}

export function formatModelId(modelId: string): string {
let cleanId = modelId;
for (const prefix of PROVIDER_PREFIXES) {
if (cleanId.startsWith(prefix)) {
cleanId = cleanId.slice(prefix.length);
Expand Down
Loading