@victor-software-house/pi-openai-proxy 4.3.1 → 4.4.1

package/dist/config.d.mts

@@ -1,61 +1,3 @@
 
-//#region src/config/schema.d.ts
-/**
- * Proxy configuration schema -- single source of truth.
- *
- * Used by both the proxy server and the pi extension.
- * The server reads the JSON config file as defaults, with env vars and CLI args as overrides.
- * The pi extension reads and writes the JSON config file via the /proxy config panel.
- */
-/**
- * How public model IDs are generated from canonical provider/model-id pairs.
- *
- * - "collision-prefixed": prefix only providers in conflict groups that share a raw model ID
- * - "universal": expose raw model IDs only; duplicates are a config error
- * - "always-prefixed": always expose <prefix>/<model-id> for every model
- */
-type PublicModelIdMode = "collision-prefixed" | "universal" | "always-prefixed";
-/**
- * Which models are exposed on the public HTTP API.
- *
- * - "all": every available model
- * - "scoped": all available models from selected providers only
- * - "custom": explicit allowlist of canonical model IDs
- */
-type ModelExposureMode = "all" | "scoped" | "custom";
-interface ProxyConfig {
-  /** Bind address. Default: "127.0.0.1" */
-  readonly host: string;
-  /** Listen port. Default: 4141 */
-  readonly port: number;
-  /** Bearer token for proxy auth. Empty string = disabled. */
-  readonly authToken: string;
-  /** Allow remote image URL fetching. Default: false */
-  readonly remoteImages: boolean;
-  /** Max request body in MB. Default: 50 */
-  readonly maxBodySizeMb: number;
-  /** Upstream timeout in seconds. Default: 120 */
-  readonly upstreamTimeoutSec: number;
-  /** "detached" = background daemon, "session" = dies with pi session. Default: "detached" */
-  readonly lifetime: "detached" | "session";
-  /** How public model IDs are generated. Default: "collision-prefixed" */
-  readonly publicModelIdMode: PublicModelIdMode;
-  /** Which models are exposed. Default: "all" */
-  readonly modelExposureMode: ModelExposureMode;
-  /** Provider keys to expose when modelExposureMode is "scoped". */
-  readonly scopedProviders: readonly string[];
-  /** Canonical model IDs to expose when modelExposureMode is "custom". */
-  readonly customModels: readonly string[];
-  /** Provider key -> custom public prefix label. Default prefix = provider key. */
-  readonly providerPrefixes: Readonly<Record<string, string>>;
-}
-declare const DEFAULT_CONFIG: Readonly<ProxyConfig>;
-declare function isPublicModelIdMode(value: string): value is PublicModelIdMode;
-declare function isModelExposureMode(value: string): value is ModelExposureMode;
-declare function normalizeConfig(raw: unknown): ProxyConfig;
-declare function getConfigPath(): string;
-declare function loadConfigFromFile(): ProxyConfig;
-declare function saveConfigToFile(config: ProxyConfig): void;
-declare function configToEnv(config: ProxyConfig): Record<string, string>;
-//#endregion
+import { a as configToEnv, c as isPublicModelIdMode, d as saveConfigToFile, i as PublicModelIdMode, l as loadConfigFromFile, n as ModelExposureMode, o as getConfigPath, r as ProxyConfig, s as isModelExposureMode, t as DEFAULT_CONFIG, u as normalizeConfig } from "./schema-BTAG6Urs.mjs";
 export { DEFAULT_CONFIG, ModelExposureMode, ProxyConfig, PublicModelIdMode, configToEnv, getConfigPath, isModelExposureMode, isPublicModelIdMode, loadConfigFromFile, normalizeConfig, saveConfigToFile };

package/dist/exposure.d.mts

@@ -1,5 +1,5 @@
 
-import { ModelExposureMode, PublicModelIdMode } from "./config.mjs";
+import { i as PublicModelIdMode, n as ModelExposureMode } from "./schema-BTAG6Urs.mjs";
 import { Api, Model } from "@mariozechner/pi-ai";
 
 //#region src/openai/model-exposure.d.ts

package/dist/schema-BTAG6Urs.d.mts

