@aliou/pi-ts-aperture 0.2.1 → 0.2.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@aliou/pi-ts-aperture",
   "description": "Route Pi LLM providers through Tailscale Aperture",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "type": "module",
   "license": "MIT",
   "private": false,
@@ -32,9 +32,9 @@
     "@aliou/pi-utils-settings": "^0.4.0"
   },
   "peerDependencies": {
-    "@mariozechner/pi-ai": ">=0.52.12",
-    "@mariozechner/pi-coding-agent": ">=0.52.12",
-    "@mariozechner/pi-tui": ">=0.51.0"
+    "@mariozechner/pi-ai": ">=0.55.3",
+    "@mariozechner/pi-coding-agent": ">=0.55.3",
+    "@mariozechner/pi-tui": ">=0.55.3"
   },
   "peerDependenciesMeta": {
     "@mariozechner/pi-coding-agent": {
@@ -51,11 +51,13 @@
     "@aliou/biome-plugins": "^0.3.2",
     "@biomejs/biome": "^2.3.13",
     "@changesets/cli": "^2.27.11",
-    "@mariozechner/pi-coding-agent": "0.52.12",
+    "@mariozechner/pi-coding-agent": "0.55.3",
     "@sinclair/typebox": "^0.34.48",
     "@types/node": "^25.0.10",
+    "@vitest/coverage-v8": "^4.0.18",
     "husky": "^9.1.7",
-    "typescript": "^5.9.3"
+    "typescript": "^5.9.3",
+    "vitest": "^4.0.18"
   },
   "scripts": {
     "typecheck": "tsc --noEmit",
@@ -64,6 +66,8 @@
     "check:lockfile": "pnpm install --frozen-lockfile --ignore-scripts",
     "changeset": "changeset",
     "version": "changeset version",
-    "release": "pnpm changeset publish"
+    "release": "pnpm changeset publish",
+    "test": "vitest run tests/e2e.test.ts",
+    "test:watch": "vitest watch tests/"
   }
 }

package/src/index.ts

@@ -10,50 +10,82 @@ import type {
   ExtensionAPI,
   ExtensionContext,
 } from "@mariozechner/pi-coding-agent";
+import { VERSION } from "@mariozechner/pi-coding-agent";
 import { registerApertureSettings } from "./commands/settings";
 import { registerSetupCommand } from "./commands/setup";
 import { configLoader } from "./config";
 
-function getApertureBaseUrl(): string | null {
-  const config = configLoader.getConfig();
-  if (!config.baseUrl || config.providers.length === 0) return null;
-  return `${config.baseUrl.replace(/\/+$/, "")}/v1`;
+/**
+ * Compute the full Aperture base URL from config, or null if not configured.
+ */
+function resolveBaseUrl(): string | null {
+  const { baseUrl, providers } = configLoader.getConfig();
+  if (!baseUrl || providers.length === 0) return null;
+  return `${baseUrl.replace(/\/+$/, "")}/v1`;
+}
+
+/**
+ * Override provider registrations to route through Aperture.
+ * Preserves existing models so extensions that registered custom models
+ * before this runs don't lose them.
+ */
+function overrideProviders(
+  pi: ExtensionAPI,
+  registry: ExtensionContext["modelRegistry"],
+  providers: string[],
+  baseUrl: string,
+): void {
+  for (const provider of providers) {
+    const models = registry.getAll().filter((m) => m.provider === provider);
+
+    pi.registerProvider(provider, {
+      baseUrl,
+      apiKey: "-",
+      ...(models.length > 0 && { api: models[0].api, models }),
+    });
+  }
+}
+
+/**
+ * Apply Aperture configuration to the model registry.
+ * Returns the list of providers that were overridden, or empty if no-op.
+ */
+function applyAperture(
+  pi: ExtensionAPI,
+  registry: ExtensionContext["modelRegistry"],
+): string[] {
+  const url = resolveBaseUrl();
+  if (!url) return [];
+
+  const { providers } = configLoader.getConfig();
+  overrideProviders(pi, registry, providers, url);
+  return providers;
 }
 
 export default async function (pi: ExtensionAPI): Promise<void> {
+  console.log(`[pi-ts-aperture] loaded on pi ${VERSION}`);
   await configLoader.load();
 
-  const config = configLoader.getConfig();
-  let lastRegisteredProviders = [...config.providers];
+  let lastRegisteredProviders = [...configLoader.getConfig().providers];
 
-  // At load time, pi.registerProvider() queue is flushed by the runner.
-  const baseUrl = getApertureBaseUrl();
-  if (baseUrl) {
-    for (const provider of config.providers) {
-      pi.registerProvider(provider, { baseUrl, apiKey: "-" });
-    }
-  }
+  // Apply after all extensions have registered their providers and models.
+  pi.events.on("before_agent_start", async (data) => {
+    const ctx = data as ExtensionContext;
+    if (!ctx?.modelRegistry) return;
+    applyAperture(pi, ctx.modelRegistry);
+  });
 
   const onSetupComplete = (ctx: ExtensionContext) => {
-    const cfg = configLoader.getConfig();
-    const removedProviders = lastRegisteredProviders.filter(
-      (p) => !cfg.providers.includes(p),
+    const { providers } = configLoader.getConfig();
+    const removed = lastRegisteredProviders.filter(
+      (p) => !providers.includes(p),
     );
 
-    const url = getApertureBaseUrl();
-    if (url) {
-      for (const provider of cfg.providers) {
-        ctx.modelRegistry.registerProvider(provider, {
-          baseUrl: url,
-          apiKey: "-",
-        });
-      }
-    }
-    lastRegisteredProviders = [...cfg.providers];
+    applyAperture(pi, ctx.modelRegistry);
+    lastRegisteredProviders = [...providers];
 
-    // The active model is a snapshot. If it belongs to a provider we just
-    // reconfigured, re-resolve it so the new baseUrl takes effect.
-    if (ctx.model && cfg.providers.includes(ctx.model.provider)) {
+    // Re-resolve active model if it belongs to a reconfigured provider.
+    if (ctx.model && providers.includes(ctx.model.provider)) {
       const updated = ctx.modelRegistry.find(ctx.model.provider, ctx.model.id);
       if (updated) {
         ctx.ui.notify(
@@ -64,11 +96,8 @@ export default async function (pi: ExtensionAPI): Promise<void> {
       }
     }
 
-    if (removedProviders.length > 0) {
-      ctx.ui.notify(
-        `Removed providers (${removedProviders.join(", ")}) will revert after /reload`,
-        "warning",
-      );
+    for (const p of removed) {
+      pi.unregisterProvider(p);
     }
   };