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
10 changes: 2 additions & 8 deletions src/benchmarks/agent-cli/runner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { isNone } from "effect/Option";

import { SolverError } from "../../harness/core";
import type { ModelUsage } from "../../harness/core";
import { stripRoutingPrefix } from "../../harness/model-slug";
import { definedValues } from "../../internal/guards";
import { wLog } from "../../internal/log";
import { recordGenerationId } from "../../runtime/generation-ids";
Expand Down Expand Up @@ -165,14 +166,7 @@ export interface AgentCliRunResult extends OriAgentRun {
readonly failureDetail: string;
}

export function normalizeAgentModel(model: string): string {
const routingPrefix = "openrouter/";
if (!model.startsWith(routingPrefix)) {
return model;
}
const rest = model.slice(routingPrefix.length);
return rest.includes("/") ? rest : model;
}
export const normalizeAgentModel = stripRoutingPrefix;

export function buildAgentCliEnv(opts: AgentCliOpts): Record<string, string> {
const env: Record<string, string> = {
Expand Down
16 changes: 16 additions & 0 deletions src/harness/model-slug.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { describe, expect, it } from "bun:test";

import { stripRoutingPrefix } from "./model-slug";

describe("stripRoutingPrefix", () => {
it("removes the openrouter/ routing prefix from a full slug", () => {
expect(stripRoutingPrefix("openrouter/sakana/fugu-ultra")).toBe(
"sakana/fugu-ultra"
);
});

it("keeps openrouter-authored slugs and unprefixed slugs unchanged", () => {
expect(stripRoutingPrefix("openrouter/auto")).toBe("openrouter/auto");
expect(stripRoutingPrefix("sakana/fugu-ultra")).toBe("sakana/fugu-ultra");
});
});
9 changes: 9 additions & 0 deletions src/harness/model-slug.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
const ROUTING_PREFIX = "openrouter/";

export function stripRoutingPrefix(model: string): string {
if (!model.startsWith(ROUTING_PREFIX)) {
return model;
}
const rest = model.slice(ROUTING_PREFIX.length);
return rest.includes("/") ? rest : model;
}
6 changes: 6 additions & 0 deletions src/sandbox/modal-regions.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ describe("resolveModalRegions", () => {
expect(resolveModalRegions("sakana/fugu-max", undefined)).toEqual(["us"]);
});

it("matches pins through the openrouter/ routing prefix", () => {
expect(
resolveModalRegions("openrouter/sakana/fugu-ultra", undefined)
).toEqual(["us"]);
});

it("leaves unpinned models to Modal's default placement", () => {
expect(
resolveModalRegions("anthropic/claude-opus-5", undefined)
Expand Down
5 changes: 4 additions & 1 deletion src/sandbox/modal-regions.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { stripRoutingPrefix } from "../harness/model-slug";

export const MODAL_US_REGIONS = ["us"] as const;

export interface ModalRegionPin {
Expand All @@ -17,5 +19,6 @@ export function resolveModalRegions(
if (configured !== undefined) {
return configured;
}
return pins.find((pin) => model.startsWith(pin.modelPrefix))?.regions;
const slug = stripRoutingPrefix(model);
return pins.find((pin) => slug.startsWith(pin.modelPrefix))?.regions;
}
Loading