@xynogen/pix-9router 0.3.6 → 0.3.8

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@xynogen/pix-9router",
-	"version": "0.3.6",
+	"version": "0.3.8",
 	"description": "Pi extension — 9Router provider + fetch/search tools via router API",
 	"type": "module",
 	"main": "src/index.ts",
@@ -43,8 +43,9 @@
 		"@earendil-works/pi-tui": "*"
 	},
 	"dependencies": {
-		"@xynogen/pix-data": "^0.3.0",
+		"@xynogen/pix-data": "^0.4.0",
 		"@xynogen/pix-pretty": "^1.7.21",
-		"typebox": "^1.1.38"
+		"typebox": "^1.1.38",
+		"@xynogen/pix-runtime": "^0.2.0"
 	}
 }

package/src/data.ts

@@ -41,6 +41,12 @@ export interface RouterModel {
 	max_tokens?: number;
 	maxTokens?: number;
 	owned_by?: string;
+	/** 9router v1 API nests these inside capabilities */
+	capabilities?: {
+		contextWindow?: number;
+		maxOutput?: number;
+		[key: string]: unknown;
+	};
 }
 
 interface RouterModelsResponse {

package/src/fetch.ts

@@ -6,15 +6,12 @@
  *   ROUTER_API_KEY   — bearer token for the router
  */
 
-import { type ExecFileException, execFile } from "node:child_process";
 import { StringEnum } from "@earendil-works/pi-ai";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
-import { routerBaseUrl } from "./data.js";
+import { apiPost, curl, isCancelled } from "./http.js";
 import { makeRenderCall, makeRenderResult } from "./render.js";
 
-const REQUEST_TIMEOUT_MS = 30_000;
-
 type RouterOutcome = "running" | "fallback" | "success" | "cancelled" | "error";
 type FetchFormat = "markdown" | "text" | "html";
 
@@ -45,62 +42,6 @@ interface FetchDependencies {
 	curl: typeof curl;
 }
 
-function auth(): string | undefined {
-	return process.env.ROUTER_API_KEY;
-}
-
-async function apiPost(
-	path: string,
-	body: Record<string, unknown>,
-	signal?: AbortSignal,
-): Promise<string> {
-	const url = `${routerBaseUrl()}${path}`;
-	const key = auth();
-	const controller = new AbortController();
-	const timeout = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS);
-	const s = signal ? AbortSignal.any([signal, controller.signal]) : controller.signal;
-
-	try {
-		const res = await fetch(url, {
-			method: "POST",
-			headers: {
-				"Content-Type": "application/json",
-				...(key ? { Authorization: `Bearer ${key}` } : {}),
-			},
-			body: JSON.stringify(body),
-			signal: s,
-		});
-		if (!res.ok) {
-			const errText = await res.text().catch(() => "");
-			throw new Error(`API ${res.status}: ${errText.slice(0, 500)}`);
-		}
-		return await res.text();
-	} finally {
-		clearTimeout(timeout);
-	}
-}
-
-function curl(args: string[]): Promise<string> {
-	return new Promise((resolve, reject) => {
-		execFile(
-			"curl",
-			["-sS", "--connect-timeout", "10", "--max-time", "25", ...args],
-			{ maxBuffer: 10 * 1024 * 1024, timeout: 30_000 },
-			(err, stdout, stderr) => {
-				if (err) {
-					const e = err as ExecFileException;
-					const msg = e.killed
-						? "curl timed out"
-						: `curl exit ${e.code ?? "??"}: ${stderr.slice(0, 300)}`;
-					reject(new Error(msg));
-					return;
-				}
-				resolve(stdout);
-			},
-		);
-	});
-}
-
 /**
  * Extract readable page content from the exa fetch JSON envelope.
  * Shape: { provider, url, title, content: { format, text }, ... }
@@ -131,10 +72,6 @@ export function formatFetchResult(raw: string): string {
 	return header.length > 0 ? `${header.join("\n")}\n\n${text}` : text;
 }
 
-function isCancelled(error: unknown, signal: AbortSignal | undefined): boolean {
-	return signal?.aborted === true || (error instanceof DOMException && error.name === "AbortError");
-}
-
 export async function executeFetch(
 	params: FetchParams,
 	signal?: AbortSignal,

package/src/http.ts

@@ -0,0 +1,91 @@
+/**
+ * http.ts — shared 9Router HTTP plumbing.
+ *
+ * auth / apiPost / curl / isCancelled were duplicated across fetch.ts,
+ * search.ts and transcribe.ts. Extracted here; the only real differences were
+ * timeout values (audio needs longer) and curl stdin (search pipes a body),
+ * so both are parameters with the old per-file defaults.
+ */
+
+import { type ExecFileException, execFile } from "node:child_process";
+import { routerBaseUrl } from "./data.js";
+
+/** Default request timeout — audio transcription overrides with a longer one. */
+export const REQUEST_TIMEOUT_MS = 30_000;
+
+export function auth(): string | undefined {
+	return process.env.ROUTER_API_KEY;
+}
+
+/** POST a JSON body to a router path, returning the raw response text. */
+export async function apiPost(
+	path: string,
+	body: Record<string, unknown>,
+	signal?: AbortSignal,
+	timeoutMs: number = REQUEST_TIMEOUT_MS,
+): Promise<string> {
+	const url = `${routerBaseUrl()}${path}`;
+	const key = auth();
+	const controller = new AbortController();
+	const timeout = setTimeout(() => controller.abort(), timeoutMs);
+	const s = signal ? AbortSignal.any([signal, controller.signal]) : controller.signal;
+
+	try {
+		const res = await fetch(url, {
+			method: "POST",
+			headers: {
+				"Content-Type": "application/json",
+				...(key ? { Authorization: `Bearer ${key}` } : {}),
+			},
+			body: JSON.stringify(body),
+			signal: s,
+		});
+		if (!res.ok) {
+			const errText = await res.text().catch(() => "");
+			throw new Error(`API ${res.status}: ${errText.slice(0, 500)}`);
+		}
+		return await res.text();
+	} finally {
+		clearTimeout(timeout);
+	}
+}
+
+export interface CurlOptions {
+	/** curl --max-time in seconds (default 25). */
+	maxTime?: number;
+	/** child-process kill timeout in ms (default 30_000). */
+	timeoutMs?: number;
+	/** Optional stdin body piped into curl. */
+	stdin?: string;
+}
+
+/** Run curl with sane defaults, rejecting on non-zero exit or timeout. */
+export function curl(args: string[], opts: CurlOptions = {}): Promise<string> {
+	const { maxTime = 25, timeoutMs = 30_000, stdin } = opts;
+	return new Promise((resolve, reject) => {
+		const child = execFile(
+			"curl",
+			["-sS", "--connect-timeout", "10", "--max-time", String(maxTime), ...args],
+			{ maxBuffer: 10 * 1024 * 1024, timeout: timeoutMs },
+			(err, stdout, stderr) => {
+				if (err) {
+					const e = err as ExecFileException;
+					const msg = e.killed
+						? "curl timed out"
+						: `curl exit ${e.code ?? "??"}: ${stderr.slice(0, 300)}`;
+					reject(new Error(msg));
+					return;
+				}
+				resolve(stdout);
+			},
+		);
+		if (stdin && child.stdin) {
+			child.stdin.write(stdin);
+			child.stdin.end();
+		}
+	});
+}
+
+export function isCancelled(error: unknown, signal: AbortSignal | undefined): boolean {
+	return signal?.aborted === true || (error instanceof DOMException && error.name === "AbortError");
+}

