@xynogen/pix-9router 0.6.0 → 0.7.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
 

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.7.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.10.2"
 	}
 }

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";
 
 export default async function (pi: ExtensionAPI): Promise<void> {
 	await registerProvider(pi);
-	registerRouterCommand(pi);
-	registerSttCommand(pi);
-	registerTranscribe(pi);
-	registerTts(pi);
 }

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();

package/src/http.ts

@@ -1,102 +0,0 @@
-/**
- * http.ts — shared 9Router HTTP plumbing.
- *
- * auth and curl serve the transcribe/tts fallback paths and the catalog reader.
- * curl differs only by timeout (audio needs longer) and stdin body, so both are
- * parameters with the old per-file defaults.
- */
-
-import { readFileSync } from "node:fs";
-import { basename } from "node:path";
-import { ioTimeoutMs } from "@xynogen/pix-runtime/io";
-
-export function auth(): string | undefined {
-	return process.env.NINEROUTER_KEY || process.env.ROUTER_API_KEY;
-}
-
-export interface CurlOptions {
-	/** Request timeout in ms (default ioTimeoutMs()). */
-	timeoutMs?: number;
-	/** Optional request body (was piped to curl stdin). */
-	stdin?: string;
-}
-
-// ponytail: this is NOT a general curl shim — it parses only the flag forms the
-// three fallback call sites actually pass (-L, -X, -H, -d, -F key=value /
-// file=@path, plus the -sS/--connect-timeout/--max-time defaults added below).
-// New curl flags won't work here; extend the parser or call fetch directly.
-function curlArgsToRequest(args: string[]): { url: string; init: RequestInit } {
-	const headers = new Headers();
-	let method = "GET";
-	let body: string | undefined;
-	let form: FormData | undefined;
-	let url = "";
-	for (let i = 0; i < args.length; i++) {
-		const a = args[i] ?? "";
-		switch (a) {
-			case "-sS":
-			case "-L":
-				break; // silent / follow-redirects are fetch defaults
-			case "--connect-timeout":
-			case "--max-time":
-				i++; // value handled by AbortSignal below
-				break;
-			case "-X":
-				method = args[++i] ?? method;
-				break;
-			case "-H": {
-				const h = args[++i] ?? "";
-				const idx = h.indexOf(":");
-				if (idx >= 0) headers.set(h.slice(0, idx).trim(), h.slice(idx + 1).trim());
-				break;
-			}
-			case "-d":
-				body = args[++i] ?? "";
-				break;
-			case "-F": {
-				form ??= new FormData();
-				const field = args[++i] ?? "";
-				const eq = field.indexOf("=");
-				const key = field.slice(0, eq);
-				const val = field.slice(eq + 1);
-				if (val.startsWith("@")) {
-					const path = val.slice(1);
-					form.set(key, new Blob([readFileSync(path)]), basename(path));
-				} else {
-					form.set(key, val);
-				}
-				break;
-			}
-			default:
-				if (!a.startsWith("-")) url = a; // positional = URL
-		}
-	}
-	const init: RequestInit = { method };
-	if (form)
-		init.body = form; // let fetch set the multipart boundary
-	else if (body !== undefined) init.body = body;
-	if ([...headers.keys()].length > 0) init.headers = headers;
-	return { url, init };
-}
-
-/** Raw fetch fallback (curl-signature compatible), rejecting on non-2xx or timeout. */
-export async function curl(args: string[], opts: CurlOptions = {}): Promise<string> {
-	const timeoutMs = opts.timeoutMs ?? ioTimeoutMs();
-	const { url, init } = curlArgsToRequest(args);
-	if (opts.stdin !== undefined) init.body = opts.stdin;
-	init.signal = AbortSignal.timeout(timeoutMs);
-	let res: Response;
-	try {
-		res = await fetch(url, init);
-	} catch (err) {
-		if (err instanceof DOMException && err.name === "TimeoutError") {
-			throw new Error("curl timed out");
-		}
-		throw new Error(`curl failed: ${err instanceof Error ? err.message : String(err)}`);
-	}
-	if (!res.ok) {
-		const errText = await res.text().catch(() => "");
-		throw new Error(`curl exit ${res.status}: ${errText.slice(0, 300)}`);
-	}
-	return res.text();
-}

