@xynogen/pix-9router 0.3.21 → 0.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@xynogen/pix-9router",
-	"version": "0.3.21",
+	"version": "0.4.0",
 	"description": "Pi extension — 9Router provider + fetch/search tools via router API",
 	"type": "module",
 	"main": "src/index.ts",

package/src/provider.ts

@@ -9,6 +9,7 @@
  *   ROUTER_API_KEY   — bearer token (required for live model list)
  */
 
+import type { RefreshModelsContext } from "@earendil-works/pi-ai";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import type { ModelsDevModel, RouterModel } from "./data.js";
 import { fetchModelsDevIndex, lookupInIndex, routerBaseUrl, routerModels } from "./data.js";
@@ -26,6 +27,33 @@ const ZERO_COST = {
 // Fallback pattern-based detection if models.dev lookup fails
 const IMAGE_CAPABLE_PATTERNS = [/claude/i, /gpt-5/i, /gpt-4/i, /kimi-k2/i, /hy3/i];
 
+interface RouterModelsResponse {
+	data?: RouterModel[];
+}
+
+const COMPAT = {
+	supportsDeveloperRole: false,
+	supportsUsageInStreaming: false,
+	maxTokensField: "max_tokens",
+} as const;
+
+function toModelConfig(devIndex: Map<string, ModelsDevModel>) {
+	return (model: RouterModel) => {
+		const id = model.id ?? "";
+		const devModel = lookupInIndex(id, devIndex);
+		return {
+			id,
+			name: getModelName(model, devModel),
+			reasoning: getReasoning(model, devModel),
+			input: getInputTypes(model, devModel),
+			cost: ZERO_COST,
+			contextWindow: getContextWindow(model, devModel),
+			maxTokens: getMaxTokens(model, devModel),
+			compat: COMPAT,
+		};
+	};
+}
+
 export function getInputTypes(model: RouterModel, devModel?: ModelsDevModel): ("text" | "image")[] {
 	if (devModel?.modalities?.input) {
 		const inputs = devModel.modalities.input.filter(
@@ -82,39 +110,54 @@ export default async function registerProvider(pi: ExtensionAPI): Promise<void>
 		return;
 	}
 
-	const [models, devIndex] = await Promise.all([
+	// Upstream moved OpenAI `compat` settings from the provider level to the
+	// per-model level (ProviderModelConfig.compat). Applied in toModelConfig.
+
+	// Register from disk cache only — startup must not block on network.
+	const cached = routerModels.getCached();
+	pi.registerProvider("9router", providerConfig(apiKey, cached, new Map()));
+
+	// Background refresh; re-registering after startup applies immediately.
+	void Promise.all([
 		routerModels.get(),
 		fetchModelsDevIndex().catch(() => new Map<string, ModelsDevModel>()),
-	]);
+	])
+		.then(([models, devIndex]) =>
+			pi.registerProvider("9router", providerConfig(apiKey, models, devIndex)),
+		)
+		.catch(() => {});
+}
 
-	// Upstream moved OpenAI `compat` settings from the provider level to the
-	// per-model level (ProviderModelConfig.compat). Apply the same shim to every
-	// registered model.
-	const COMPAT = {
-		supportsDeveloperRole: false,
-		supportsUsageInStreaming: false,
-		maxTokensField: "max_tokens",
-	} as const;
-
-	pi.registerProvider("9router", {
+function providerConfig(
+	apiKey: string,
+	models: RouterModel[],
+	devIndex: Map<string, ModelsDevModel>,
+) {
+	return {
 		name: "9Router",
 		baseUrl: routerBaseUrl(),
 		apiKey: "$ROUTER_API_KEY",
 		api: "openai-completions",
 		headers: { "User-Agent": "pi-coding-agent" },
-		models: models.map((model) => {
-			const id = model.id ?? "";
-			const devModel = lookupInIndex(id, devIndex);
-			return {
-				id,
-				name: getModelName(model, devModel),
-				reasoning: getReasoning(model, devModel),
-				input: getInputTypes(model, devModel),
-				cost: ZERO_COST,
-				contextWindow: getContextWindow(model, devModel),
-				maxTokens: getMaxTokens(model, devModel),
-				compat: COMPAT,
-			};
-		}),
-	});
+		models: models.map(toModelConfig(devIndex)),
+		// Live fetch on /model refresh — bypasses the disk cache.
+		// Pi calls refreshModels once per provider at every startup with
+		// allowNetwork:false (awaited, no timeout) — never touch the network
+		// there; serve the registered snapshot instead.
+		async refreshModels({ signal, allowNetwork }: RefreshModelsContext) {
+			if (!allowNetwork) return models.map(toModelConfig(devIndex));
+			const res = await fetch(`${routerBaseUrl()}/models`, {
+				signal: AbortSignal.any([AbortSignal.timeout(8_000), ...(signal ? [signal] : [])]),
+				headers: {
+					Authorization: `Bearer ${apiKey}`,
+					"User-Agent": "pi-coding-agent",
+				},
+			});
+			if (!res.ok) throw new Error(`9router /models: ${res.status}`);
+			const raw = (await res.json()) as RouterModelsResponse;
+			const list = (raw.data ?? []).filter((m) => Boolean(m.id));
+			const fresh = await fetchModelsDevIndex().catch(() => new Map<string, ModelsDevModel>());
+			return list.map(toModelConfig(fresh));
+		},
+	};
 }

package/src/render.test.ts

@@ -36,13 +36,12 @@ const config = {
 	meta: (details: { _type: "fetchResult"; chars: number }) => `${details.chars} chars`,
 };
 
-test("renderCall shows title + muted arg", () => {
+test("renderCall shows title + dim arg", () => {
 	const stub = stubComponent();
 	const rc = makeRenderCall<{ url: string }>("fetch", (a) => a.url);
 	rc({ url: "https://x.com" }, theme, context(stub));
-	// Only the tool name is accent/toolTitle-colored; the arg is muted so the
-	// header doesn't render as one solid blue line (accent === toolTitle).
-	expect(stub.get()).toBe("[toolTitle]*fetch* [muted]https://x.com");
+	// Only the tool name is accent/toolTitle-colored; the arg is secondary.
+	expect(stub.get()).toBe("[toolTitle]*fetch* [dim]https://x.com");
 });
 
 test("renderCall hides only an effectively collapsed call row", () => {
@@ -56,7 +55,7 @@ test("renderCall hides only an effectively collapsed call row", () => {
 		theme,
 		context(stub, { state: { collapsed: true }, expanded: true }),
 	);
-	expect(stub.get()).toBe("[toolTitle]*fetch* [muted]https://x.com");
+	expect(stub.get()).toBe("[toolTitle]*fetch* [dim]https://x.com");
 });
 
 test("renderResult renders structured compact details after collapse", () => {
@@ -157,7 +156,7 @@ test("renderResult renders empty and errors without compacting", () => {
 		theme,
 		context(empty),
 	);
-	expect(empty.get()).toBe("  [dim](empty)");
+	expect(empty.get()).toBe("  [muted](empty)");
 
 	const failed = stubComponent();
 	rr(

package/src/render.ts

@@ -81,12 +81,12 @@ function dimBody(body: string, theme: Theme, expanded: boolean): string {
 	const out = shown.map((line) => `  ${theme.fg("dim", line)}`);
 	const remaining = lines.length - maxShow;
 	if (remaining > 0) {
-		out.push(`  ${theme.fg("dim", `… ${remaining} more lines`)}`);
+		out.push(`  ${theme.fg("muted", `… ${remaining} more lines`)}`);
 	}
 	return out.join("\n");
 }
 
-/** Build a `renderCall` that shows `<title> <accent arg>`. */
+/** Build a `renderCall` that shows `<title> <secondary arg>`. */
 export function makeRenderCall<TArgs>(title: string, pickArg: (args: TArgs) => string) {
 	return (args: TArgs, theme: Theme, ctx: RenderCtx): Component => {
 		const text = getText(ctx.lastComponent);
@@ -97,7 +97,7 @@ export function makeRenderCall<TArgs>(title: string, pickArg: (args: TArgs) => s
 		)
 			return text;
 		const arg = pickArg(args);
-		text.setText(`${theme.fg("toolTitle", theme.bold(title))} ${theme.fg("muted", arg)}`);
+		text.setText(`${theme.fg("toolTitle", theme.bold(title))} ${theme.fg("dim", arg)}`);
 		return text;
 	};
 }
@@ -118,7 +118,7 @@ export function makeRenderResult<TDetails>(config?: CompactRendererConfig<TDetai
 			return text;
 		}
 		if (!body.trim()) {
-			text.setText(`  ${theme.fg("dim", "(empty)")}`);
+			text.setText(`  ${theme.fg("muted", "(empty)")}`);
 			return text;
 		}