package/src/provider.test.ts

@@ -1,48 +1,12 @@
 import { describe, expect, it } from "bun:test";
 import type { ModelsDevModel, RouterModel } from "./data.ts";
-
-// ── Re-export internal helpers for testing via module augmentation ────────────
-// provider.ts exports only the default fn; we test the pure mapping logic
-// inline here to avoid coupling tests to private internals.
-
-const DEFAULT_CONTEXT_WINDOW = 128_000;
-const DEFAULT_MAX_TOKENS = 16_384;
-
-const IMAGE_CAPABLE_PATTERNS = [/claude/i, /gpt-5/i, /gpt-4/i, /kimi-k2/i, /hy3/i];
-
-function getInputTypes(model: RouterModel, devModel?: ModelsDevModel): ("text" | "image")[] {
-	if (devModel?.modalities?.input) {
-		const inputs = devModel.modalities.input.filter(
-			(i): i is "text" | "image" => i === "text" || i === "image",
-		);
-		if (inputs.length > 0) return inputs;
-	}
-	const id = model.id ?? "";
-	if (IMAGE_CAPABLE_PATTERNS.some((p) => p.test(id))) return ["text", "image"];
-	return ["text"];
-}
-
-function getModelName(model: RouterModel, devModel?: ModelsDevModel): string {
-	return model.name || devModel?.name || model.id || "unknown";
-}
-
-function getContextWindow(model: RouterModel, devModel?: ModelsDevModel): number {
-	return (
-		model.context_window ||
-		model.contextWindow ||
-		devModel?.limit?.context ||
-		DEFAULT_CONTEXT_WINDOW
-	);
-}
-
-function getMaxTokens(model: RouterModel, devModel?: ModelsDevModel): number {
-	return model.max_tokens || model.maxTokens || devModel?.limit?.output || DEFAULT_MAX_TOKENS;
-}
-
-function getReasoning(model: RouterModel, devModel?: ModelsDevModel): boolean {
-	if (typeof devModel?.reasoning === "boolean") return devModel.reasoning;
-	return /reasoner|thinking|xhigh|high|max|pro|codex|opus|sonnet/i.test(model.id ?? "");
-}
+import {
+	getContextWindow,
+	getInputTypes,
+	getMaxTokens,
+	getModelName,
+	getReasoning,
+} from "./provider.ts";
 
 // ── getInputTypes ────────────────────────────────────────────────────────────
 
