@haoyiyin/9router 0.2.0 → 0.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haoyiyin/9router",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "type": "module",
   "main": "src/index.ts",
   "description": "Pi extension — 9Router provider (OpenCode Free oc/-free models + router models) + fetch/search/transcribe tools",

package/src/data.ts

@@ -37,13 +37,17 @@ export interface RouterModel {
 	name?: string;
 	context_window?: number;
 	contextWindow?: number;
+	/** 9router also advertises the OpenAI-style top-level aliases */
+	context_length?: number;
 	max_tokens?: number;
 	maxTokens?: number;
+	max_completion_tokens?: number;
 	owned_by?: string;
 	/** 9router v1 API nests these inside capabilities */
 	capabilities?: {
 		contextWindow?: number;
 		maxOutput?: number;
+		max_output?: number;
 		reasoning?: boolean;
 		thinkingFormat?: string;
 		thinkingCanDisable?: boolean;

package/src/provider.ts

@@ -16,13 +16,10 @@ import { fetchModelsDevIndex, lookupInIndex, routerBaseUrl, routerModels } from
 import { getZenFreeModels } from "./zen.ts";
 import { loadConfig, saveConfig, type RouterConfig } from "./config.ts";
 
-// ponytail: 128k was the old generic fallback; combo members bottom out at 200k,
-// so the default now matches the smallest combo upstream. Raise again if the
-// router ever exposes combo capabilities.contextWindow.
-const DEFAULT_CONTEXT_WINDOW = 200_000;
-// ponytail: 16k was the old generic fallback; combo members bottom out at 128k,
-// so the default now matches the smallest combo upstream max output.
-const DEFAULT_MAX_TOKENS = 128_000;
+// ponytail: pi's ProviderModelConfig requires both numbers, so a model the
+// router leaves blank still needs a value. Used only when nothing is advertised.
+const FALLBACK_CONTEXT_WINDOW = 128_000;
+const FALLBACK_MAX_TOKENS = 16_384;
 
 const ZERO_COST = {
 	input: 0,
@@ -50,23 +47,47 @@ export function getModelName(model: RouterModel, devModel?: ModelsDevModel): str
 	return model.name || devModel?.name || model.id || "unknown";
 }
 
-export function getContextWindow(model: RouterModel, devModel?: ModelsDevModel): number {
-	return (
-		model.context_window ||
-		model.contextWindow ||
-		model.capabilities?.contextWindow ||
-		devModel?.limit?.context ||
-		DEFAULT_CONTEXT_WINDOW
+/** First positive finite number. 0/null/NaN are "not advertised", not a real limit. */
+function firstPositive(...values: unknown[]): number | undefined {
+	for (const v of values) {
+		if (typeof v === "number" && Number.isFinite(v) && v > 0) return v;
+	}
+	return undefined;
+}
+
+/**
+ * Context window straight from the router. `fallback` applies only when the
+ * router (and models.dev) advertise nothing — never ahead of an API value.
+ */
+export function getContextWindow(
+	model: RouterModel,
+	devModel?: ModelsDevModel,
+	fallback?: number,
+): number | undefined {
+	return firstPositive(
+		model.context_window,
+		model.contextWindow,
+		model.context_length,
+		model.capabilities?.contextWindow,
+		devModel?.limit?.context,
+		fallback,
 	);
 }
 
-export function getMaxTokens(model: RouterModel, devModel?: ModelsDevModel): number {
-	return (
-		model.max_tokens ||
-		model.maxTokens ||
-		model.capabilities?.maxOutput ||
-		devModel?.limit?.output ||
-		DEFAULT_MAX_TOKENS
+/** Max output straight from the router. `fallback` only when nothing is advertised. */
+export function getMaxTokens(
+	model: RouterModel,
+	devModel?: ModelsDevModel,
+	fallback?: number,
+): number | undefined {
+	return firstPositive(
+		model.max_tokens,
+		model.maxTokens,
+		model.max_completion_tokens,
+		model.capabilities?.maxOutput,
+		model.capabilities?.max_output,
+		devModel?.limit?.output,
+		fallback,
 	);
 }
 
@@ -226,8 +247,8 @@ export async function registerProvider(pi: ExtensionAPI): Promise<void> {
 			reasoning: comboOptIn ? comboOptIn.reasoning : getReasoning(model, devModel),
 			input: getInputTypes(model, devModel),
 			cost: ZERO_COST,
-			contextWindow: getContextWindow(model, devModel),
-			maxTokens: getMaxTokens(model, devModel),
+			contextWindow: getContextWindow(model, devModel, FALLBACK_CONTEXT_WINDOW)!,
+			maxTokens: getMaxTokens(model, devModel, FALLBACK_MAX_TOKENS)!,
 			thinkingLevelMap: comboOptIn ? comboOptIn.thinkingLevelMap : getThinkingLevelMap(model),
 			compat: {
 				...COMPAT,