@valni/cli-darwin-x64 0.1.5 → 0.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@valni/cli-darwin-x64",
-	"version": "0.1.5",
+	"version": "0.1.6",
 	"license": "SEE LICENSE IN LICENSE",
 	"publishConfig": {
 		"access": "public"

package/runtime/extensions/pi-switchboard/extensions/switchboard/catalog.ts

@@ -48,13 +48,11 @@ export async function loadRegistryModels(): Promise<Record<string, RegistryModel
 	const distDirectory = findPiAiDist();
 	const registry: Record<string, RegistryModel> = {};
 	if (distDirectory === undefined) {
-		const names = AI_PACKAGES.map(([scope, name]) => `${scope}/${name}`).join(" or ");
-		console.error(
-			`pi-switchboard: no ${names} beside the host executable, so models list without a context window or display name.`,
-		);
+		// The catalog supplies the context window and the display name, and a
+		// genuinely missing context window is reported precisely in
+		// buildModelConfigs. The registry is only a source of last resort.
 		return registry;
 	}
-	const missing: string[] = [];
 	for (const file of REGISTRY_FILES) {
 		let loaded: Record<string, Record<string, RegistryModel>>;
 		try {
@@ -63,10 +61,9 @@ export async function loadRegistryModels(): Promise<Record<string, RegistryModel
 				Record<string, RegistryModel>
 			>;
 		} catch (error) {
-			if (isModuleNotFound(error)) {
-				missing.push(file);
-				continue;
-			}
+			// A registry file that is not there is not a problem: everything a
+			// user sees first comes from the catalog.
+			if (isModuleNotFound(error)) continue;
 			throw error;
 		}
 		for (const exported of Object.values(loaded)) {
@@ -76,11 +73,6 @@ export async function loadRegistryModels(): Promise<Record<string, RegistryModel
 			}
 		}
 	}
-	if (missing.length === REGISTRY_FILES.length) {
-		console.error(
-			`pi-switchboard: no model registry in ${distDirectory}/providers (${missing.join(", ")}). Models will list without a context window or display name.`,
-		);
-	}
 	return registry;
 }
 
