@xynogen/pix-9router 0.3.20 → 0.3.22

package/package.json

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

package/src/http.ts

@@ -7,7 +7,8 @@
  * so both are parameters with the old per-file defaults.
  */
 
-import { type ExecFileException, execFile } from "node:child_process";
+import { readFileSync } from "node:fs";
+import { basename } from "node:path";
 import { ioTimeoutMs, ioTimeoutSignal } from "@xynogen/pix-runtime/io";
 import { routerBaseUrl } from "./data.js";
 
@@ -44,41 +45,90 @@ export async function apiPost(
 }
 
 export interface CurlOptions {
-	/** curl --max-time in seconds (default 25). */
-	maxTime?: number;
-	/** child-process kill timeout in ms (default 30_000). */
+	/** Request timeout in ms (default ioTimeoutMs()). */
 	timeoutMs?: number;
-	/** Optional stdin body piped into curl. */
+	/** Optional request body (was piped to curl stdin). */
 	stdin?: string;
 }
 
-/** Run curl with sane defaults, rejecting on non-zero exit or timeout. */
-export function curl(args: string[], opts: CurlOptions = {}): Promise<string> {
-	const timeoutMs = opts.timeoutMs ?? ioTimeoutMs();
-	const maxTime = opts.maxTime ?? timeoutMs / 1000;
-	const { 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;
+// 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);
 				}
-				resolve(stdout);
-			},
-		);
-		if (stdin && child.stdin) {
-			child.stdin.write(stdin);
-			child.stdin.end();
+				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();
 }
 
 export function isCancelled(error: unknown, signal: AbortSignal | undefined): boolean {

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;
 		}