@xynogen/pix-9router 0.6.0 → 0.8.0

package/README.md

@@ -1,37 +1,13 @@
 # pix-9router
 
-Pi extension with a 9Router model provider, speech-to-text, and text-to-speech tools.
+Pi extension with a 9Router model provider.
 
-## Tools
+Other 9Router features live in separate packages. Each one reuses
+`NINEROUTER_URL` and `NINEROUTER_KEY`:
 
-| Tool | Default controlled by `/9router` |
-|---|---|
-| `transcribe` | STT model |
-| `tts` | TTS model or voice, plus automatic playback |
-
-Tool arguments override saved defaults. Tool calls never fetch the model catalog.
-The `/9router` menu fetches live models or voices only when you open a setting,
-then saves the choice in `~/.pi/agent/9router.json`.
-
-## Settings
-
-Run:
-
-```text
-/9router
-```
-
-The menu controls:
-
-- STT model
-- TTS model or voice
-- TTS playback (`on` by default)
-
-Catalogs come from `/v1/models/stt` and `/v1/models/tts`.
-
-Web search and fetch moved to `@xynogen/pix-web`. Its `/search` and `/fetch`
-commands include a 9Router provider that reuses `NINEROUTER_URL` and
-`NINEROUTER_KEY`.
+- Speech tools (`transcribe`, `speak`, `/stt`) moved to `@xynogen/pix-voice` in
+  0.7.0. Pick `9router` as the provider in its `/voice` command.
+- Web search and fetch live in `@xynogen/pix-web`.
 
 ## Environment
 