@@ -109,10 +101,11 @@ function toModelConfig(
 	price: ModelRecordPrice | undefined,
 	registryModel: RegistryModel | undefined,
 	catalogContextWindow: number | undefined,
+	catalogDisplayName: string | undefined,
 ) {
 	return {
 		id: record.id,
-		name: registryModel?.name ?? record.id,
+		name: catalogDisplayName ?? registryModel?.name ?? record.id,
 		api: KIND_TO_API[kindTag],
 		baseUrl: `${resolveBaseUrl()}${SENTINEL_SEGMENT}${kindTag}`,
 		reasoning: supportsReasoning(kindTag, profile) ?? registryModel?.reasoning ?? false,
@@ -127,12 +120,13 @@ function toModelConfig(
 	};
 }
 
-export async function discoverCatalog(baseUrl: string, bearer: string): Promise<ModelsPage> {
+export async function discoverCatalog(baseUrl: string, bearer: string, signal?: AbortSignal): Promise<ModelsPage> {
+	const timeout = AbortSignal.timeout(CATALOG_FETCH_TIMEOUT_MS);
 	let response: Response;
 	try {
 		response = await fetch(`${baseUrl}${MODELS_PATH}`, {
 			headers: { Authorization: `Bearer ${bearer}` },
-			signal: AbortSignal.timeout(CATALOG_FETCH_TIMEOUT_MS),
+			signal: signal ? AbortSignal.any([signal, timeout]) : timeout,
 		});
 	} catch (error) {
 		if (isAbortError(error)) throw error;
@@ -168,7 +162,15 @@ export function buildModelConfigs(catalog: ModelsPage, registry: Record<string,
 		const catalogContextWindow = catalog.context_windows?.[record.id];
 		if (catalogContextWindow === undefined && registry[record.id]?.contextWindow === undefined) assumed++;
 		modelConfigs.push(
-			toModelConfig(record, kindTag, record.kind[kindTag], catalog.prices[record.id], registry[record.id], catalogContextWindow),
+			toModelConfig(
+				record,
+				kindTag,
+				record.kind[kindTag],
+				catalog.prices[record.id],
+				registry[record.id],
+				catalogContextWindow,
+				catalog.display_names?.[record.id],
+			),
 		);
 	}
 	if (skipped.length > 0) {

package/runtime/extensions/pi-switchboard/extensions/switchboard/index.ts

@@ -99,22 +99,27 @@ export default async function (pi: ExtensionAPI) {
 		refreshModels: async (context: RefreshModelsContext) => {
 			const bearer = credentialBearer(context.credential);
 			if (!bearer) {
-				await context.store.delete();
+				await context.publish({ persist: null });
 				return [];
 			}
-			const stored = await context.store.read();
 			if (!context.allowNetwork) {
-				return stored ? ([...stored.models] as ReturnType<typeof buildModelConfigs>) : startupModels;
+				return context.stored
+					? ([...context.stored.models] as ReturnType<typeof buildModelConfigs>)
+					: startupModels;
 			}
-			const catalog = await discoverCatalog(baseUrl, bearer);
+			const catalog = await discoverCatalog(baseUrl, bearer, context.signal);
 			const configs = buildModelConfigs(catalog, registry);
-			await context.store.write({
-				models: configs as unknown as ModelsStoreEntry["models"],
-				checkedAt: Math.floor(Date.now() / MILLISECONDS_PER_SECOND),
+			const published = await context.publish({
+				persist: {
+					models: configs as unknown as ModelsStoreEntry["models"],
+					checkedAt: Math.floor(Date.now() / MILLISECONDS_PER_SECOND),
+				},
 			});
+			if (!published) return configs;
 			if (context.credential?.type === "oauth") {
 				try {
-					registerServerTools(pi, await discoverTools(baseUrl, bearer));
+					const tools = await discoverTools(baseUrl, bearer, context.signal);
+					if (!context.signal.aborted) registerServerTools(pi, tools);
 				} catch (error) {
 					console.error("pi-switchboard: server tool discovery failed", error);
 				}

package/runtime/extensions/pi-switchboard/extensions/switchboard/toolProxy.ts

@@ -28,14 +28,15 @@ export interface AdvertisedTool {
 	version?: string;
 }
 
-export async function discoverTools(baseUrl: string, bearer: string): Promise<AdvertisedTool[]> {
+export async function discoverTools(baseUrl: string, bearer: string, signal?: AbortSignal): Promise<AdvertisedTool[]> {
+	const timeout = AbortSignal.timeout(DISCOVER_TIMEOUT_MS);
 	let response: Response;
 	try {
 		response = await fetch(`${baseUrl}${MCP_PATH}`, {
 			method: "POST",
 			headers: { "Content-Type": "application/json", Accept: "application/json", Authorization: `Bearer ${bearer}` },
 			body: JSON.stringify({ jsonrpc: "2.0", id: 1, method: "tools/list", params: {} }),
-			signal: AbortSignal.timeout(DISCOVER_TIMEOUT_MS),
+			signal: signal ? AbortSignal.any([signal, timeout]) : timeout,
 		});
 	} catch {
 		return [];

package/runtime/extensions/pi-switchboard/extensions/switchboard/tools.ts

@@ -1,4 +1,6 @@
-import { Type } from "@earendil-works/pi-ai";
+// typebox directly, not through a harness package: this extension runs in
+// more than one host and must not name any of them at runtime.
+import { Type } from "typebox";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { type AdvertisedTool, makeProxyExecute } from "./toolProxy.ts";
 

package/runtime/extensions/pi-switchboard/extensions/switchboard/types.ts

@@ -31,7 +31,10 @@ export interface ModelRecordPrice {
 export interface ModelsPage {
 	models: ModelRecord[];
 	prices: Record<string, ModelRecordPrice>;
+	/** Real context window per model id, from the catalog. */
 	context_windows?: Record<string, number>;
+	/** Human-readable name per model id, from the catalog. */
+	display_names?: Record<string, string>;
 }
 
 export type RegistryModel = Model<(typeof KIND_TO_API)[SwitchboardKind]>;

package/runtime/extensions/pi-switchboard/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-switchboard",
-	"version": "0.11.2",
+	"version": "0.11.3",
 	"type": "module",
 	"description": "Route the pi coding agent through Switchboard: one prepaid balance, spend controls, and a ledger for every model in the catalog",
 	"keywords": [
@@ -23,8 +23,8 @@
 		]
 	},
 	"devDependencies": {
-		"@earendil-works/pi-ai": "0.82.1",
-		"@earendil-works/pi-coding-agent": "0.82.1",
+		"@earendil-works/pi-ai": ">=1.0.0",
+		"@earendil-works/pi-coding-agent": ">=1.0.0",
 		"typescript": "5.9.3"
 	}
 }

package/runtime/extensions/switchboard-local/extensions/local/eventStream.ts

@@ -0,0 +1,88 @@
+import type { AssistantMessage, AssistantMessageEvent } from "@earendil-works/pi-ai";
+
+// Generic event stream class for async iteration
+export class EventStream<T, R = T> implements AsyncIterable<T> {
+	private queue: T[] = [];
+	private waiting: ((value: IteratorResult<T>) => void)[] = [];
+	private done = false;
+	private finalResultPromise: Promise<R>;
+	private resolveFinalResult!: (result: R) => void;
+	private isComplete: (event: T) => boolean;
+	private extractResult: (event: T) => R;
+
+	constructor(isComplete: (event: T) => boolean, extractResult: (event: T) => R) {
+		this.isComplete = isComplete;
+		this.extractResult = extractResult;
+		this.finalResultPromise = new Promise((resolve) => {
+			this.resolveFinalResult = resolve;
+		});
+	}
+
+	push(event: T): void {
+		if (this.done) return;
+
+		if (this.isComplete(event)) {
+			this.done = true;
+			this.resolveFinalResult(this.extractResult(event));
+		}
+
+		// Deliver to waiting consumer or queue it
+		const waiter = this.waiting.shift();
+		if (waiter) {
+			waiter({ value: event, done: false });
+		} else {
+			this.queue.push(event);
+		}
+	}
+
+	end(result?: R): void {
+		this.done = true;
+		if (result !== undefined) {
+			this.resolveFinalResult(result);
+		}
+		// Notify all waiting consumers that we're done
+		while (this.waiting.length > 0) {
+			const waiter = this.waiting.shift()!;
+			waiter({ value: undefined as any, done: true });
+		}
+	}
+
+	async *[Symbol.asyncIterator](): AsyncIterator<T> {
+		while (true) {
+			if (this.queue.length > 0) {
+				yield this.queue.shift()!;
+			} else if (this.done) {
+				return;
+			} else {
+				const result = await new Promise<IteratorResult<T>>((resolve) => this.waiting.push(resolve));
+				if (result.done) return;
+				yield result.value;
+			}
+		}
+	}
+
+	result(): Promise<R> {
+		return this.finalResultPromise;
+	}
+}
+
+export class AssistantMessageEventStream extends EventStream<AssistantMessageEvent, AssistantMessage> {
+	constructor() {
+		super(
+			(event) => event.type === "done" || event.type === "error",
+			(event) => {
+				if (event.type === "done") {
+					return event.message;
+				} else if (event.type === "error") {
+					return event.error;
+				}
+				throw new Error("Unexpected event type for final result");
+			},
+		);
+	}
+}
+
+/** Factory function for AssistantMessageEventStream (for use in extensions) */
+export function createAssistantMessageEventStream(): AssistantMessageEventStream {
+	return new AssistantMessageEventStream();
+}

package/runtime/extensions/switchboard-local/extensions/local/hostContext.ts

@@ -0,0 +1,49 @@
+import type { TextContent, Tool, TranscriptContext } from "@earendil-works/pi-ai";
+
+/**
+ * Read the system prompt and the tools out of a transcript.
+ *
+ * Both hosts hand a provider the same shape now: system messages replayed in
+ * order, where later content appends to the prompt and tools are added and
+ * removed by name. Doing the replay here rather than calling a host helper is
+ * what keeps a host package out of the runtime imports.
+ */
+
+interface SystemMessage {
+	role: string;
+	content: string | TextContent[];
+	toolsAdded?: Tool[];
+	toolsRemoved?: { name: string }[];
+}
+
+function isSystemMessage(message: unknown): message is SystemMessage {
+	return message !== null && typeof message === "object" && (message as { role?: unknown }).role === "system";
+}
+
+function contentText(content: string | TextContent[]): string {
+	if (typeof content === "string") return content;
+	return content
+		.filter((part) => part.type === "text")
+		.map((part) => part.text)
+		.join("");
+}
+
+export function hostSystemPrompt(context: TranscriptContext): string | undefined {
+	const parts: string[] = [];
+	for (const message of context.messages) {
+		if (!isSystemMessage(message)) continue;
+		const text = contentText(message.content);
+		if (text.length > 0) parts.push(text);
+	}
+	return parts.length > 0 ? parts.join("\n\n") : undefined;
+}
+
+export function hostTools(context: TranscriptContext): Tool[] {
+	const tools = new Map<string, Tool>();
+	for (const message of context.messages) {
+		if (!isSystemMessage(message)) continue;
+		for (const tool of message.toolsRemoved ?? []) tools.delete(tool.name);
+		for (const tool of message.toolsAdded ?? []) tools.set(tool.name, tool);
+	}
+	return [...tools.values()];
+}

package/runtime/extensions/switchboard-local/extensions/local/jsonParse.ts

@@ -0,0 +1,124 @@
+import { parse as partialParse } from "partial-json";
+
+const VALID_JSON_ESCAPES = new Set(['"', "\\", "/", "b", "f", "n", "r", "t", "u"]);
+
+function isControlCharacter(char: string): boolean {
+	const codePoint = char.codePointAt(0);
+	return codePoint !== undefined && codePoint >= 0x00 && codePoint <= 0x1f;
+}
+
+function escapeControlCharacter(char: string): string {
+	switch (char) {
+		case "\b":
+			return "\\b";
+		case "\f":
+			return "\\f";
+		case "\n":
+			return "\\n";
+		case "\r":
+			return "\\r";
+		case "\t":
+			return "\\t";
+		default:
+			return `\\u${char.codePointAt(0)?.toString(16).padStart(4, "0") ?? "0000"}`;
+	}
+}
+
+/**
+ * Repairs malformed JSON string literals by:
+ * - escaping raw control characters inside strings
+ * - doubling backslashes before invalid escape characters
+ */
+export function repairJson(json: string): string {
+	let repaired = "";
+	let inString = false;
+
+	for (let index = 0; index < json.length; index++) {
+		const char = json[index];
+
+		if (!inString) {
+			repaired += char;
+			if (char === '"') {
+				inString = true;
+			}
+			continue;
+		}
+
+		if (char === '"') {
+			repaired += char;
+			inString = false;
+			continue;
+		}
+
+		if (char === "\\") {
+			const nextChar = json[index + 1];
+			if (nextChar === undefined) {
+				repaired += "\\\\";
+				continue;
+			}
+
+			if (nextChar === "u") {
+				const unicodeDigits = json.slice(index + 2, index + 6);
+				if (/^[0-9a-fA-F]{4}$/.test(unicodeDigits)) {
+					repaired += `\\u${unicodeDigits}`;
+					index += 5;
+					continue;
+				}
+			}
+
+			if (VALID_JSON_ESCAPES.has(nextChar)) {
+				repaired += `\\${nextChar}`;
+				index += 1;
+				continue;
+			}
+
+			repaired += "\\\\";
+			continue;
+		}
+
+		repaired += isControlCharacter(char) ? escapeControlCharacter(char) : char;
+	}
+
+	return repaired;
+}
+
+export function parseJsonWithRepair<T>(json: string): T {
+	try {
+		return JSON.parse(json) as T;
+	} catch (error) {
+		const repairedJson = repairJson(json);
+		if (repairedJson !== json) {
+			return JSON.parse(repairedJson) as T;
+		}
+		throw error;
+	}
+}
+
+/**
+ * Attempts to parse potentially incomplete JSON during streaming.
+ * Always returns a valid object, even if the JSON is incomplete.
+ *
+ * @param partialJson The partial JSON string from streaming
+ * @returns Parsed object or empty object if parsing fails
+ */
+export function parseStreamingJson<T = Record<string, unknown>>(partialJson: string | undefined): T {
+	if (!partialJson || partialJson.trim() === "") {
+		return {} as T;
+	}
+
+	try {
+		return parseJsonWithRepair<T>(partialJson);
+	} catch {
+		try {
+			const result = partialParse(partialJson);
+			return (result ?? {}) as T;
+		} catch {
+			try {
+				const result = partialParse(repairJson(partialJson));
+				return (result ?? {}) as T;
+			} catch {
+				return {} as T;
+			}
+		}
+	}
+}

package/runtime/extensions/switchboard-local/extensions/local/nativeStream.ts

@@ -1,13 +1,10 @@
 import {
 	type Api,
+	type AssistantMessageEventStream as HostAssistantMessageEventStream,
 	type AssistantMessage,
-	type AssistantMessageEventStream,
-	createAssistantMessageEventStream,
-	type Context,
 	type ImageContent,
 	type Message,
 	type Model,
-	parseStreamingJson,
 	type SimpleStreamOptions,
 	type StopReason,
 	type TextContent,
@@ -15,7 +12,11 @@ import {
 	type Tool,
 	type ToolCall,
 	type ToolResultMessage,
+	type TranscriptContext,
 } from "@earendil-works/pi-ai";
+import { type AssistantMessageEventStream, createAssistantMessageEventStream } from "./eventStream.ts";
+import { hostSystemPrompt, hostTools } from "./hostContext.ts";
+import { parseStreamingJson } from "./jsonParse.ts";
 import { messages as sdkMessages, native } from "@valni/switchboard";
 
 const SSE_DATA_PREFIX = "data:";
@@ -111,6 +112,7 @@ export function normalizeContextMessages(model: Model<KnownApi>, contextMessages
 
 	const transformed: Message[] = [];
 	for (const message of imageAware) {
+		if (message.role === "system") continue;
 		if (message.role === "user") {
 			transformed.push(message);
 			continue;
@@ -246,14 +248,16 @@ function chatUserParts(content: (TextContent | ImageContent)[]): sdkMessages.Par
 
 function buildOpenAIChatRequest(
 	model: Model<KnownApi>,
-	context: Context,
+	context: TranscriptContext,
 	options: SimpleStreamOptions | undefined,
 ): native.OpenAIChatRequest {
 	const normalized = normalizeContextMessages(model, context.messages);
 	const requestMessages: sdkMessages.Message[] = [];
+	const systemPrompt = hostSystemPrompt(context);
+	const tools = hostTools(context);
 
-	if (context.systemPrompt) {
-		requestMessages.push(sdkMessages.Message.system(sanitizeText(context.systemPrompt)));
+	if (systemPrompt) {
+		requestMessages.push(sdkMessages.Message.system(sanitizeText(systemPrompt)));
 	}
 
 	for (let index = 0; index < normalized.length; index++) {
@@ -320,7 +324,7 @@ function buildOpenAIChatRequest(
 		messages: requestMessages,
 		max_tokens: resolveMaxTokens(model, options),
 		temperature: options?.temperature ?? null,
-		tools: context.tools && context.tools.length > 0 ? context.tools.map((tool) => new JsonSchemaTool(tool)) : null,
+		tools: tools.length > 0 ? tools.map((tool) => new JsonSchemaTool(tool)) : null,
 		reasoning_effort: reasoningLevel ?? null,
 	});
 }
@@ -520,9 +524,9 @@ function completionsUrl(baseUrl: string): string {
 
 export function streamLocalModel(
 	model: Model<Api>,
-	context: Context,
+	context: TranscriptContext,
 	options?: SimpleStreamOptions,
-): AssistantMessageEventStream {
+): HostAssistantMessageEventStream {
 	const stream = createAssistantMessageEventStream();
 
 	(async () => {
@@ -579,7 +583,7 @@ export function streamLocalModel(
 			}
 
 			if (options?.signal?.aborted) throw new Error("Request was aborted");
-			if (output.stopReason === "aborted" || output.stopReason === "error") {
+			if (output.stopReason === "aborted" || output.stopReason === "error" || output.stopReason === "pending") {
 				throw new Error(output.errorMessage || "An unknown error occurred");
 			}
 			if (!state.sawTerminalEvent) throw new Error("The stream ended before a terminal event");
@@ -598,5 +602,9 @@ export function streamLocalModel(
 		}
 	})();
 
-	return stream;
+	// The host's stream type has private members, so only its own class satisfies
+	// it nominally. The object here is the same shape and the host only iterates
+	// it, so the cast sits at this one boundary rather than importing the host's
+	// constructor and naming its package at runtime.
+	return stream as unknown as HostAssistantMessageEventStream;
 }

package/runtime/extensions/switchboard-local/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "switchboard-local",
-	"version": "0.2.0",
+	"version": "0.2.1",
 	"type": "module",
 	"description": "Local models in the pi model picker, managed end to end",
 	"keywords": [
@@ -24,11 +24,12 @@
 		]
 	},
 	"dependencies": {
-		"@valni/switchboard": "git+https://github.com/Valni-Labs/switchboard-ts.git#d132540a1fd86491ffabb9327ec38bb903f709a3"
+		"@valni/switchboard": "git+https://github.com/Valni-Labs/switchboard-ts.git#d132540a1fd86491ffabb9327ec38bb903f709a3",
+		"partial-json": "0.1.7"
 	},
 	"devDependencies": {
-		"@earendil-works/pi-ai": "0.82.1",
-		"@earendil-works/pi-coding-agent": "0.82.1",
+		"@earendil-works/pi-ai": ">=1.0.0",
+		"@earendil-works/pi-coding-agent": ">=1.0.0",
 		"typescript": "5.9.3"
 	}
 }

package/runtime/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@valni/cli",
 	"private": true,
-	"version": "0.1.5",
+	"version": "0.1.6",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"type": "module",
 	"valniConfig": {
@@ -38,11 +38,11 @@
 		"prepublishOnly": "npm run clean && npm run build && npm run shrinkwrap"
 	},
 	"dependencies": {
-		"@valni/agent-core": "^0.1.5",
-		"@valni/ai": "^0.1.5",
-		"@valni/tui": "^0.1.5",
-		"pi-switchboard": "git+https://github.com/Valni-Labs/pi-switchboard.git#b35310164e79b3f99bfd697622527a8458e1719d",
-		"switchboard-local": "git+https://github.com/Valni-Labs/switchboard-local.git#bda14d2d85735da4519f4545b598b4c5e97e7d3b",
+		"@valni/agent-core": "^0.1.6",
+		"@valni/ai": "^0.1.6",
+		"@valni/tui": "^0.1.6",
+		"pi-switchboard": "git+https://github.com/Valni-Labs/pi-switchboard.git#774f1a7985a755fcd483313b729864aa8a9418c3",
+		"switchboard-local": "git+https://github.com/Valni-Labs/switchboard-local.git#4ec07263591a4f329fd12eab04d62d6c455be666",
 		"@silvia-odwyer/photon-node": "0.3.4",
 		"chalk": "5.6.2",
 		"cross-spawn": "7.0.6",

package/runtime/valni

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/runtime/valni
 size: 76058832 bytes
-sha256: 9b45d462f5ec1584ac199c4d4056aae97d26bccca546f0040de9724ea86984b1
+sha256: e2d416ce62acfeec49e80bdf551316c4807ffbb0a37d09d90a096919a4284b54