Skip to content

Commit c7a0931

Browse files
fix(pi): Pi models whose provider ID contains a slash can be selected (pingdotgg#32585)
Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent b718643 commit c7a0931

5 files changed

Lines changed: 133 additions & 16 deletions

File tree

‎packages/provider-pi/src/server/adapter.test.ts‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2274,6 +2274,59 @@ describe("PiAdapterV2", () => {
22742274
}).pipe(Effect.scoped, Effect.provide(layerTest)),
22752275
);
22762276

2277+
it.effect("selects the provider and id Pi reported when either contains a slash", () =>
2278+
Effect.gen(function* () {
2279+
const fake = yield* makeFakePi;
2280+
const hub = "hub=https://hub.example:8318/v1";
2281+
fake.queueModels([{ provider: "openrouter", id: "openrouter/auto" }]);
2282+
const { runtime, takeEvent } = yield* openRuntime(fake);
2283+
const providerThread = yield* runtime.ensureThread({
2284+
threadId: THREAD_ID,
2285+
modelSelection: modelSelection("default"),
2286+
runtimePolicy,
2287+
});
2288+
2289+
yield* startTurn(
2290+
runtime,
2291+
providerThread,
2292+
"default",
2293+
[],
2294+
"First",
2295+
modelSelection("openrouter/openrouter/auto"),
2296+
);
2297+
const openRouterRequest = yield* fake.takeRequest("set_model");
2298+
assert.deepEqual(
2299+
{ provider: openRouterRequest["provider"], modelId: openRouterRequest["modelId"] },
2300+
{ provider: "openrouter", modelId: "openrouter/auto" },
2301+
);
2302+
yield* fake.takeRequest("prompt");
2303+
yield* fake.emit({ type: "agent_start" });
2304+
yield* fake.emit({ type: "agent_end", messages: [], willRetry: false });
2305+
yield* fake.emit({ type: "agent_settled" });
2306+
yield* takeEvent((event) => event.type === "turn.terminal");
2307+
2308+
// A provider registered after the session started, e.g. by an extension reload.
2309+
fake.queueModels([
2310+
{ provider: "openrouter", id: "openrouter/auto" },
2311+
{ provider: hub, id: "claude-haiku-4-5" },
2312+
]);
2313+
yield* startTurn(
2314+
runtime,
2315+
providerThread,
2316+
"default",
2317+
[],
2318+
"Second",
2319+
modelSelection(`${hub}/claude-haiku-4-5`),
2320+
2,
2321+
);
2322+
const hubRequest = yield* fake.takeRequest("set_model");
2323+
assert.deepEqual(
2324+
{ provider: hubRequest["provider"], modelId: hubRequest["modelId"] },
2325+
{ provider: hub, modelId: "claude-haiku-4-5" },
2326+
);
2327+
}).pipe(Effect.scoped, Effect.provide(layerTest)),
2328+
);
2329+
22772330
it.effect.each(["anthropic/model-b", "default"])(
22782331
"preserves explicit thinking when switching models to %s in the same runtime",
22792332
(targetModel) =>

‎packages/provider-pi/src/server/adapter.ts‎

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,9 @@ import {
5858
} from "@t3tools/provider-core/server/failure";
5959
import { turnScopedSelectionTransition } from "@t3tools/provider-core/server/selectionTransition";
6060
import {
61+
findReportedPiModel,
6162
makePiRpcConnection,
62-
parsePiModelSlug,
63+
resolvePiModelSlug,
6364
piRecordField as recordField,
6465
piRecordNumber as recordNumber,
6566
piRecordString as recordString,
@@ -589,7 +590,7 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (
589590
let baselineThinking: string | null = null;
590591
let contextWindow: number | null = null;
591592
const modelContextWindows = new Map<string, number>();
592-
let modelsDiscovered = false;
593+
let discoveredModels: ReadonlyArray<unknown> | null = null;
593594
// Prompt ACKs lack IDs; retain session send order and ownership so late ACKs cannot affect new turns.
594595
const pendingPromptResponses: Array<PiPromptSend> = [];
595596
const pendingCompactResponses: Array<{
@@ -2420,6 +2421,17 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (
24202421
Effect.forkIn(scope),
24212422
);
24222423

2424+
const discoverModels = Effect.fnUntraced(function* () {
2425+
const modelsData = yield* request({ type: "get_available_models" }).pipe(
2426+
Effect.orElseSucceed(() => undefined),
2427+
);
2428+
const models = recordField(modelsData, "models");
2429+
if (Array.isArray(models)) {
2430+
for (const model of models) rememberModelContextWindow(model);
2431+
discoveredModels = models;
2432+
}
2433+
});
2434+
24232435
const registerThread = Effect.fnUntraced(function* (
24242436
threadInput: ProviderAdapter.ProviderAdapterV2EnsureThreadInput,
24252437
publish = true,
@@ -2468,16 +2480,7 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (
24682480
}
24692481
}
24702482
const stateData = yield* request({ type: "get_state" });
2471-
if (!modelsDiscovered) {
2472-
const modelsData = yield* request({ type: "get_available_models" }).pipe(
2473-
Effect.orElseSucceed(() => undefined),
2474-
);
2475-
const models = recordField(modelsData, "models");
2476-
if (Array.isArray(models)) {
2477-
for (const model of models) rememberModelContextWindow(model);
2478-
modelsDiscovered = true;
2479-
}
2480-
}
2483+
if (discoveredModels === null) yield* discoverModels();
24812484
contextWindow = rememberModelContextWindow(recordField(stateData, "model"));
24822485
// Capture each baseline before applying selections so our own choices cannot become Pi defaults.
24832486
if (baselineModel === null && appliedModel === null) {
@@ -2573,7 +2576,11 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (
25732576
appliedThinking = baselineThinking;
25742577
}
25752578
} else if (modelSelection.model !== appliedModel) {
2576-
const parsed = parsePiModelSlug(modelSelection.model);
2579+
// Extensions and models.json edits can add providers after the first discovery.
2580+
if (findReportedPiModel(modelSelection.model, discoveredModels) === undefined) {
2581+
yield* discoverModels();
2582+
}
2583+
const parsed = resolvePiModelSlug(modelSelection.model, discoveredModels);
25772584
if (parsed === null) {
25782585
return yield* protocolError(
25792586
`Pi model '${modelSelection.model}' must use provider/model format`,

‎packages/provider-pi/src/server/rpc.ts‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,28 @@ export function piRecordNumber(input: unknown, key: string): number | undefined
5858
return Predicate.isNumber(value) && Number.isFinite(value) ? value : undefined;
5959
}
6060

61-
export function parsePiModelSlug(slug: string): { provider: string; modelId: string } | null {
61+
// Pi provider names and model ids may both contain "/", so a slug only splits
62+
// reliably through the `{provider, id}` pairs `get_available_models` reported.
63+
export function findReportedPiModel(
64+
slug: string,
65+
reportedModels: unknown,
66+
): { provider: string; modelId: string } | undefined {
67+
if (!Array.isArray(reportedModels)) return undefined;
68+
for (const model of reportedModels) {
69+
const provider = piRecordString(model, "provider");
70+
const modelId = piRecordString(model, "id");
71+
if (provider !== undefined && modelId !== undefined && `${provider}/${modelId}` === slug)
72+
return { provider, modelId };
73+
}
74+
return undefined;
75+
}
76+
77+
export function resolvePiModelSlug(
78+
slug: string,
79+
reportedModels: unknown,
80+
): { provider: string; modelId: string } | null {
81+
const reported = findReportedPiModel(slug, reportedModels);
82+
if (reported !== undefined) return reported;
6283
const separator = slug.indexOf("/");
6384
if (separator <= 0 || separator === slug.length - 1) return null;
6485
return { provider: slug.slice(0, separator), modelId: slug.slice(separator + 1) };

‎packages/provider-pi/src/server/textGeneration.test.ts‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ const makeFakePi = (
1919
reply: string,
2020
setModelError?: string,
2121
turnEvents: ReadonlyArray<Record<string, unknown>> = [],
22+
models?: ReadonlyArray<Record<string, unknown>>,
2223
) =>
2324
Effect.gen(function* () {
2425
const stdout = yield* Queue.unbounded<Uint8Array, Cause.Done>();
@@ -41,6 +42,8 @@ const makeFakePi = (
4142
yield* emit({ type: "agent_settled" });
4243
} else if (record["type"] === "get_last_assistant_text") {
4344
yield* emit({ ...response, success: true, data: { text: reply } });
45+
} else if (record["type"] === "get_available_models" && models !== undefined) {
46+
yield* emit({ ...response, success: true, data: { models } });
4447
} else if (record["type"] === "set_model" && setModelError !== undefined) {
4548
yield* emit({ ...response, success: false, error: setModelError });
4649
} else {
@@ -124,6 +127,36 @@ it.effect("names the model and the disabled extensions when Pi cannot load it",
124127
}),
125128
);
126129

130+
it.effect("selects the provider and id Pi reported when the provider contains a slash", () =>
131+
Effect.gen(function* () {
132+
const provider = "llama-server=http://127.0.0.1:8080";
133+
const pi = yield* makeFakePi(
134+
JSON.stringify({ subject: "Update README", body: "" }),
135+
undefined,
136+
[],
137+
[{ provider, id: "qwen3" }],
138+
);
139+
const textGeneration = yield* makePiTextGeneration(
140+
{ enabled: true, binaryPath: "pi", launchArgs: "", customModels: [] },
141+
{},
142+
).pipe(Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, pi.spawner));
143+
144+
yield* textGeneration.generateCommitMessage({
145+
cwd: process.cwd(),
146+
branch: "main",
147+
stagedSummary: "M README.md",
148+
stagedPatch: "diff --git a/README.md b/README.md",
149+
modelSelection: createModelSelection(ProviderInstanceId.make("pi"), `${provider}/qwen3`),
150+
});
151+
152+
const setModel = pi.received.find((record) => record["type"] === "set_model");
153+
assert.deepEqual(
154+
{ provider: setModel?.["provider"], modelId: setModel?.["modelId"] },
155+
{ provider, modelId: "qwen3" },
156+
);
157+
}),
158+
);
159+
127160
const failedTurnWith = (errorMessage: string) => ({
128161
type: "message_end",
129162
message: { role: "assistant", stopReason: "error", errorMessage },

‎packages/provider-pi/src/server/textGeneration.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import * as ChildProcessSpawner from "effect/process/ChildProcessSpawner";
77
import { TextGenerationError } from "@t3tools/contracts";
88
import type { PiSettings } from "../settings.ts";
99

10-
import { makePiRpcConnection, parsePiModelSlug, piRecordString } from "./rpc.ts";
10+
import { makePiRpcConnection, piRecordField, piRecordString, resolvePiModelSlug } from "./rpc.ts";
1111
import { buildPiRpcLaunch, resolvePiLaunchArgs } from "./mcpInjection.ts";
1212
import * as TextGenerationOperations from "@t3tools/provider-core/server/textGenerationOperations";
1313

@@ -61,7 +61,10 @@ export const makePiTextGeneration = Effect.fn("makePiTextGeneration")(function*
6161

6262
if (modelSelection.model !== "default") {
6363
// Reject unusable custom slugs; silently using Pi's default would misreport the requested model.
64-
const parsed = parsePiModelSlug(modelSelection.model);
64+
const inventory = yield* connection
65+
.request({ type: "get_available_models" })
66+
.pipe(Effect.orElseSucceed(() => undefined));
67+
const parsed = resolvePiModelSlug(modelSelection.model, piRecordField(inventory, "models"));
6568
if (parsed === null) {
6669
return yield* new TextGenerationError({
6770
operation,

0 commit comments

Comments
 (0)