@@ -57,8 +33,22 @@ The standard names win when both sets exist.
 pi install npm:@xynogen/pix-9router
 ```
 
-This package is standalone and opt-in. It is not bundled by `@xynogen/pix-core`.
+> Standalone and opt-in. [`@xynogen/pix-core`](https://www.npmjs.com/package/@xynogen/pix-core) does not bundle it. It needs a 9Router API key.
+
+## Full distro
+
+This package is part of [Pix](https://github.com/xynogen/pix-mono). The installer sets up Pi and the full distro. See [Install](https://github.com/xynogen/pix-mono#install) for the notes for each OS.
+
+```bash
+# Linux / macOS
+curl -fsSL https://raw.githubusercontent.com/xynogen/pix-mono/main/scripts/install.sh | sh
+```
+
+```powershell
+# Windows
+irm https://raw.githubusercontent.com/xynogen/pix-mono/main/scripts/install.ps1 | iex
+```
 
 ## License
 
-MIT
+MIT. See [LICENSE](LICENSE).

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@xynogen/pix-9router",
-	"version": "0.6.0",
-	"description": "Pi extension — 9Router model provider plus audio tools",
+	"version": "0.8.0",
+	"description": "Pi extension — 9Router model provider",
 	"type": "module",
 	"main": "src/index.ts",
 	"scripts": {
@@ -44,8 +44,7 @@
 		"@earendil-works/pi-tui": "*"
 	},
 	"dependencies": {
-		"@xynogen/pix-pretty": "^1.25.0",
-		"typebox": "^1.1.38",
-		"@xynogen/pix-runtime": "^0.10.1"
+		"@xynogen/pix-data": "^0.5.1",
+		"@xynogen/pix-runtime": "^0.12.0"
 	}
 }

package/src/data.ts

@@ -17,20 +17,20 @@
  */
 
 import { join } from "node:path";
-import { CACHE_DIR, DataSource } from "../../pix-data/src/index.ts";
+import { CACHE_DIR, DataSource } from "@xynogen/pix-data";
 
 export type {
 	ModelGrepModel,
 	ModelsDevApi,
 	ModelsDevModel,
-} from "../../pix-data/src/index.ts";
+} from "@xynogen/pix-data";
 // Re-export the shared models.dev API so existing consumers (provider.ts)
 // can keep importing these names from "./data".
 export {
 	buildModelsDevIndex,
 	fetchModelsDevIndex,
 	lookupInIndex,
-} from "../../pix-data/src/index.ts";
+} from "@xynogen/pix-data";
 
 // ── Types ─────────────────────────────────────────────────────────────────────
 

package/src/index.ts

@@ -1,10 +1,9 @@
 /**
- * pix-9router — Pi extension bundle
+ * pix-9router — Pi extension
  *
- * Registers:
- *   - 9router provider  (model list from self-hosted router API)
- *   - transcribe tool   (speech-to-text via audio transcription API)
- *   - tts tool          (text-to-speech via audio speech API)
+ * Registers the 9router model provider (model list from the self-hosted router API).
+ * Speech tools moved to @xynogen/pix-voice. Web search and fetch live in
+ * @xynogen/pix-web. Both reuse the same 9Router environment variables.
  *
  * Environment:
  *   NINEROUTER_URL   — canonical base URL
@@ -13,16 +12,8 @@
  */
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import registerRouterCommand from "./command.js";
-import registerProvider from "./provider.js";
-import registerSttCommand from "./stt-command.js";
-import registerTranscribe from "./transcribe.js";
-import registerTts from "./tts.js";
+import registerProvider from "./provider.ts";
 
 export default async function (pi: ExtensionAPI): Promise<void> {
 	await registerProvider(pi);
-	registerRouterCommand(pi);
-	registerSttCommand(pi);
-	registerTranscribe(pi);
-	registerTts(pi);
 }

package/src/provider.ts

@@ -9,11 +9,11 @@
  *   ROUTER_API_KEY   — bearer token (required for live model list)
  */
 
-import type { RefreshModelsContext } from "@earendil-works/pi-ai";
+import type { ClassifierResult, RefreshModelsContext } from "@earendil-works/pi-ai";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { ioTimeoutSignal } from "@xynogen/pix-runtime/io";
-import type { ModelsDevModel, RouterModel } from "./data.js";
-import { fetchModelsDevIndex, lookupInIndex, routerBaseUrl, routerModels } from "./data.js";
+import type { ModelsDevModel, RouterModel } from "./data.ts";
+import { fetchModelsDevIndex, lookupInIndex, routerBaseUrl, routerModels } from "./data.ts";
 
 const DEFAULT_CONTEXT_WINDOW = 128_000;
 const DEFAULT_MAX_TOKENS = 16_384;
@@ -28,6 +28,28 @@ 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];
 
+/** Known patterns for classifier models (System One protocol) */
+export const CLASSIFIER_PATTERNS = [
+	/\bjev\b/i,
+	/\bspan\b/i,
+	/\bsolar-decide\b/i,
+	/\bclassifier\b/i,
+];
+
+export function isClassifierModel(model: RouterModel): boolean {
+	const id = model.id ?? "";
+	const name = model.name ?? "";
+	const custom = (process.env.NINEROUTER_CLASSIFIER_MODELS || "")
+		.split(",")
+		.map((s) => s.trim().toLowerCase())
+		.filter(Boolean);
+
+	if (custom.some((c) => id.toLowerCase().includes(c) || name.toLowerCase().includes(c))) {
+		return true;
+	}
+	return CLASSIFIER_PATTERNS.some((p) => p.test(id) || p.test(name));
+}
+
 interface RouterModelsResponse {
 	data?: RouterModel[];
 }
@@ -38,10 +60,24 @@ const COMPAT = {
 	maxTokensField: "max_tokens",
 } as const;
 
-function toModelConfig(devIndex: Map<string, ModelsDevModel>) {
+export function toModelConfig(devIndex: Map<string, ModelsDevModel>) {
 	return (model: RouterModel) => {
 		const id = model.id ?? "";
 		const devModel = lookupInIndex(id, devIndex);
+
+		if (isClassifierModel(model)) {
+			return {
+				type: "classifier" as const,
+				id,
+				name: getModelName(model, devModel),
+				api: "typesafe-system-one",
+				baseUrl: routerBaseUrl(),
+				input: ["text" as const],
+				cost: ZERO_COST,
+				contextWindow: getContextWindow(model, devModel),
+			};
+		}
+
 		return {
 			id,
 			name: getModelName(model, devModel),
@@ -129,6 +165,109 @@ export default async function registerProvider(pi: ExtensionAPI): Promise<void>
 		.catch(() => {});
 }
 
+export async function classifySystemOne(
+	model: { id: string; baseUrl?: string; api?: string; provider?: string },
+	context: { state: Record<string, unknown>; questions: Record<string, any> },
+	apiKey: string,
+	options?: { signal?: AbortSignal; headers?: Record<string, string> },
+): Promise<ClassifierResult> {
+	const output = {
+		api: model.api ?? "typesafe-system-one",
+		provider: model.provider ?? "9router",
+		model: model.id,
+		answers: {} as Record<string, any>,
+		stopReason: "stop" as const,
+		timestamp: Date.now(),
+	};
+
+	try {
+		const wireQuestions = Object.fromEntries(
+			Object.entries(context.questions ?? {}).map(([key, q]) => [
+				key,
+				q.type === "bool" ? { ...q, type: "noul" } : q,
+			]),
+		);
+
+		const base = (model.baseUrl || routerBaseUrl()).replace(/\/+$/, "");
+		const url = `${base}/systemone`;
+		const res = await fetch(url, {
+			method: "POST",
+			signal: ioTimeoutSignal(options?.signal),
+			headers: {
+				Authorization: `Bearer ${apiKey}`,
+				"Content-Type": "application/json",
+				"User-Agent": "pi-coding-agent",
+				...(options?.headers ?? {}),
+			},
+			body: JSON.stringify({
+				model: model.id,
+				state: context.state,
+				questions: wireQuestions,
+			}),
+		});
+
+		if (!res.ok) {
+			const errText = await res.text().catch(() => "");
+			return {
+				...output,
+				stopReason: "error" as const,
+				errorMessage: `9router /systemone returned ${res.status}: ${errText}`,
+			};
+		}
+
+		const data = (await res.json()) as any;
+		const answers: Record<string, any> = {};
+
+		for (const [key, q] of Object.entries(context.questions ?? {})) {
+			const ans = data?.answers?.[key];
+			if (!ans) continue;
+			if (q.type === "bool") {
+				answers[key] = {
+					type: "bool",
+					probability: typeof ans.noul === "number" ? ans.noul : (ans.probability ?? 0),
+				};
+			} else if (q.type === "choice") {
+				answers[key] = {
+					type: "choice",
+					choice: ans.choice,
+					probabilities: ans.probabilities ?? {},
+					confidence: ans.confidence ?? 0,
+				};
+			} else if (q.type === "score") {
+				answers[key] = {
+					type: "score",
+					score: ans.score ?? 0,
+					confidence: ans.confidence ?? 0,
+				};
+			} else {
+				answers[key] = ans;
+			}
+		}
+
+		const inputTokens = data?.usage?.input_tokens ?? 0;
+		const outputTokens = data?.usage?.output_tokens ?? 0;
+
+		return {
+			...output,
+			answers,
+			usage: {
+				input: inputTokens,
+				output: outputTokens,
+				cacheRead: 0,
+				cacheWrite: 0,
+				totalTokens: inputTokens + outputTokens,
+				cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },
+			},
+		};
+	} catch (error) {
+		return {
+			...output,
+			stopReason: "error" as const,
+			errorMessage: error instanceof Error ? error.message : String(error),
+		};
+	}
+}
+
 function providerConfig(
 	apiKey: string,
 	models: RouterModel[],
@@ -141,6 +280,15 @@ function providerConfig(
 		api: "openai-completions",
 		headers: { "User-Agent": "pi-coding-agent" },
 		models: models.map(toModelConfig(devIndex)),
+		classifiers: {
+			"typesafe-system-one": {
+				classify: (
+					model: Parameters<typeof classifySystemOne>[0],
+					context: Parameters<typeof classifySystemOne>[1],
+					options?: Parameters<typeof classifySystemOne>[3],
+				) => classifySystemOne(model, context, apiKey, options),
+			},
+		},
 		// 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

package/src/catalog.ts

@@ -1,45 +0,0 @@
-import { routerBaseUrl } from "./data.js";
-import { auth } from "./http.js";
-
-interface CatalogItem {
-	id?: string;
-	kind?: string;
-	model?: string;
-	name?: string;
-}
-
-async function get(path: string): Promise<unknown> {
-	const key = auth();
-	const response = await fetch(`${routerBaseUrl()}${path}`, {
-		headers: key ? { Authorization: `Bearer ${key}` } : undefined,
-	});
-	if (!response.ok) throw new Error(`9Router catalog ${response.status}`);
-	return response.json();
-}
-
-function items(value: unknown): CatalogItem[] {
-	if (!value || typeof value !== "object") return [];
-	const data = (value as { data?: unknown }).data;
-	return Array.isArray(data) ? (data as CatalogItem[]) : [];
-}
-
-export async function catalogModels(kind: "stt" | "tts"): Promise<string[]> {
-	return items(await get(`/models/${kind}`)).flatMap((item) => (item.id ? [item.id] : []));
-}
-
-export interface VoiceChoice {
-	id: string;
-	language: string;
-	provider: string;
-}
-
-export function groupVoice(id: string): VoiceChoice {
-	const [provider = "other", ...rest] = id.split("/");
-	const voice = rest.join("/") || provider;
-	const locale = voice.match(/(?:^|[^A-Za-z])([a-z]{2,3})[-_]([A-Z]{2})(?:[^A-Za-z]|$)/);
-	return { id, language: locale ? `${locale[1]}-${locale[2]}` : "Other", provider };
-}
-
-export async function catalogVoices(): Promise<VoiceChoice[]> {
-	return (await catalogModels("tts")).map(groupVoice);
-}

package/src/command.ts

@@ -1,212 +0,0 @@
-import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { Key, matchesKey, type SelectItem, SelectList } from "@earendil-works/pi-tui";
-import { icon } from "@xynogen/pix-pretty/icon-catalog";
-import {
-	frameModal,
-	MIN_MODAL_HEIGHT,
-	ModalPager,
-	modalOverlayOptions,
-	modalWidth,
-	selectListTheme,
-	terminalModalHeight,
-} from "@xynogen/pix-pretty/modal-frame";
-import { catalogModels, catalogVoices } from "./catalog.js";
-import { routerDefaults, saveDefaults } from "./defaults.js";
-
-async function pick(
-	ctx: ExtensionContext,
-	title: string,
-	values: string[],
-	current?: string,
-): Promise<string | undefined> {
-	const items: SelectItem[] = [...new Set(current ? [current, ...values] : values)].map(
-		(value) => ({
-			value,
-			label: value,
-			description: value === current ? "current" : undefined,
-		}),
-	);
-	if (items.length === 0) return undefined;
-
-	return (
-		(await ctx.ui.custom<string | null>(
-			(tui, theme, _keybindings, done) => {
-				const list = new SelectList(items, items.length, selectListTheme(theme));
-				const currentIndex = items.findIndex((item) => item.value === current);
-				if (currentIndex >= 0) list.setSelectedIndex(currentIndex);
-				list.onSelect = (item) => done(item.value);
-				list.onCancel = () => done(null);
-				const pager = new ModalPager();
-
-				return {
-					render(width: number) {
-						const result = frameModal({
-							width: modalWidth(width),
-							maxHeight: terminalModalHeight(tui.terminal?.rows),
-							minHeight: MIN_MODAL_HEIGHT,
-							header: [theme.fg("accent", theme.bold(title)), ""],
-							body: list.render(modalWidth(width) - 4),
-							bodyOffset: pager.bodyOffset,
-							footer: ["", theme.fg("muted", "↑↓ navigate · enter select · esc cancel")],
-							color: (text) => theme.fg("accent", text),
-							bg: (text) => theme.bg("customMessageBg", text),
-							fg: (text) => theme.fg("text", text),
-						});
-						pager.sync(result);
-						return result.lines;
-					},
-					invalidate: () => list.invalidate(),
-					handleInput(data: string) {
-						if (pager.handleInput(data, undefined, true)) tui.requestRender();
-						else if (matchesKey(data, "escape")) done(null);
-						else list.handleInput(data);
-					},
-				};
-			},
-			{ overlay: true, overlayOptions: modalOverlayOptions() },
-		)) ?? undefined
-	);
-}
-
-interface SettingRow {
-	key: string;
-	section: string;
-	label: string;
-	value: string;
-}
-
-async function pickSetting(ctx: ExtensionContext, rows: SettingRow[]): Promise<string | undefined> {
-	return (
-		(await ctx.ui.custom<string | null>(
-			(tui, theme, keybindings, done) => {
-				let selected = 0;
-				const move = (direction: -1 | 1) => {
-					selected = (selected + direction + rows.length) % rows.length;
-				};
-				return {
-					render(width: number) {
-						const labelWidth = Math.max(...rows.map((row) => row.label.length));
-						const body: string[] = [];
-						const rowLines: number[] = [];
-						let section = "";
-						for (let index = 0; index < rows.length; index++) {
-							const row = rows[index];
-							if (!row) continue;
-							if (row.section !== section) {
-								if (section) body.push("");
-								body.push(theme.fg("dim", `  ${row.section}`));
-								section = row.section;
-							}
-							const active = index === selected;
-							rowLines[index] = body.length;
-							body.push(
-								`${active ? theme.fg("accent", "→") : " "} ${theme.fg(active ? "accent" : "text", row.label.padEnd(labelWidth))}  ${theme.fg("success", row.value)}`,
-							);
-						}
-						const result = frameModal({
-							width: modalWidth(width),
-							maxHeight: terminalModalHeight(tui.terminal?.rows),
-							minHeight: MIN_MODAL_HEIGHT,
-							title: `${icon("settings")} 9Router Settings`,
-							titleColor: (text) => theme.fg("accent", theme.bold(text)),
-							header: [""],
-							body,
-							footer: ["", theme.fg("muted", "↑↓ move · enter change · esc close")],
-							selectedBodyLine: rowLines[selected],
-							color: (text) => theme.fg("accent", text),
-							bg: (text) => theme.bg("customMessageBg", text),
-						});
-						return result.lines;
-					},
-					invalidate: () => {},
-					handleInput(data: string) {
-						if (keybindings.matches(data, "tui.select.cancel")) done(null);
-						else if (keybindings.matches(data, "tui.select.up")) move(-1);
-						else if (keybindings.matches(data, "tui.select.down")) move(1);
-						else if (matchesKey(data, "enter")) done(rows[selected]?.key ?? null);
-						else if (matchesKey(data, Key.left) || matchesKey(data, Key.right))
-							done(rows[selected]?.key ?? null);
-						else return;
-						tui.requestRender();
-					},
-				};
-			},
-			{ overlay: true, overlayOptions: modalOverlayOptions() },
-		)) ?? undefined
-	);
-}
-
-async function choose(
-	ctx: ExtensionContext,
-	title: string,
-	current: string,
-	load: () => Promise<string[]>,
-): Promise<string | undefined> {
-	return pick(ctx, `${title} · current: ${current}`, await load(), current);
-}
-
-export default function registerRouterCommand(pi: ExtensionAPI): void {
-	pi.registerCommand("9router", {
-		description: "Set default models, voice, and TTS playback",
-		handler: async (_args, ctx) => {
-			while (true) {
-				const setting = await pickSetting(ctx, [
-					{ key: "stt", section: "Audio", label: "STT model", value: routerDefaults.sttModel },
-					{
-						key: "tts",
-						section: "Audio",
-						label: "TTS voice",
-						value: routerDefaults.ttsModel,
-					},
-					{
-						key: "playback",
-						section: "Audio",
-						label: "play after generation",
-						value: routerDefaults.ttsPlay ? "on" : "off",
-					},
-				]);
-				if (!setting) return;
-
-				try {
-					let value: string | undefined;
-					if (setting === "stt") {
-						value = await choose(ctx, "STT model", routerDefaults.sttModel, () =>
-							catalogModels("stt"),
-						);
-						if (value) routerDefaults.sttModel = value;
-					} else if (setting === "tts") {
-						const voices = await catalogVoices();
-						const language = await pick(
-							ctx,
-							"TTS · 1/3 · language",
-							[...new Set(voices.map((voice) => voice.language))].sort(),
-						);
-						if (!language) continue;
-						const languageVoices = voices.filter((voice) => voice.language === language);
-						const provider = await pick(
-							ctx,
-							`TTS · 2/3 · ${language} · provider`,
-							[...new Set(languageVoices.map((voice) => voice.provider))].sort(),
-						);
-						if (!provider) continue;
-						value = await pick(
-							ctx,
-							`TTS · 3/3 · ${language} · ${provider}`,
-							languageVoices
-								.filter((voice) => voice.provider === provider)
-								.map((voice) => voice.id),
-							routerDefaults.ttsModel,
-						);
-						if (value) routerDefaults.ttsModel = value;
-					} else if (setting === "playback") {
-						value = await pick(ctx, "Play generated speech by default", ["on", "off"]);
-						if (value) routerDefaults.ttsPlay = value === "on";
-					}
-					if (value) saveDefaults(routerDefaults);
-				} catch (error) {
-					ctx.ui.notify(error instanceof Error ? error.message : String(error), "error");
-				}
-			}
-		},
-	});
-}

package/src/defaults.ts

@@ -1,44 +0,0 @@
-import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { homedir } from "node:os";
-import { dirname, join } from "node:path";
-
-export interface RouterDefaults {
-	sttModel: string;
-	ttsModel: string;
-	ttsPlay: boolean;
-	sttDevice: string;
-}
-
-export const DEFAULTS_PATH = join(homedir(), ".pi", "agent", "9router.json");
-
-const FALLBACK: RouterDefaults = {
-	sttModel: "dg/nova-3",
-	ttsModel: "edge-tts/en-US-AriaNeural",
-	ttsPlay: true,
-	sttDevice: "default",
-};
-
-export function loadDefaults(path = DEFAULTS_PATH): RouterDefaults {
-	let value: unknown;
-	try {
-		value = JSON.parse(readFileSync(path, "utf8"));
-	} catch {
-		return { ...FALLBACK };
-	}
-	if (!value || typeof value !== "object") return { ...FALLBACK };
-	const item = value as Record<string, unknown>;
-	return {
-		sttModel: typeof item.sttModel === "string" ? item.sttModel : FALLBACK.sttModel,
-		ttsModel: typeof item.ttsModel === "string" ? item.ttsModel : FALLBACK.ttsModel,
-		ttsPlay: typeof item.ttsPlay === "boolean" ? item.ttsPlay : FALLBACK.ttsPlay,
-		sttDevice: typeof item.sttDevice === "string" ? item.sttDevice : FALLBACK.sttDevice,
-	};
-}
-
-export function saveDefaults(defaults: RouterDefaults, path = DEFAULTS_PATH): void {
-	mkdirSync(dirname(path), { recursive: true });
-	writeFileSync(path, `${JSON.stringify(defaults, null, 2)}\n`, { mode: 0o600 });
-}
-
-/** Shared in-memory defaults. Tool calls never fetch the catalog. */
-export const routerDefaults = loadDefaults();