@@ -129,12 +93,37 @@ describe("getContextWindow", () => {
 		expect(getContextWindow({ id: "x", contextWindow: 64_000 })).toBe(64_000);
 	});
 
+	it("falls back to capabilities.contextWindow (9router v1 nested shape)", () => {
+		expect(getContextWindow({ id: "x", capabilities: { contextWindow: 1_000_000 } })).toBe(
+			1_000_000,
+		);
+	});
+
+	it("top-level fields beat capabilities.contextWindow", () => {
+		expect(
+			getContextWindow({
+				id: "x",
+				contextWindow: 64_000,
+				capabilities: { contextWindow: 1_000_000 },
+			}),
+		).toBe(64_000);
+	});
+
+	it("capabilities.contextWindow beats devModel.limit.context", () => {
+		expect(
+			getContextWindow(
+				{ id: "x", capabilities: { contextWindow: 1_000_000 } },
+				{ id: "x", limit: { context: 200_000 } },
+			),
+		).toBe(1_000_000);
+	});
+
 	it("falls back to devModel.limit.context", () => {
 		expect(getContextWindow({ id: "x" }, { id: "x", limit: { context: 200_000 } })).toBe(200_000);
 	});
 
 	it("falls back to DEFAULT_CONTEXT_WINDOW", () => {
-		expect(getContextWindow({ id: "x" })).toBe(DEFAULT_CONTEXT_WINDOW);
+		expect(getContextWindow({ id: "x" })).toBe(128_000);
 	});
 });
 
@@ -151,12 +140,40 @@ describe("getMaxTokens", () => {
 		expect(getMaxTokens({ id: "x", maxTokens: 8_192 })).toBe(8_192);
 	});
 
+	it("falls back to capabilities.maxOutput (9router v1 nested shape)", () => {
+		expect(getMaxTokens({ id: "x", capabilities: { maxOutput: 64_000 } })).toBe(64_000);
+	});
+
+	it("top-level fields beat capabilities.maxOutput", () => {
+		expect(getMaxTokens({ id: "x", maxTokens: 8_192, capabilities: { maxOutput: 64_000 } })).toBe(
+			8_192,
+		);
+	});
+
+	it("capabilities.maxOutput beats devModel.limit.output", () => {
+		expect(
+			getMaxTokens(
+				{ id: "x", capabilities: { maxOutput: 64_000 } },
+				{ id: "x", limit: { output: 16_000 } },
+			),
+		).toBe(64_000);
+	});
+
 	it("falls back to devModel.limit.output", () => {
 		expect(getMaxTokens({ id: "x" }, { id: "x", limit: { output: 16_000 } })).toBe(16_000);
 	});
 
 	it("falls back to DEFAULT_MAX_TOKENS", () => {
-		expect(getMaxTokens({ id: "x" })).toBe(DEFAULT_MAX_TOKENS);
+		expect(getMaxTokens({ id: "x" })).toBe(16_384);
+	});
+
+	it("handles the PR #9 regression case (qwen3-coder-flash nested capabilities)", () => {
+		const model: RouterModel = {
+			id: "alims-intl/qwen3-coder-flash-2025-07-28",
+			capabilities: { contextWindow: 1_000_000, maxOutput: 64_000 },
+		};
+		expect(getContextWindow(model)).toBe(1_000_000);
+		expect(getMaxTokens(model)).toBe(64_000);
 	});
 });
 

