larkin 0.2.85 → 0.2.87

package/dist/runtime/pi-provider-config.cjs

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PI_PROVIDER_PRESETS = exports.BUNDLED_PI_VERSION = void 0;
 exports.validatePiBaseUrl = validatePiBaseUrl;
+exports.listProviderModels = listProviderModels;
 exports.resolveBuiltinPiProviderSetupSelection = resolveBuiltinPiProviderSetupSelection;
 exports.validateBuiltinPiProviderSelection = validateBuiltinPiProviderSelection;
 exports.piAgentDirectory = piAgentDirectory;
@@ -62,6 +63,23 @@ function validatePiBaseUrl(raw) {
     }
     return url.toString().replace(/\/$/, "");
 }
+/**
+ * 查询 OpenAI 兼容 provider 的 /models 列表（setup 时校验 --model 是否真实可用）。
+ * 失败即抛错：setup 不应该接受一个没有依据的模型名。
+ */
+async function listProviderModels(baseUrl, apiKey, fetchImpl = fetch) {
+    const url = `${validatePiBaseUrl(baseUrl)}/models`;
+    const response = await fetchImpl(url, {
+        headers: { Authorization: `Bearer ${apiKey}` },
+        signal: AbortSignal.timeout(15_000),
+    });
+    if (!response.ok)
+        throw new Error(`provider /models 查询失败：HTTP ${response.status}`);
+    const payload = await response.json();
+    if (!payload || !Array.isArray(payload.data))
+        throw new Error("provider /models 响应格式非法");
+    return payload.data.map((entry) => String(entry.id ?? "")).filter(Boolean);
+}
 function resolveBuiltinPiProviderSetupSelection(input) {
     if (input.distribution !== "builtin")
         throw new Error("provider 凭证只能用于内置 Pi");

package/dist/runtime/pi-provider-config.mjs

@@ -49,6 +49,23 @@ export function validatePiBaseUrl(raw) {
     }
     return url.toString().replace(/\/$/, "");
 }
