@aliou/pi-ts-aperture 0.2.0 → 0.2.2

package/package.json

@@ -1,18 +1,27 @@
 {
   "name": "@aliou/pi-ts-aperture",
   "description": "Route Pi LLM providers through Tailscale Aperture",
-  "version": "0.2.0",
+  "version": "0.2.2",
+  "type": "module",
+  "license": "MIT",
+  "private": false,
+  "keywords": [
+    "pi-package",
+    "pi-extension",
+    "pi"
+  ],
   "repository": {
     "type": "git",
     "url": "https://github.com/aliou/pi-ts-aperture"
   },
-  "keywords": [
-    "pi-package"
-  ],
   "publishConfig": {
     "access": "public",
     "provenance": true
   },
+  "files": [
+    "src",
+    "README.md"
+  ],
   "pi": {
     "extensions": [
       "./src/index.ts"
@@ -24,17 +33,8 @@
   },
   "peerDependencies": {
     "@mariozechner/pi-ai": ">=0.52.12",
-    "@mariozechner/pi-coding-agent": ">=0.52.12"
-  },
-  "devDependencies": {
-    "@biomejs/biome": "^2.3.13",
-    "@changesets/cli": "^2.27.11",
-    "@mariozechner/pi-coding-agent": "0.52.12",
-    "@mariozechner/pi-tui": "0.52.12",
-    "@sinclair/typebox": "^0.34.48",
-    "@types/node": "^25.0.10",
-    "husky": "^9.1.7",
-    "typescript": "^5.9.3"
+    "@mariozechner/pi-coding-agent": ">=0.52.12",
+    "@mariozechner/pi-tui": ">=0.51.0"
   },
   "peerDependenciesMeta": {
     "@mariozechner/pi-coding-agent": {
@@ -42,14 +42,32 @@
     },
     "@mariozechner/pi-ai": {
       "optional": true
+    },
+    "@mariozechner/pi-tui": {
+      "optional": true
     }
   },
+  "devDependencies": {
+    "@aliou/biome-plugins": "^0.3.2",
+    "@biomejs/biome": "^2.3.13",
+    "@changesets/cli": "^2.27.11",
+    "@mariozechner/pi-coding-agent": "0.52.12",
+    "@sinclair/typebox": "^0.34.48",
+    "@types/node": "^25.0.10",
+    "@vitest/coverage-v8": "^4.0.18",
+    "husky": "^9.1.7",
+    "typescript": "^5.9.3",
+    "vitest": "^4.0.18"
+  },
   "scripts": {
     "typecheck": "tsc --noEmit",
     "lint": "biome check",
     "format": "biome check --write",
+    "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

@@ -14,46 +14,72 @@ 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(
+  registry: ExtensionContext["modelRegistry"],
+  providers: string[],
+  baseUrl: string,
+): void {
+  for (const provider of providers) {
+    const models = registry.getAll().filter((m) => m.provider === provider);
+
+    registry.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(registry: ExtensionContext["modelRegistry"]): string[] {
+  const url = resolveBaseUrl();
+  if (!url) return [];
+
+  const { providers } = configLoader.getConfig();
+  overrideProviders(registry, providers, url);
+  return providers;
 }
 
 export default async function (pi: ExtensionAPI): Promise<void> {
   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(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(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,9 +90,9 @@ export default async function (pi: ExtensionAPI): Promise<void> {
       }
     }
 
-    if (removedProviders.length > 0) {
+    if (removed.length > 0) {
       ctx.ui.notify(
-        `Removed providers (${removedProviders.join(", ")}) will revert after /reload`,
+        `Removed providers (${removed.join(", ")}) will revert after /reload`,
         "warning",
       );
     }

package/.changeset/config.json

@@ -1,10 +0,0 @@
-{
-  "$schema": "https://unpkg.com/@changesets/config@3.1.1/schema.json",
-  "changelog": "@changesets/cli/changelog",
-  "commit": false,
-  "fixed": [],
-  "linked": [],
-  "access": "public",
-  "baseBranch": "main",
-  "updateInternalDependencies": "patch"
-}

package/.github/workflows/ci.yml

@@ -1,31 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-
-jobs:
-  check:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version: 22
-
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v4
-
-      - name: Install dependencies
-        run: pnpm install --frozen-lockfile
-
-      - name: Lint
-        run: pnpm run lint
-
-      - name: Typecheck
-        run: pnpm run typecheck

package/.github/workflows/publish.yml

@@ -1,82 +0,0 @@
-name: Publish
-
-on:
-  workflow_run:
-    workflows: ["CI"]
-    types: [completed]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch }}
-  cancel-in-progress: true
-
-jobs:
-  publish:
-    name: Publish
-    if: >-
-      github.event.workflow_run.conclusion == 'success' &&
-      github.event.workflow_run.head_branch == 'main'
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      packages: write
-      pull-requests: write
-      id-token: write
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.workflow_run.head_sha }}
-          fetch-depth: 0
-
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v4
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: "22"
-          registry-url: "https://registry.npmjs.org"
-          scope: "@aliou"
-          cache: "pnpm"
-
-      - name: Upgrade npm for OIDC support
-        run: npm install -g npm@latest
-
-      - name: Install dependencies
-        run: pnpm install --frozen-lockfile
-
-      - name: Get release info
-        id: release-info
-        run: |
-          pnpm changeset status --output=release.json 2>/dev/null || echo '{"releases":[]}' > release.json
-          node <<NODE
-          const fs = require('fs');
-          const release = JSON.parse(fs.readFileSync('release.json', 'utf8'));
-          const releases = release.releases?.filter(r => r.type !== 'none') || [];
-
-          let title = 'Version Packages';
-          let commit = 'Version Packages';
-          if (releases.length >= 1) {
-            const version = releases[0].newVersion;
-            title = version;
-            commit = version;
-          }
-
-          fs.appendFileSync(process.env.GITHUB_OUTPUT, 'title=' + title + '\n');
-          fs.appendFileSync(process.env.GITHUB_OUTPUT, 'commit=' + commit + '\n');
-          NODE
-          rm -f release.json
-        continue-on-error: true
-
-      - name: Create Release PR or Publish
-        id: changesets
-        uses: changesets/action@v1
-        with:
-          version: pnpm changeset version
-          publish: pnpm changeset publish
-          title: ${{ steps.release-info.outputs.title || 'Version Packages' }}
-          commit: ${{ steps.release-info.outputs.commit || 'Version Packages' }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NPM_CONFIG_PROVENANCE: true

package/AGENTS.md

@@ -1,29 +0,0 @@
-# pi-ts-aperture
-
-Pi extension that routes LLM providers through Tailscale Aperture.
-
-## Structure
-
-- `src/index.ts` - Entry point. Loads config, registers providers, registers commands.
-- `src/config.ts` - Config schema (`ApertureConfig`, `ResolvedConfig`) and `ConfigLoader` instance.
-- `src/commands/setup.ts` - `/aperture:setup` interactive wizard (URL input + provider multi-select).
-- `src/commands/settings.ts` - `/aperture:settings` settings UI via `registerSettingsCommand`.
-
-## Key decisions
-
-- Config is global-only (no per-project scope). Aperture is a network-level concern.
-- Provider list comes from `getProviders()` in `@mariozechner/pi-ai`, not hardcoded.
-- `apiKey` is set to `"-"` because Aperture ignores client-provided keys.
-- URLs are normalized on input: `http://` is prepended if missing, trailing `/v1` is stripped (appended at registration time).
-
-## Dependencies
-
-- `@aliou/pi-utils-settings` - Config loader and settings command infrastructure.
-- `@mariozechner/pi-ai` - `getProviders()` for the known provider list.
-- `@mariozechner/pi-coding-agent` - Extension API, `getSettingsListTheme`.
-- `@mariozechner/pi-tui` - TUI components (`Input`, `Key`, `matchesKey`, `FuzzySelector`).
-
-## Publishing
-
-- Manual publish for 0.0.1, then changesets + GitHub Actions for subsequent versions.
-- CI runs lint + typecheck on push/PR. Publish workflow triggers after CI succeeds on main.

package/CHANGELOG.md

@@ -1,28 +0,0 @@
-# @aliou/pi-ts-aperture
-
-## 0.2.0
-
-### Minor Changes
-
-- 926f0a9: Improve `/aperture:setup` provider and connectivity flow.
-
-  - Add URL health check during setup (`/v1/models`) before provider selection, with retry/cancel UX.
-  - Build provider choices from Pi's runtime model registry so extension-registered providers (for example `pi-synthetic`) appear in the setup list.
-
-### Patch Changes
-
-- 2263fc2: mark pi SDK peer deps as optional to prevent koffi OOM in Gondolin VMs
-
-## 0.1.0
-
-### Minor Changes
-
-- ebb9556: Initial release. Route Pi LLM providers through Tailscale Aperture.
-
-  - `/aperture:setup` interactive wizard (base URL + provider multi-select)
-  - `/aperture:settings` settings UI for updating configuration
-  - Auto-registers selected providers with Aperture base URL on load
-
-### Patch Changes
-
-- 7388139: Fix providers not taking effect immediately after setup/settings save. Register directly on modelRegistry and re-resolve the active model when it belongs to a reconfigured provider.

package/biome.json

@@ -1,30 +0,0 @@
-{
-  "$schema": "https://biomejs.dev/schemas/2.4.2/schema.json",
-  "vcs": {
-    "enabled": true,
-    "clientKind": "git",
-    "useIgnoreFile": true
-  },
-  "files": {
-    "includes": ["**/*.ts", "**/*.json"],
-    "ignoreUnknown": true
-  },
-  "assist": {
-    "actions": {
-      "source": {
-        "organizeImports": "on"
-      }
-    }
-  },
-  "linter": {
-    "enabled": true,
-    "rules": {
-      "recommended": true
-    }
-  },
-  "formatter": {
-    "enabled": true,
-    "indentStyle": "space",
-    "indentWidth": 2
-  }
-}

package/shell.nix

@@ -1,10 +0,0 @@
-{
-  pkgs ? import <nixpkgs> { },
-}:
-
-pkgs.mkShell {
-  buildInputs = with pkgs; [
-    nodejs
-    pnpm_10
-  ];
-}

package/tsconfig.json

@@ -1,17 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "ES2022",
-    "module": "ESNext",
-    "moduleResolution": "bundler",
-    "strict": true,
-    "esModuleInterop": true,
-    "skipLibCheck": true,
-    "forceConsistentCasingInFileNames": true,
-    "resolveJsonModule": true,
-    "noEmit": true,
-    "jsx": "react-jsx",
-    "jsxImportSource": "@mariozechner/pi-tui"
-  },
-  "include": ["src/**/*"],
-  "exclude": ["node_modules"]
-}