larkin 0.2.87 → 0.2.89

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

@@ -65,20 +65,30 @@ function validatePiBaseUrl(raw) {
 }
 /**
  * 查询 OpenAI 兼容 provider 的 /models 列表（setup 时校验 --model 是否真实可用）。
- * 失败即抛错：setup 不应该接受一个没有依据的模型名。
+ * 网络超时/不可达返回 null（不阻塞 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);
+    try {
+        const url = `${validatePiBaseUrl(baseUrl)}/models`;
+        const response = await fetchImpl(url, {
+            headers: { Authorization: `Bearer ${apiKey}` },
+            signal: AbortSignal.timeout(30_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);
+    }
+    catch (error) {
+        if (error instanceof Error && (error.name === "TimeoutError" || error.name === "AbortError"
+            || /fetch failed|network|ETIMEDOUT|ECONNREFUSED|ConnectionRefused|Unable to connect/i.test(error.message))) {
+            return null;
+        }
+        throw error;
+    }
 }
 function resolveBuiltinPiProviderSetupSelection(input) {
     if (input.distribution !== "builtin")

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

@@ -51,20 +51,30 @@ export function validatePiBaseUrl(raw) {
 }
 /**
  * 查询 OpenAI 兼容 provider 的 /models 列表（setup 时校验 --model 是否真实可用）。
- * 失败即抛错：setup 不应该接受一个没有依据的模型名。
+ * 网络超时/不可达返回 null（不阻塞 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);
+    try {
+        const url = `${validatePiBaseUrl(baseUrl)}/models`;
+        const response = await fetchImpl(url, {
+            headers: { Authorization: `Bearer ${apiKey}` },
+            signal: AbortSignal.timeout(30_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);
+    }
+    catch (error) {
+        if (error instanceof Error && (error.name === "TimeoutError" || error.name === "AbortError"
+            || /fetch failed|network|ETIMEDOUT|ECONNREFUSED|ConnectionRefused|Unable to connect/i.test(error.message))) {
+            return null;
+        }
+        throw error;
+    }
 }
 export function resolveBuiltinPiProviderSetupSelection(input) {
     if (input.distribution !== "builtin")

package/dist/setup/bot-register.mjs

@@ -608,15 +608,22 @@ export async function main() {
             distribution: "builtin",
             preset: presetId,
             model: setupModel ?? presetDef?.defaultModel ?? "",
-            ...(presetDef ? { baseUrl: presetDef.baseUrl } : setupBaseUrl ? { baseUrl: validatePiBaseUrl(setupBaseUrl) } : {}),
+            // 显式 --base-url 优先于预设默认值（自定义网关场景，如 opencode）。
+            ...(setupBaseUrl ? { baseUrl: validatePiBaseUrl(setupBaseUrl) } : presetDef ? { baseUrl: presetDef.baseUrl } : {}),
         };
         if (setupModel && raw.baseUrl) {
             // Owner 决策：模型名必须来自 provider 的权威可用列表，输错即报错，不做运行时猜测。
+            // 网络超时/不可达时不阻塞 setup（null），运行时对账会严格兜底。
             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 || "无"}]`);
+            if (availableIds !== null) {
+                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 || "无"}]`);
+                }
+            }
+            else {
+                say("[setup] 网络暂不可达，跳过 /models 预校验；运行时将对模型严格对账");
             }
         }
         stageBuiltinPiProvider(CFG_DIR, id, { ...raw, apiKey: setupApiKey });

package/package.json

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