@@ -0,0 +1,61 @@
+
+//#region src/config/schema.d.ts
+/**
+ * Proxy configuration schema -- single source of truth.
+ *
+ * Used by both the proxy server and the pi extension.
+ * The server reads the JSON config file as defaults, with env vars and CLI args as overrides.
+ * The pi extension reads and writes the JSON config file via the /proxy config panel.
+ */
+/**
+ * How public model IDs are generated from canonical provider/model-id pairs.
+ *
+ * - "collision-prefixed": prefix only providers in conflict groups that share a raw model ID
+ * - "universal": expose raw model IDs only; duplicates are a config error
+ * - "always-prefixed": always expose <prefix>/<model-id> for every model
+ */
+type PublicModelIdMode = "collision-prefixed" | "universal" | "always-prefixed";
+/**
+ * Which models are exposed on the public HTTP API.
+ *
+ * - "all": every available model
+ * - "scoped": all available models from selected providers only
+ * - "custom": explicit allowlist of canonical model IDs
+ */
+type ModelExposureMode = "all" | "scoped" | "custom";
+interface ProxyConfig {
+  /** Bind address. Default: "127.0.0.1" */
+  readonly host: string;
+  /** Listen port. Default: 4141 */
+  readonly port: number;
+  /** Bearer token for proxy auth. Empty string = disabled. */
+  readonly authToken: string;
+  /** Allow remote image URL fetching. Default: false */
+  readonly remoteImages: boolean;
+  /** Max request body in MB. Default: 50 */
+  readonly maxBodySizeMb: number;
+  /** Upstream timeout in seconds. Default: 120 */
+  readonly upstreamTimeoutSec: number;
+  /** "detached" = background daemon, "session" = dies with pi session. Default: "detached" */
+  readonly lifetime: "detached" | "session";
+  /** How public model IDs are generated. Default: "collision-prefixed" */
+  readonly publicModelIdMode: PublicModelIdMode;
+  /** Which models are exposed. Default: "all" */
+  readonly modelExposureMode: ModelExposureMode;
+  /** Provider keys to expose when modelExposureMode is "scoped". */
+  readonly scopedProviders: readonly string[];
+  /** Canonical model IDs to expose when modelExposureMode is "custom". */
+  readonly customModels: readonly string[];
+  /** Provider key -> custom public prefix label. Default prefix = provider key. */
+  readonly providerPrefixes: Readonly<Record<string, string>>;
+}
+declare const DEFAULT_CONFIG: Readonly<ProxyConfig>;
+declare function isPublicModelIdMode(value: string): value is PublicModelIdMode;
+declare function isModelExposureMode(value: string): value is ModelExposureMode;
+declare function normalizeConfig(raw: unknown): ProxyConfig;
+declare function getConfigPath(): string;
+declare function loadConfigFromFile(): ProxyConfig;
+declare function saveConfigToFile(config: ProxyConfig): void;
+declare function configToEnv(config: ProxyConfig): Record<string, string>;
+//#endregion
+export { configToEnv as a, isPublicModelIdMode as c, saveConfigToFile as d, PublicModelIdMode as i, loadConfigFromFile as l, ModelExposureMode as n, getConfigPath as o, ProxyConfig as r, isModelExposureMode as s, DEFAULT_CONFIG as t, normalizeConfig as u };

package/dist/sync-zed.d.mts

@@ -0,0 +1,53 @@
+
+import { ExposedModel } from "./exposure.mjs";
+
+//#region src/sync/zed.d.ts
+interface ZedAvailableModel {
+  readonly name: string;
+  readonly display_name: string;
+  readonly max_tokens: number;
+  readonly max_output_tokens: number;
+  readonly capabilities: {
+    readonly tools: boolean;
+    readonly images: boolean;
+    readonly parallel_tool_calls: boolean;
+    readonly prompt_cache_key: boolean;
+    readonly chat_completions: boolean;
+  };
+}
+interface ZedSyncOptions {
+  /** Provider label in Zed settings (e.g. "Pi Proxy"). */
+  readonly providerName: string;
+  /** API URL written into the provider block. */
+  readonly apiUrl: string;
+  /** Preview changes without writing to disk. */
+  readonly dryRun: boolean;
+}
+interface ZedSyncResult {
+  readonly ok: boolean;
+  readonly configPath: string;
+  readonly added: number;
+  readonly removed: number;
+  readonly unchanged: number;
+  readonly summary: string;
+  readonly error?: string | undefined;
+}
+/**
+ * Resolve Zed's global settings.json path.
+ *
+ * Resolution order:
+ * 1. CUSTOM_DATA_DIR env var (Zed's own override)
+ * 2. ~/.config/zed/settings.json (macOS + Linux standard)
+ * 3. $XDG_CONFIG_HOME/zed/settings.json (Linux XDG)
+ */
+declare function findZedSettings(): string | undefined;
+/**
+ * Map an ExposedModel to Zed's available_models entry.
+ */
+declare function toZedModel(exposed: ExposedModel): ZedAvailableModel;
+/**
+ * Sync exposed models into Zed's settings.json.
+ */
+declare function syncToZed(exposedModels: readonly ExposedModel[], options: ZedSyncOptions): ZedSyncResult;
+//#endregion
+export { ZedAvailableModel, ZedSyncOptions, ZedSyncResult, findZedSettings, syncToZed, toZedModel };

package/dist/sync-zed.mjs

