@haoyiyin/9router 0.1.7 → 0.3.0

package/README.md

@@ -12,7 +12,7 @@ pi install npm:@haoyiyin/9router
 
 ## Configure
 
-There is no built-in default endpoint. Run `/9router`, enter the 9Router base URL and API key, and they are saved to `~/.pi/agent/haoyiyin/9router.json` (mode `0600`). Leave the key empty to keep the currently configured key.
+There is no built-in default endpoint. Run `/login`, select **9Router**, and enter the base URL and API key. They are saved to `~/.pi/agent/haoyiyin/9router.json` (mode `0600`). `/logout` removes the stored credential.
 
 Environment variables are supported as a fallback: `ROUTER_API_BASE` / `ROUTER_API_KEY` (the config file takes precedence).
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haoyiyin/9router",
-  "version": "0.1.7",
+  "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/index.ts

@@ -3,15 +3,12 @@ import registerFetch from "./fetch.ts";
 import registerSearch from "./search.ts";
 import registerTranscribe from "./transcribe.ts";
 import { registerProvider, isStaleCtxError } from "./provider.ts";
-import { registerCommand } from "./command.ts";
 
 export default async function (pi: ExtensionAPI): Promise<void> {
 	registerFetch(pi);
 	registerSearch(pi);
 	registerTranscribe(pi);
 
-	registerCommand(pi);
-
 	await registerProvider(pi);
 
 	let refreshing = false;

package/src/provider.ts

@@ -3,25 +3,23 @@
  *
  * Registers the "9router" provider in Pi, pulling the live router model list
  * plus OpenCode's free oc/-free models. Falls back to an empty model list if
- * the API key is unset (so the /9router command can re-register after config
+ * the API key is unset (so /login can configure it and re-register once a key
  * is saved).
  *
  * Config (base URL + key, with env fallback) is owned by ./config.ts.
  */
 
 import type { ExtensionAPI, ProviderModelConfig } from "@earendil-works/pi-coding-agent";
+import type { OAuthCredentials, OAuthLoginCallbacks } from "@earendil-works/pi-ai";
 import type { ModelsDevModel, RouterModel } from "./data.ts";
 import { fetchModelsDevIndex, lookupInIndex, routerBaseUrl, routerModels } from "./data.ts";
 import { getZenFreeModels } from "./zen.ts";
-import { loadConfig, type RouterConfig } from "./config.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,
@@ -49,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,
 	);
 }
 
@@ -139,17 +161,56 @@ export function isStaleCtxError(err: unknown): boolean {
 	return err instanceof Error && /stale after session replacement|ctx is stale/.test(err.message);
 }
 