+/**
+ * 查询 OpenAI 兼容 provider 的 /models 列表（setup 时校验 --model 是否真实可用）。
+ * 失败即抛错：setup 不应该接受一个没有依据的模型名。
+ */
+export async function listProviderModels(baseUrl, apiKey, fetchImpl = fetch) {
+    const url = `${validatePiBaseUrl(baseUrl)}/models`;
+    const response = await fetchImpl(url, {
+        headers: { Authorization: `Bearer ${apiKey}` },
+        signal: AbortSignal.timeout(15_000),
+    });
+    if (!response.ok)
+        throw new Error(`provider /models 查询失败：HTTP ${response.status}`);
+    const payload = await response.json();
+    if (!payload || !Array.isArray(payload.data))
+        throw new Error("provider /models 响应格式非法");
+    return payload.data.map((entry) => String(entry.id ?? "")).filter(Boolean);
+}
 export function resolveBuiltinPiProviderSetupSelection(input) {
     if (input.distribution !== "builtin")
         throw new Error("provider 凭证只能用于内置 Pi");

package/dist/runtime/runtime-adapters.mjs

@@ -850,8 +850,16 @@ async function createPiRpcBackend(input, dependencies, spawn) {
         if (!available?.models?.length)
             throw new Error("Pi has no authenticated available models. Run the official `pi` login flow or configure provider credentials; Larkin will not create a fallback session.");
         const effectiveModel = state.model?.provider && state.model.id ? `${state.model.provider}/${state.model.id}` : null;
-        if (requestedModel && effectiveModel !== requestedModel)
-            throw new Error(`Pi model fallback refused: requested ${requestedModel}, effective ${effectiveModel || "none"}`);
+        // 严格对账（Owner 决策）：模型必须来自 pi 的权威可用列表，不做后缀猜测——
+        // 配置的模型与 pi 可用列表不符即报错，并在错误里列出可用模型。
+        const availableEntries = (available.models ?? []).map((entry) => ({
+            provider: String(entry.provider ?? ""), id: String(entry.id ?? ""),
+        }));
+        const matchesAvailable = (candidate) => availableEntries.some((entry) => entry.id === candidate || (entry.provider ? `${entry.provider}/${entry.id}` === candidate : false));
+        if (requestedModel && effectiveModel !== requestedModel && !matchesAvailable(requestedModel)) {
+            const availableText = availableEntries.slice(0, 10).map((entry) => entry.provider ? `${entry.provider}/${entry.id}` : entry.id).join(", ");
+            throw new Error(`Pi model fallback refused: requested ${requestedModel} is not in Pi's available models${availableText ? ` (${availableText})` : ""}`);
+        }
         if (requestedEffort && state.thinkingLevel !== requestedEffort)
             throw new Error(`Pi thinking level ${requestedEffort} was not accepted by effective model ${effectiveModel || "unknown"}`);
         return new PiRpcBackend(client, state);

package/dist/setup/bot-register.mjs

@@ -14,7 +14,7 @@ import { managedLarkCliEnv } from "../app/agent-lark-cli-workspace.mjs";
 import { resolveOfficialLarkCli } from "../app/official-lark-cli.mjs";
 import { collectSetupAgentChoice, recoverUnavailableExternalPi, terminalSetupQuestioner } from "./setup-agent-choice.mjs";
 import { probeNativeRuntimeReadiness } from "../runtime/runtime-readiness.mjs";
-import { configureBuiltinPiProviderModel, stageBuiltinPiProvider, validatePiBaseUrl, PI_PROVIDER_PRESETS } from "../runtime/pi-provider-config.mjs";
+import { configureBuiltinPiProviderModel, stageBuiltinPiProvider, validatePiBaseUrl, listProviderModels, PI_PROVIDER_PRESETS } from "../runtime/pi-provider-config.mjs";
 import { beginBuiltinPiCredentialTransaction, createOfficialPiCredentialRuntime, createOfficialPiAuthInteraction, createOfficialPiModelRuntime, createOfficialPiLogoutRuntime, createOfficialPiRegistryRuntime, listOfficialPiAuthProviders, logoutOfficialPiProvider, officialPiAuthStatus, runOfficialPiLogin, verifyOfficialPiProviderTurn, } from "../runtime/pi-official-auth.mjs";
 import { documentCommentSubscriptionCapability, markDocumentCommentSubscriptionVerified, } from "../platform/callback-capability.mjs";
 // qrcode-terminal does not publish TypeScript declarations.
@@ -610,6 +610,15 @@ export async function main() {
             model: setupModel ?? presetDef?.defaultModel ?? "",
             ...(presetDef ? { baseUrl: presetDef.baseUrl } : setupBaseUrl ? { baseUrl: validatePiBaseUrl(setupBaseUrl) } : {}),
         };
+        if (setupModel && raw.baseUrl) {
+            // Owner 决策：模型名必须来自 provider 的权威可用列表，输错即报错，不做运行时猜测。
+            const availableIds = await listProviderModels(raw.baseUrl, setupApiKey);
+            const matched = availableIds.some((id) => id === setupModel || id.endsWith(`/${setupModel}`));
+            if (!matched) {
+                const preview = availableIds.slice(0, 12).join(", ") + (availableIds.length > 12 ? ", …" : "");
+                throw new Error(`未知模型 ${setupModel}；provider 可用模型：[${preview || "无"}]`);
+            }
+        }
         stageBuiltinPiProvider(CFG_DIR, id, { ...raw, apiKey: setupApiKey });
         temporaryAgentChoiceFile = path.join(CFG_DIR, `.setup-agent-choice-${process.pid}-${Date.now()}.json`);
         fs.writeFileSync(temporaryAgentChoiceFile, `${JSON.stringify({ ...raw, runtime: "pi", authCompleted: true, readinessCompleted: true })}\n`, { mode: 0o600, flag: "wx" });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "larkin",
-  "version": "0.2.85",
+  "version": "0.2.87",
   "private": false,
   "larkinPackageRole": "npm-published",
   "files": [