@@ -0,0 +1,152 @@
+#!/usr/bin/env bun
+import { existsSync, readFileSync, writeFileSync } from "node:fs";
+import { resolve } from "node:path";
+import { applyEdits, modify, parse } from "jsonc-parser";
+//#region src/sync/zed.ts
+/**
+* Zed settings.json model sync.
+*
+* Discovers Zed's settings file, maps exposed proxy models to Zed's
+* openai_compatible available_models shape, and writes them back using
+* jsonc-parser's modify() to preserve comments and formatting.
+*/
+/**
+* Resolve Zed's global settings.json path.
+*
+* Resolution order:
+* 1. CUSTOM_DATA_DIR env var (Zed's own override)
+* 2. ~/.config/zed/settings.json (macOS + Linux standard)
+* 3. $XDG_CONFIG_HOME/zed/settings.json (Linux XDG)
+*/
+function findZedSettings() {
+	const customDir = process.env.CUSTOM_DATA_DIR;
+	if (customDir !== void 0 && customDir.length > 0) {
+		const p = resolve(customDir, "settings.json");
+		if (existsSync(p)) return p;
+	}
+	const home = process.env.HOME;
+	if (home !== void 0 && home.length > 0) {
+		const p = resolve(home, ".config", "zed", "settings.json");
+		if (existsSync(p)) return p;
+	}
+	const xdg = process.env.XDG_CONFIG_HOME;
+	if (xdg !== void 0 && xdg.length > 0) {
+		const p = resolve(xdg, "zed", "settings.json");
+		if (existsSync(p)) return p;
+	}
+}
+/**
+* Map an ExposedModel to Zed's available_models entry.
+*/
+function toZedModel(exposed) {
+	const model = exposed.model;
+	return {
+		name: exposed.publicId,
+		display_name: model.name,
+		max_tokens: model.contextWindow,
+		max_output_tokens: model.maxTokens,
+		capabilities: {
+			tools: true,
+			images: model.input.includes("image"),
+			parallel_tool_calls: false,
+			prompt_cache_key: false,
+			chat_completions: true
+		}
+	};
+}
+const MODIFY_OPTIONS = {
+	isArrayInsertion: false,
+	formattingOptions: {
+		tabSize: 2,
+		insertSpaces: true,
+		eol: "\n"
+	}
+};
+function isRecord(value) {
+	return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+/**
+* Read the current available_models for a provider from Zed settings.
+* Returns the parsed model names, or an empty array if the path does not exist.
+*/
+function readCurrentModelNames(text, providerName) {
+	const root = parse(text);
+	if (!isRecord(root)) return [];
+	const langModels = root["language_models"];
+	if (!isRecord(langModels)) return [];
+	const compat = langModels["openai_compatible"];
+	if (!isRecord(compat)) return [];
+	const provider = compat[providerName];
+	if (!isRecord(provider)) return [];
+	const models = provider["available_models"];
+	if (!Array.isArray(models)) return [];
+	const names = [];
+	for (const entry of models) if (isRecord(entry)) {
+		const name = entry["name"];
+		if (typeof name === "string") names.push(name);
+	}
+	return names;
+}
+/**
+* Apply the full provider block (api_url + available_models) to the JSONC text.
+* Returns the new text with edits applied.
+*/
+function applyProviderBlock(text, providerName, apiUrl, models) {
+	return applyEdits(text, modify(text, [
+		"language_models",
+		"openai_compatible",
+		providerName
+	], {
+		api_url: apiUrl,
+		available_models: models
+	}, MODIFY_OPTIONS));
+}
+/**
+* Sync exposed models into Zed's settings.json.
+*/
+function syncToZed(exposedModels, options) {
+	const configPath = findZedSettings();
+	if (configPath === void 0) return {
+		ok: false,
+		configPath: "",
+		added: 0,
+		removed: 0,
+		unchanged: 0,
+		summary: "",
+		error: "Zed settings.json not found. Checked ~/.config/zed/settings.json and $XDG_CONFIG_HOME/zed/settings.json"
+	};
+	const originalText = readFileSync(configPath, "utf-8");
+	const currentNames = new Set(readCurrentModelNames(originalText, options.providerName));
+	const zedModels = exposedModels.map(toZedModel);
+	const newNames = new Set(zedModels.map((m) => m.name));
+	let added = 0;
+	let removed = 0;
+	let unchanged = 0;
+	for (const name of newNames) if (currentNames.has(name)) unchanged += 1;
+	else added += 1;
+	for (const name of currentNames) if (!newNames.has(name)) removed += 1;
+	const parts = [];
+	if (added > 0) parts.push(`${String(added)} added`);
+	if (removed > 0) parts.push(`${String(removed)} removed`);
+	if (unchanged > 0) parts.push(`${String(unchanged)} unchanged`);
+	const summary = parts.length > 0 ? parts.join(", ") : "no changes";
+	if (options.dryRun) return {
+		ok: true,
+		configPath,
+		added,
+		removed,
+		unchanged,
+		summary: `[dry-run] ${summary}`
+	};
+	writeFileSync(configPath, applyProviderBlock(originalText, options.providerName, options.apiUrl, zedModels), "utf-8");
+	return {
+		ok: true,
+		configPath,
+		added,
+		removed,
+		unchanged,
+		summary
+	};
+}
+//#endregion
+export { findZedSettings, syncToZed, toZedModel };

package/extensions/proxy.ts

@@ -8,6 +8,7 @@
  *   /proxy status     Show proxy status
  *   /proxy verify     Validate model exposure config against available models
  *   /proxy models     List all exposed models with their public IDs
+ *   /proxy zed-sync   Sync exposed models to Zed settings.json (--dry-run)
  *   /proxy config     Open settings panel (alias)
  *   /proxy show       Summarize current config and exposure policy
  *   /proxy path       Show config file location
@@ -56,6 +57,8 @@ import {
 	type ModelExposureConfig,
 } from "@victor-software-house/pi-openai-proxy/exposure";
 
+import { syncToZed, type ZedSyncOptions } from "@victor-software-house/pi-openai-proxy/sync/zed";
+
 // ---------------------------------------------------------------------------
 // Runtime status
 // ---------------------------------------------------------------------------
@@ -140,13 +143,15 @@ export default function proxyExtension(pi: ExtensionAPI): void {
 		"status",
 		"verify",
 		"models",
+		"zed-sync",
 		"config",
 		"show",
 		"path",
 		"reset",
 		"help",
 	];
-	const USAGE = "/proxy [start|stop|restart|status|verify|models|config|show|path|reset|help]";
+	const USAGE =
+		"/proxy [start|stop|restart|status|verify|models|zed-sync|config|show|path|reset|help]";
 
 	pi.registerCommand("proxy", {
 		description: "Manage the OpenAI-compatible proxy",
@@ -179,6 +184,9 @@ export default function proxyExtension(pi: ExtensionAPI): void {
 				case "models":
 					showModels(ctx);
 					return;
+				case "zed-sync":
+					handleZedSync(ctx, args);
+					return;
 				case "show":
 					showConfig(ctx);
 					return;
@@ -577,6 +585,46 @@ export default function proxyExtension(pi: ExtensionAPI): void {
 		}
 	}
 
+	// --- Zed sync ---
+
+	function handleZedSync(ctx: ExtensionContext, args: string): void {
+		config = loadConfigFromFile();
+
+		const dryRun = args.includes("--dry-run");
+
+		// Compute exposed models (same as /proxy models)
+		const available = getAvailableModels();
+		const allModels = getAllRegisteredModels();
+		const outcome = computeModelExposure(available, allModels, buildExposureConfig());
+		if (!outcome.ok) {
+			ctx.ui.notify(`Model exposure error: ${outcome.message}`, "error");
+			return;
+		}
+
+		if (outcome.models.length === 0) {
+			ctx.ui.notify("No models exposed. Nothing to sync.", "warning");
+			return;
+		}
+
+		const syncOptions: ZedSyncOptions = {
+			providerName: "Pi Proxy",
+			apiUrl: `http://${config.host}:${String(config.port)}/v1`,
+			dryRun,
+		};
+
+		const result = syncToZed(outcome.models, syncOptions);
+
+		if (!result.ok) {
+			ctx.ui.notify(result.error ?? "Zed sync failed", "error");
+			return;
+		}
+
+		const msg = dryRun
+			? `Zed sync dry-run: ${result.summary}\n${result.configPath}`
+			: `Zed sync complete: ${result.summary}\n${result.configPath}`;
+		ctx.ui.notify(msg, "info");
+	}
+
 	async function waitForReady(timeoutMs: number): Promise<RuntimeStatus> {
 		const start = Date.now();
 		const interval = 300;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@victor-software-house/pi-openai-proxy",
-	"version": "4.3.1",
+	"version": "4.4.1",
 	"description": "OpenAI-compatible HTTP proxy for pi's multi-provider model registry",
 	"license": "MIT",
 	"author": "Victor Software House",
@@ -41,6 +41,10 @@
 		"./exposure": {
 			"import": "./dist/exposure.mjs",
 			"types": "./dist/exposure.d.mts"
+		},
+		"./sync/zed": {
+			"import": "./dist/sync-zed.mjs",
+			"types": "./dist/sync-zed.d.mts"
 		}
 	},
 	"main": "dist/index.mjs",
@@ -73,6 +77,7 @@
 		"@sinclair/typebox": "^0.34.0",
 		"citty": "^0.1.6",
 		"hono": "^4.12.8",
+		"jsonc-parser": "^3.3.1",
 		"zod": "^4.3.6"
 	},
 	"devDependencies": {