+// Login flow: collect base URL + API key, persist to config, then re-register
+// so the model list and base URL take effect. The key is carried as the OAuth
+// credential (getApiKey); no separate apiKey is set on the provider, so /login
+// shows exactly one 9router entry instead of an api_key + oauth pair.
+function makeOAuth(pi: ExtensionAPI) {
+	return {
+		name: "9Router",
+		login: async (callbacks: OAuthLoginCallbacks): Promise<OAuthCredentials> => {
+			const current = loadConfig();
+			const baseUrl = await callbacks.onPrompt({
+				message: "9Router base URL",
+				placeholder: current.baseUrl || "https://your-router.example.com",
+			});
+			if (baseUrl === undefined) throw new Error("9Router login cancelled");
+			const trimmedBase = baseUrl.trim();
+			const normalizedBase = trimmedBase.endsWith("/")
+				? trimmedBase.slice(0, -1)
+				: trimmedBase;
+
+			const apiKey = await callbacks.onPrompt({
+				message: "9Router API key",
+				placeholder: "sk-...",
+			});
+			if (apiKey === undefined) throw new Error("9Router login cancelled");
+			const trimmedKey = apiKey.trim();
+			if (!trimmedKey) throw new Error("9Router API key is required");
+
+			saveConfig({ baseUrl: normalizedBase, apiKey: trimmedKey, comboReasoning: current.comboReasoning });
+
+			// Re-register with the freshly saved config so models + base URL apply.
+			await registerProvider(pi);
+
+			return { refresh: trimmedKey, access: trimmedKey, expires: Number.MAX_SAFE_INTEGER };
+		},
+		refreshToken: async (cred: OAuthCredentials): Promise<OAuthCredentials> => cred,
+		getApiKey: (cred: OAuthCredentials): string => cred.access,
+	};
+}
+
 export async function registerProvider(pi: ExtensionAPI): Promise<void> {
 	const cfg = loadConfig();
+	const oauth = makeOAuth(pi);
 
 	if (!cfg.apiKey) {
-		// Register shell provider so the name is known; no models available yet.
+		// Register shell provider so /login can configure it; no models yet.
 		pi.registerProvider("9router", {
 			name: "9Router",
-			baseUrl: cfg.baseUrl,
-			apiKey: "",
 			api: "openai-completions",
 			models: [],
+			oauth,
 		});
 		return;
 	}
@@ -186,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,
@@ -228,10 +289,10 @@ export async function registerProvider(pi: ExtensionAPI): Promise<void> {
 	pi.registerProvider("9router", {
 		name: "9Router",
 		baseUrl: cfg.baseUrl,
-		apiKey: cfg.apiKey,
 		api: "openai-completions",
 		headers: { "User-Agent": "pi-coding-agent" },
 		models: out,
+		oauth,
 	});
 }
 

package/src/command.ts

@@ -1,54 +0,0 @@
-import type { ExtensionAPI, ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
-import { loadConfig, saveConfig, DEFAULT_BASE } from "./config.ts";
-import { registerProvider, isStaleCtxError } from "./provider.ts";
-
-// Never contains a real key. If a dialog pre-fills this placeholder as an
-// editable default, an exact match is treated as "keep the current key".
-const API_KEY_PLACEHOLDER = "sk-... (leave empty to keep the current key)";
-
-export function registerCommand(pi: ExtensionAPI): void {
-	pi.registerCommand("9router", {
-		description: "Configure 9Router base URL and API key (saved to ~/.pi/agent/haoyiyin/9router.json)",
-		handler: async (args: string, ctx: ExtensionCommandContext) => {
-			const current = loadConfig();
-
-			const baseUrl = await ctx.ui.input("9Router base URL", current.baseUrl || DEFAULT_BASE);
-			if (baseUrl === undefined) return;
-			const trimmedBase = baseUrl.trim();
-			const normalizedBase = trimmedBase.endsWith("/")
-				? trimmedBase.slice(0, -1)
-				: trimmedBase;
-
-			const apiKey = await ctx.ui.input("9Router API key", API_KEY_PLACEHOLDER);
-			if (apiKey === undefined) return;
-			const trimmedKey = apiKey.trim();
-
-			let finalKey: string;
-			if (trimmedKey === "" || trimmedKey === API_KEY_PLACEHOLDER) {
-				// Keep the existing key; never treat the placeholder as a submitted value.
-				if (!current.apiKey) {
-					ctx.ui.notify("No API key configured", "error");
-					return;
-				}
-				finalKey = current.apiKey;
-			} else {
-				finalKey = trimmedKey;
-			}
-
-			saveConfig({ baseUrl: normalizedBase, apiKey: finalKey });
-
-			try {
-				await registerProvider(pi);
-			} catch (err) {
-				ctx.ui.notify(
-					isStaleCtxError(err)
-						? "9Router saved. This extension instance was replaced by a session change/reload; the new instance has re-registered the provider."
-						: `9Router saved, but provider re-registration failed: ${err instanceof Error ? err.message : String(err)}`,
-					"warning",
-				);
-			}
-
-			ctx.ui.notify(`9Router saved: ${normalizedBase}`, "info");
-		},
-	});
-}