package/src/provider.ts

@@ -26,7 +26,7 @@ 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];
 
-function getInputTypes(model: RouterModel, devModel?: ModelsDevModel): ("text" | "image")[] {
+export function getInputTypes(model: RouterModel, devModel?: ModelsDevModel): ("text" | "image")[] {
 	if (devModel?.modalities?.input) {
 		const inputs = devModel.modalities.input.filter(
 			(i): i is "text" | "image" => i === "text" || i === "image",
@@ -38,24 +38,31 @@ function getInputTypes(model: RouterModel, devModel?: ModelsDevModel): ("text" |
 	return ["text"];
 }
 
-function getModelName(model: RouterModel, devModel?: ModelsDevModel): string {
+export function getModelName(model: RouterModel, devModel?: ModelsDevModel): string {
 	return model.name || devModel?.name || model.id || "unknown";
 }
 
-function getContextWindow(model: RouterModel, devModel?: ModelsDevModel): number {
+export function getContextWindow(model: RouterModel, devModel?: ModelsDevModel): number {
 	return (
 		model.context_window ||
 		model.contextWindow ||
+		model.capabilities?.contextWindow ||
 		devModel?.limit?.context ||
 		DEFAULT_CONTEXT_WINDOW
 	);
 }
 
-function getMaxTokens(model: RouterModel, devModel?: ModelsDevModel): number {
-	return model.max_tokens || model.maxTokens || devModel?.limit?.output || DEFAULT_MAX_TOKENS;
+export function getMaxTokens(model: RouterModel, devModel?: ModelsDevModel): number {
+	return (
+		model.max_tokens ||
+		model.maxTokens ||
+		model.capabilities?.maxOutput ||
+		devModel?.limit?.output ||
+		DEFAULT_MAX_TOKENS
+	);
 }
 
-function getReasoning(model: RouterModel, devModel?: ModelsDevModel): boolean {
+export function getReasoning(model: RouterModel, devModel?: ModelsDevModel): boolean {
 	if (typeof devModel?.reasoning === "boolean") return devModel.reasoning;
 	return /reasoner|thinking|xhigh|high|max|pro|codex|opus|sonnet/i.test(model.id ?? "");
 }

package/src/render.ts

@@ -16,12 +16,12 @@ import type {
 	ToolRenderResultOptions,
 } from "@earendil-works/pi-coding-agent";
 import type { Component } from "@earendil-works/pi-tui";
-import { type CollapseState, tickCollapse } from "@xynogen/pix-data/collapse";
 import {
 	type CollapsedToolStatus,
 	formatCollapsedToolRow,
 	hideCollapsedToolCall,
 } from "@xynogen/pix-pretty/utils";
+import { type CollapseState, tickCollapse } from "@xynogen/pix-runtime/collapse";
 
 interface TextLike extends Component {
 	setText(text: string): void;

package/src/search.ts

@@ -6,15 +6,13 @@
  *   ROUTER_API_KEY   — bearer token for the router
  */
 
-import { type ExecFileException, execFile } from "node:child_process";
 import { StringEnum } from "@earendil-works/pi-ai";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 import { routerBaseUrl } from "./data.js";
+import { apiPost, auth, curl, isCancelled } from "./http.js";
 import { makeRenderCall, makeRenderResult } from "./render.js";
 
-const REQUEST_TIMEOUT_MS = 30_000;
-
 type RouterOutcome = "running" | "fallback" | "success" | "cancelled" | "error";
 type SearchType = "web" | "news";
 
@@ -44,66 +42,6 @@ interface SearchDependencies {
 	curl: typeof curl;
 }
 
-function auth(): string | undefined {
-	return process.env.ROUTER_API_KEY;
-}
-
-async function apiPost(
-	path: string,
-	body: Record<string, unknown>,
-	signal?: AbortSignal,
-): Promise<string> {
-	const url = `${routerBaseUrl()}${path}`;
-	const key = auth();
-	const controller = new AbortController();
-	const timeout = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS);
-	const s = signal ? AbortSignal.any([signal, controller.signal]) : controller.signal;
-
-	try {
-		const res = await fetch(url, {
-			method: "POST",
-			headers: {
-				"Content-Type": "application/json",
-				...(key ? { Authorization: `Bearer ${key}` } : {}),
-			},
-			body: JSON.stringify(body),
-			signal: s,
-		});
-		if (!res.ok) {
-			const errText = await res.text().catch(() => "");
-			throw new Error(`API ${res.status}: ${errText.slice(0, 500)}`);
-		}
-		return await res.text();
-	} finally {
-		clearTimeout(timeout);
-	}
-}
-
-function curl(args: string[], stdin?: string): Promise<string> {
-	return new Promise((resolve, reject) => {
-		const child = execFile(
-			"curl",
-			["-sS", "--connect-timeout", "10", "--max-time", "25", ...args],
-			{ maxBuffer: 10 * 1024 * 1024, timeout: 30_000 },
-			(err, stdout, stderr) => {
-				if (err) {
-					const e = err as ExecFileException;
-					const msg = e.killed
-						? "curl timed out"
-						: `curl exit ${e.code ?? "??"}: ${stderr.slice(0, 300)}`;
-					reject(new Error(msg));
-					return;
-				}
-				resolve(stdout);
-			},
-		);
-		if (stdin && child.stdin) {
-			child.stdin.write(stdin);
-			child.stdin.end();
-		}
-	});
-}
-
 interface SearchResultItem {
 	title?: string | null;
 	url?: string | null;
@@ -156,10 +94,6 @@ export function formatSearchResults(raw: string): string {
 	return parseSearchResults(raw).text;
 }
 
-function isCancelled(error: unknown, signal: AbortSignal | undefined): boolean {
-	return signal?.aborted === true || (error instanceof DOMException && error.name === "AbortError");
-}
-
 export async function executeSearch(
 	params: SearchParams,
 	signal?: AbortSignal,

package/src/transcribe.ts

@@ -11,7 +11,6 @@
  *   ROUTER_API_KEY   — bearer token for the router
  */
 
-import { type ExecFileException, execFile } from "node:child_process";
 import { constants as fsConstants } from "node:fs";
 import { access, lstat, mkdir, readFile, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
@@ -19,6 +18,7 @@ import { basename, dirname, extname, isAbsolute, resolve } from "node:path";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 import { routerBaseUrl } from "./data.js";
+import { auth, curl } from "./http.js";
 import { makeRenderCall, makeRenderResult } from "./render.js";
 
 const REQUEST_TIMEOUT_MS = 120_000; // audio transcription can take longer
@@ -46,10 +46,6 @@ interface TranscribeResult {
 	isError?: boolean;
 }
 
-function auth(): string | undefined {
-	return process.env.ROUTER_API_KEY;
-}
-
 /** Map file extension to MIME type for common audio formats. */
 export function mimeType(filePath: string): string {
 	const ext = extname(filePath).toLowerCase();
@@ -106,27 +102,6 @@ async function apiMultipart(
 	}
 }
 
-function curl(args: string[]): Promise<string> {
-	return new Promise((resolve, reject) => {
-		execFile(
-			"curl",
-			["-sS", "--connect-timeout", "10", "--max-time", "120", ...args],
-			{ maxBuffer: 10 * 1024 * 1024, timeout: REQUEST_TIMEOUT_MS },
-			(err, stdout, stderr) => {
-				if (err) {
-					const e = err as ExecFileException;
-					const msg = e.killed
-						? "curl timed out"
-						: `curl exit ${e.code ?? "??"}: ${stderr.slice(0, 300)}`;
-					reject(new Error(msg));
-					return;
-				}
-				resolve(stdout);
-			},
-		);
-	});
-}
-
 /** Extract the `text` field from a JSON envelope, or return the raw string. */
 export function parseTranscriptionResponse(raw: string): string {
 	try {
@@ -473,7 +448,7 @@ export default function registerTranscribe(pi: ExtensionAPI): void {
 					`${routerBaseUrl()}/audio/transcriptions`,
 				];
 
-				const raw = await curl(curlArgs);
+				const raw = await curl(curlArgs, { maxTime: 120, timeoutMs: REQUEST_TIMEOUT_MS });
 				return await run("curl-fallback", raw);
 			} catch (curlErr: unknown) {
 				const curlMsg = curlErr instanceof Error ? curlErr.message : String(curlErr);