Skip to content

Commit 23049bc

Browse files
fix(pi): select models whose Pi provider name contains a slash
Pi providers such as pi-llama-cpp's `llama-server=http://host:port` contain "/", and model ids can too (`openrouter` / `openrouter/auto`), so splitting a `provider/id` slug at any single "/" can send set_model a provider Pi does not know. Resolve the slug against the `{provider, id}` pairs get_available_models reported, falling back to the first-"/" split only for slugs Pi did not report. The adapter keeps the inventory it already fetches per session; text generation asks for it once on its short-lived connection before set_model. AI-assisted; verified with the tests and tools listed above.
1 parent 9365230 commit 23049bc

4 files changed

Lines changed: 57 additions & 8 deletions

File tree

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ import {
5959
import { turnScopedSelectionTransition } from "@t3tools/provider-core/server/selectionTransition";
6060
import {
6161
makePiRpcConnection,
62-
parsePiModelSlug,
62+
resolvePiModelSlug,
6363
piRecordField as recordField,
6464
piRecordNumber as recordNumber,
6565
piRecordString as recordString,
@@ -585,7 +585,7 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (
585585
let baselineThinking: string | null = null;
586586
let contextWindow: number | null = null;
587587
const modelContextWindows = new Map<string, number>();
588-
let modelsDiscovered = false;
588+
let discoveredModels: ReadonlyArray<unknown> | null = null;
589589
// Prompt ACKs lack IDs; retain session send order and ownership so late ACKs cannot affect new turns.
590590
const pendingPromptResponses: Array<PiPromptSend> = [];
591591
const pendingCompactResponses: Array<{
@@ -2462,14 +2462,14 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (
24622462
}
24632463
}
24642464
const stateData = yield* request({ type: "get_state" });
2465-
if (!modelsDiscovered) {
2465+
if (discoveredModels === null) {
24662466
const modelsData = yield* request({ type: "get_available_models" }).pipe(
24672467
Effect.orElseSucceed(() => undefined),
24682468
);
24692469
const models = recordField(modelsData, "models");
24702470
if (Array.isArray(models)) {
24712471
for (const model of models) rememberModelContextWindow(model);
2472-
modelsDiscovered = true;
2472+
discoveredModels = models;
24732473
}
24742474
}
24752475
contextWindow = rememberModelContextWindow(recordField(stateData, "model"));
@@ -2567,7 +2567,7 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (
25672567
appliedThinking = baselineThinking;
25682568
}
25692569
} else if (modelSelection.model !== appliedModel) {
2570-
const parsed = parsePiModelSlug(modelSelection.model);
2570+
const parsed = resolvePiModelSlug(modelSelection.model, discoveredModels);
25712571
if (parsed === null) {
25722572
return yield* protocolError(
25732573
`Pi model '${modelSelection.model}' must use provider/model format`,

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

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,20 @@ 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 resolvePiModelSlug(
64+
slug: string,
65+
reportedModels: unknown,
66+
): { provider: string; modelId: string } | null {
67+
if (Array.isArray(reportedModels)) {
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+
}
6275
const separator = slug.indexOf("/");
6376
if (separator <= 0 || separator === slug.length - 1) return null;
6477
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)