package/src/recorder.ts

@@ -1,103 +0,0 @@
-import { spawn } from "node:child_process";
-import { randomUUID } from "node:crypto";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-import { findExecutableSync } from "@xynogen/pix-runtime/which";
-
-export function parsePulseSources(output: string): string[] {
-	return output
-		.split("\n")
-		.map((line) => line.split("\t")[1]?.trim())
-		.filter((name): name is string => Boolean(name));
-}
-
-export function parseRmsDb(output: string): number | undefined {
-	const matches = [
-		...output.matchAll(/(?:RMS level dB:\s*|lavfi\.astats\.Overall\.RMS_level=)(-?\d+(?:\.\d+)?)/g),
-	];
-	const value = matches.at(-1)?.[1];
-	return value === undefined ? undefined : Number(value);
-}
-
-export function ffmpegRecordArgs(device: string, output: string): string[] {
-	return [
-		"-hide_banner",
-		"-loglevel",
-		"info",
-		"-f",
-		"pulse",
-		"-i",
-		device,
-		"-ac",
-		"1",
-		"-ar",
-		"16000",
-		"-af",
-		"astats=metadata=1:reset=1,ametadata=print:key=lavfi.astats.Overall.RMS_level",
-		"-y",
-		output,
-	];
-}
-
-function run(command: string, args: string[]): Promise<string> {
-	return new Promise((resolve, reject) => {
-		const child = spawn(command, args, { stdio: ["ignore", "pipe", "pipe"] });
-		let stdout = "";
-		let stderr = "";
-		child.stdout.on("data", (data) => (stdout += String(data)));
-		child.stderr.on("data", (data) => (stderr += String(data)));
-		child.once("error", reject);
-		child.once("exit", (code) =>
-			code === 0
-				? resolve(stdout)
-				: reject(new Error(stderr.trim() || `${command} exited ${code}`)),
-		);
-	});
-}
-
-export async function microphoneDevices(): Promise<string[]> {
-	const pactl = findExecutableSync("pactl");
-	if (!pactl) return ["default"];
-	const names = parsePulseSources(await run(pactl, ["list", "short", "sources"]));
-	return [...new Set(["default", ...names])];
-}
-
-export interface Recording {
-	path: string;
-	stop(): Promise<number | undefined>;
-}
-
-export function startRecording(device: string, onLevel: (db: number) => void): Recording {
-	const ffmpeg = findExecutableSync("ffmpeg");
-	if (!ffmpeg) throw new Error("Microphone recording needs ffmpeg on PATH.");
-	const path = join(tmpdir(), `pix-stt-${randomUUID()}.wav`);
-	const child = spawn(ffmpeg, ffmpegRecordArgs(device, path), {
-		stdio: ["pipe", "ignore", "pipe"],
-	});
-	let stderr = "";
-	let lastLevel: number | undefined;
-	child.stderr.on("data", (data) => {
-		const text = String(data);
-		stderr += text;
-		const level = parseRmsDb(text);
-		if (level !== undefined) {
-			lastLevel = level;
-			onLevel(level);
-		}
-	});
-	const exit = new Promise<void>((resolve, reject) => {
-		child.once("error", reject);
-		child.once("exit", (code) =>
-			code === 0 ? resolve() : reject(new Error(stderr.trim() || `ffmpeg exited ${code}`)),
-		);
-	});
-	return {
-		path,
-		async stop() {
-			child.stdin.write("q");
-			child.stdin.end();
-			await exit;
-			return lastLevel;
-		},
-	};
-}