@aliou/pi-ts-aperture 0.1.0 → 0.2.1

package/README.md

@@ -7,7 +7,7 @@ Aperture handles API key injection and request routing server-side. This extensi
 ## Setup
 
 ```bash
-pi install @aliou/pi-ts-aperture
+pi install npm:@aliou/pi-ts-aperture
 ```
 
 Then run the setup wizard:

package/package.json

@@ -1,18 +1,27 @@
 {
   "name": "@aliou/pi-ts-aperture",
   "description": "Route Pi LLM providers through Tailscale Aperture",
-  "version": "0.1.0",
+  "version": "0.2.1",
+  "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,13 +33,25 @@
   },
   "peerDependencies": {
     "@mariozechner/pi-ai": ">=0.52.12",
-    "@mariozechner/pi-coding-agent": ">=0.52.12"
+    "@mariozechner/pi-coding-agent": ">=0.52.12",
+    "@mariozechner/pi-tui": ">=0.51.0"
+  },
+  "peerDependenciesMeta": {
+    "@mariozechner/pi-coding-agent": {
+      "optional": true
+    },
+    "@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",
-    "@mariozechner/pi-tui": "0.52.12",
     "@sinclair/typebox": "^0.34.48",
     "@types/node": "^25.0.10",
     "husky": "^9.1.7",
@@ -40,6 +61,7 @@
     "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"

package/src/commands/setup.ts

@@ -8,15 +8,15 @@
  */
 
 import { FuzzySelector } from "@aliou/pi-utils-settings";
-import { getProviders } from "@mariozechner/pi-ai";
 import type {
   ExtensionAPI,
   ExtensionContext,
 } from "@mariozechner/pi-coding-agent";
 import { getSettingsListTheme } from "@mariozechner/pi-coding-agent";
-import type { Component } from "@mariozechner/pi-tui";
+import type { Component, TUI } from "@mariozechner/pi-tui";
 import { Input, Key, matchesKey } from "@mariozechner/pi-tui";
 import { configLoader } from "../config";
+import { checkApertureHealth } from "../lib/health";
 
 function normalizeUrl(url: string): string {
   let result = url.trim();
@@ -27,6 +27,102 @@ function normalizeUrl(url: string): string {
   return result.replace(/\/v1\/?$/, "").replace(/\/+$/, "");
 }
 
+const SPINNER_FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
+
+/**
+ * Shows a spinner while verifying the Aperture URL is reachable.
+ * Kicks off the health check on construction and resolves done(boolean)
+ * when the check completes.
+ */
+class HealthCheckSpinner implements Component {
+  private theme: ReturnType<typeof getSettingsListTheme>;
+  private url: string;
+  private tui: TUI;
+  // true = healthy, false = failed (retry), undefined = cancelled
+  private done: (result: boolean | undefined) => void;
+  private frame = 0;
+  private timer: ReturnType<typeof setInterval>;
+  private result: { ok: boolean; error?: string } | null = null;
+
+  constructor(
+    theme: ReturnType<typeof getSettingsListTheme>,
+    url: string,
+    tui: TUI,
+    done: (result: boolean | undefined) => void,
+  ) {
+    this.theme = theme;
+    this.url = url;
+    this.tui = tui;
+    this.done = done;
+
+    // Animate spinner at ~80ms per frame.
+    this.timer = setInterval(() => {
+      this.frame = (this.frame + 1) % SPINNER_FRAMES.length;
+      this.tui.requestRender();
+    }, 80);
+
+    // Fire the check.
+    checkApertureHealth(url).then((res) => {
+      clearInterval(this.timer);
+      this.result = res;
+      this.tui.requestRender();
+
+      // On success, auto-advance after a brief pause.
+      // On failure, wait for user input (see handleInput).
+      if (res.ok) {
+        setTimeout(() => this.done(true), 600);
+      }
+    });
+  }
+
+  render(_width: number): string[] {
+    const lines: string[] = [];
+    lines.push(this.theme.label(" Aperture Setup", true));
+    lines.push("");
+
+    if (!this.result) {
+      const spinner = SPINNER_FRAMES[this.frame];
+      lines.push(
+        this.theme.hint(`  ${spinner} Checking connection to ${this.url}...`),
+      );
+    } else if (this.result.ok) {
+      lines.push(this.theme.hint(`  Connected to ${this.url}`));
+    } else {
+      lines.push(
+        this.theme.hint(`  Could not reach ${this.url}: ${this.result.error}`),
+      );
+      lines.push("");
+      lines.push(
+        this.theme.hint(
+          "  Make sure the URL is correct and you are connected to the tailnet.",
+        ),
+      );
+      lines.push("");
+      lines.push(this.theme.hint("  Enter: try another URL · Esc: cancel"));
+    }
+
+    lines.push("");
+    return lines;
+  }
+
+  invalidate() {}
+
+  handleInput(data: string) {
+    // Only handle input after a failed check.
+    if (!this.result || this.result.ok) return;
+
+    if (matchesKey(data, Key.enter)) {
+      this.done(false); // retry
+    } else if (matchesKey(data, Key.escape)) {
+      this.done(undefined); // cancel wizard
+    }
+  }
+
+  dispose() {
+    clearInterval(this.timer);
+  }
+}
+
 /**
  * Simple input prompt component for the base URL step.
  */
@@ -171,17 +267,39 @@ export function registerSetupCommand(
       const config = configLoader.getConfig();
       const settingsTheme = getSettingsListTheme();
 
-      // Step 1: base URL
-      const baseUrl = await ctx.ui.custom<string | undefined>(
-        (_tui, _theme, _kb, done) => {
-          return new UrlPrompt(settingsTheme, config.baseUrl, done);
-        },
-      );
+      // Step 1: base URL + health check loop.
+      // On failure, loop back to the URL prompt so the user can retry.
+      let baseUrl: string | undefined;
+      while (true) {
+        baseUrl = await ctx.ui.custom<string | undefined>(
+          (_tui, _theme, _kb, done) => {
+            return new UrlPrompt(
+              settingsTheme,
+              baseUrl ?? config.baseUrl,
+              done,
+            );
+          },
+        );
+
+        if (!baseUrl) return;
+        const urlToCheck = baseUrl;
+
+        const result = await ctx.ui.custom<boolean | undefined>(
+          (tui, _theme, _kb, done) => {
+            return new HealthCheckSpinner(settingsTheme, urlToCheck, tui, done);
+          },
+        );
 
-      if (!baseUrl) return;
+        if (result === true) break; // healthy, proceed
+        if (result === undefined) return; // cancelled
+      }
 
       // Step 2: select providers
-      const knownProviders = getProviders();
+      // Use model registry so custom/extension providers are included.
+      const knownProviders = Array.from(
+        new Set(ctx.modelRegistry.getAll().map((model) => model.provider)),
+      ).sort((a, b) => a.localeCompare(b));
+
       const providers = await ctx.ui.custom<string[] | undefined>(
         (_tui, _theme, _kb, done) => {
           return new ProviderMultiSelect(

package/src/lib/health.ts

@@ -0,0 +1,30 @@
+/**
+ * Health check for the Aperture gateway.
+ *
+ * Hits GET <baseUrl>/v1/models to verify the gateway is reachable.
+ * Uses native fetch (no extra dependencies).
+ */
+
+export interface HealthCheckResult {
+  ok: boolean;
+  error?: string;
+}
+
+export async function checkApertureHealth(
+  baseUrl: string,
+): Promise<HealthCheckResult> {
+  const url = `${baseUrl.replace(/\/+$/, "")}/v1/models`;
+  try {
+    const res = await fetch(url, {
+      method: "GET",
+      signal: AbortSignal.timeout(5000),
+    });
+    if (!res.ok) {
+      return { ok: false, error: `HTTP ${res.status} ${res.statusText}` };
+    }
+    return { ok: true };
+  } catch (e: unknown) {
+    const msg = e instanceof Error ? e.message : String(e);
+    return { ok: false, error: msg };
+  }
+}

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,86 +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 { name, newVersion } = releases[0];
-            title = 'Updating ' + name + ' to version ' + newVersion;
-            commit = name + '@' + newVersion;
-          } else if (releases.length > 1) {
-            const summary = releases.map(r => r.name + '@' + r.newVersion).join(', ');
-            title = 'Updating ' + summary;
-            commit = summary;
-          }
-
-          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,15 +0,0 @@
-# @aliou/pi-ts-aperture
-
-## 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"]
-}