@assertrx/dino 1.0.1 → 1.0.2

package/README.md

@@ -321,8 +321,9 @@ npm install -g @earendil-works/pi-coding-agent
 # 2. Install Dino via pi
 pi install npm:@assertrx/dino --approve
 
-# 3. Set API key
+# 3. Set an API key (any supported provider works)
 export ANTHROPIC_API_KEY=sk-ant-...
+# e.g. for OpenAI instead: export OPENAI_API_KEY=sk-...
 
 # 4. Start the server
 node ~/.pi/agent/npm/node_modules/@assertrx/dino/scripts/api-server.mjs
@@ -333,13 +334,35 @@ node ~/.pi/agent/npm/node_modules/@assertrx/dino/scripts/api-server.mjs
 | Method | Path | Description |
 |--------|------|-------------|
 | `GET` | `/api/health` | Health check |
+| `GET` | `/api/providers` | List all providers with auth status and model counts |
+| `GET` | `/api/models` | List models available with current credentials (`?provider=<id>` to filter) |
+| `POST` | `/api/models` | List models for given credentials — body accepts `provider`+`apiKey` or `apiKeys` (validates the key and unlocks that provider's catalog) |
 | `GET` | `/api/prompts` | List all available prompts with parameters |
 | `GET` | `/api/prompts/:name` | Get raw markdown content of a prompt |
 | `POST` | `/api/prompts/:name` | **Execute** a prompt via the pi agent |
 
+### Providers, models & API keys
+
+The server supports every pi provider (Anthropic, OpenAI, Google, DeepSeek, Groq, Mistral, xAI, OpenRouter, and many more). Credentials can come from three places, in this order of precedence:
+
+1. **Per-request keys** — pass `apiKeys` (a map of provider → key) or `apiKey` (+ optional `provider`) in the POST body. These keys are scoped to that single request's session.
+2. **Environment variables** — any provider's standard env var (e.g. `ANTHROPIC_API_KEY`, `OPENAI_API_KEY`, `GEMINI_API_KEY`).
+3. **Stored credentials** — logins created via `pi /login` in `~/.pi/agent/auth.json`.
+
+Use `GET /api/providers` to discover which providers are configured and `GET /api/models` to list models available to the server right now.
+
+**Selecting a model:** pass `model` in the POST body as either `"provider/model-id"` (e.g. `"openai/gpt-5.2"`) or `{ "provider": "openai", "id": "gpt-5.2" }`. Without `model`, the session uses the default model resolution (configured provider defaults). Requesting a model whose provider has no credentials returns a clear error.
+
 ### Prompt execution endpoints
 
-All POST bodies accept `apiKey` (optional, falls back to `ANTHROPIC_API_KEY` env var), `cwd` (workspace directory, defaults to current), and `stream` (default: `true` for SSE).
+All POST bodies accept auth/model options, `cwd` (workspace directory, defaults to current), and `stream` (default: `true` for SSE):
+
+| Body param | Description |
+|------------|-------------|
+| `apiKeys` | Map of provider → API key, e.g. `{"anthropic": "sk-...", "openai": "sk-..."}` |
+| `apiKey` | Single API key. Pair with `provider` to target one explicitly; otherwise applied to the first available provider (anthropic fallback) |
+| `provider` | Provider id (e.g. `"openai"`) to pair with a single `apiKey` |
+| `model` | Model selection: `"provider/model-id"`, `"model-id"`, or `{"provider": ..., "id": ...}` |
 
 | Prompt name | Required params |
 |-------------|---------------|
@@ -357,14 +380,33 @@ All POST bodies accept `apiKey` (optional, falls back to `ANTHROPIC_API_KEY` env
 # List all prompts
 curl http://localhost:3000/api/prompts
 
-# Get prompt details
-curl http://localhost:3000/api/prompts/setup-playwright
+# Discover providers and their auth status
+curl http://localhost:3000/api/providers
+
+# List models available to the server (optionally per provider)
+curl http://localhost:3000/api/models
+curl "http://localhost:3000/api/models?provider=anthropic"
 
-# Execute a prompt (SSE streaming)
+# Execute a prompt (SSE streaming, auth from env vars)
 curl -X POST http://localhost:3000/api/prompts/setup-playwright \
   -H "Content-Type: application/json" \
   -d '{"cwd": "/path/to/workspace"}'
 
+# Execute with a single provider key + model selection
+# (env: export OPENAI_API_KEY=sk-... then:)
+curl -X POST http://localhost:3000/api/prompts/setup-playwright \
+  -H "Content-Type: application/json" \
+  -d '{"cwd": "/path/to/workspace", "model": "openai/gpt-5.2"}'
+
+# Execute with multiple per-request API keys and an explicit model
+curl -X POST http://localhost:3000/api/prompts/setup-playwright \
+  -H "Content-Type: application/json" \
+  -d '{
+    "cwd": "/path/to/workspace",
+    "apiKeys": {"anthropic": "sk-ant-...", "openai": "sk-ov-..."},
+    "model": "anthropic/claude-sonnet-4-5"
+  }'
+
 # Execute with URL parameter (non-streaming JSON response)
 curl -X POST http://localhost:3000/api/prompts/generate-pom-from-url-cli \
   -H "Content-Type: application/json" \
@@ -399,5 +441,5 @@ event: error      → {"message": "..."}      # error
 |----------|---------|-------------|
 | `PORT` | `3000` | Server port |
 | `HOST` | `0.0.0.0` | Server host |
-| `ANTHROPIC_API_KEY` | — | API key (or pass `apiKey` in request body) |
+| Provider env vars | — | Any provider's standard env var (e.g. `ANTHROPIC_API_KEY`, `OPENAI_API_KEY`, `GEMINI_API_KEY`); per-request `apiKeys`/`apiKey` override these |
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assertrx/dino",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "A friendly purple dinosaur pi package with a custom TUI header, theme, and Playwright skills.",
   "keywords": [
     "pi-package"

package/scripts/api-server.mjs

@@ -100,25 +100,119 @@ async function loadPrompt(name, params = {}) {
   return content;
 }
 
-/** Create a single-use pi agent session. */
-async function createSession({ cwd, apiKey }) {
-  const modelRuntime = await ModelRuntime.create({
+/**
+ * Create a fresh ModelRuntime.
+ *
+ * Runtime API keys set on this instance are isolated to the current request.
+ */
+async function createModelRuntime() {
+  return ModelRuntime.create({
     allowModelNetwork: false,
   });
+}
+
+/**
+ * Resolve runtime API keys from the request body.
+ *
+ * Supports three styles:
+ *   - `apiKeys`: { "anthropic": "...", "openai": "..." }
+ *   - `provider` + `apiKey`: set one key for an explicit provider
+ *   - `apiKey` only (legacy): set key for the first available provider, falling back to anthropic
+ */
+function resolveApiKeys(body, availableModels) {
+  const keys = [];
+
+  if (body.apiKeys && typeof body.apiKeys === "object") {
+    for (const [providerId, key] of Object.entries(body.apiKeys)) {
+      if (typeof key === "string" && key.trim().length > 0) {
+        keys.push({ provider: providerId, key });
+      }
+    }
+    return keys;
+  }
+
+  if (body.apiKey && typeof body.apiKey === "string" && body.apiKey.trim().length > 0) {
+    const provider = body.provider && typeof body.provider === "string"
+      ? body.provider
+      : availableModels.length > 0
+        ? availableModels[0].provider
+        : "anthropic";
+    keys.push({ provider, key: body.apiKey });
+  }
+
+  return keys;
+}
 
-  // Set API key if provided (uses env vars otherwise)
-  if (apiKey) {
-    // Try to set for the first available provider (anthropic preferred)
-    const available = await modelRuntime.getAvailable();
-    if (available.length > 0) {
-      const providerId = available[0].model.provider;
-      await modelRuntime.setRuntimeApiKey(providerId, apiKey);
+/**
+ * Resolve a model object from the request body.
+ *
+ * Accepts:
+ *   - string: "anthropic/claude-opus-4-5" or "claude-opus-4-5"
+ *   - object: { provider: "anthropic", id: "claude-opus-4-5" }
+ *
+ * If no model is requested, returns undefined so the agent picks a default.
+ */
+function resolveModel(modelRuntime, modelSelector, configuredProviders) {
+  if (!modelSelector) return undefined;
+
+  let providerId;
+  let modelId;
+
+  if (typeof modelSelector === "string") {
+    const parts = modelSelector.split("/");
+    if (parts.length === 2) {
+      [providerId, modelId] = parts;
     } else {
-      // Blindly try anthropic
-      await modelRuntime.setRuntimeApiKey("anthropic", apiKey);
+      modelId = modelSelector;
+      providerId = configuredProviders[0] ?? "anthropic";
     }
+  } else if (typeof modelSelector === "object") {
+    providerId = modelSelector.provider;
+    modelId = modelSelector.id ?? modelSelector.modelId;
+  }
+
+  if (!providerId || !modelId) {
+    throw new Error(`Invalid model selector: ${JSON.stringify(modelSelector)}`);
+  }
+
+  const model = modelRuntime.getModel(providerId, modelId);
+  if (!model) {
+    throw new Error(`Model not found: ${providerId}/${modelId}`);
   }
 
+  if (!modelRuntime.hasConfiguredAuth(providerId)) {
+    throw new Error(
+      `Provider "${providerId}" is not configured with an API key. ` +
+        `Provide an apiKey or apiKeys for this provider.`
+    );
+  }
+
+  return model;
+}
+
+/** Create a single-use pi agent session. */
+async function createSession({ cwd, apiKey, apiKeys, provider, model: modelSelector }) {
+  const modelRuntime = await createModelRuntime();
+
+  // Resolve keys before selecting a model so we know which providers are configured.
+  const availableBeforeKeys = modelRuntime.getAvailableSnapshot();
+  const keysToSet = resolveApiKeys({ apiKey, apiKeys, provider }, availableBeforeKeys);
+
+  // Set all runtime API keys in parallel.
+  await Promise.all(
+    keysToSet.map(({ provider: providerId, key }) =>
+      modelRuntime.setRuntimeApiKey(providerId, key).catch((err) => {
+        throw new Error(`Failed to set API key for ${providerId}: ${err.message}`);
+      })
+    )
+  );
+
+  // Refresh availability after keys are set so the model picker sees configured providers.
+  await modelRuntime.getAvailable();
+
+  const configuredProviders = keysToSet.map((entry) => entry.provider);
+  const model = resolveModel(modelRuntime, modelSelector, configuredProviders);
+
   const agentDir = getAgentDir();
 
   const loader = new DefaultResourceLoader({
@@ -133,6 +227,7 @@ async function createSession({ cwd, apiKey }) {
     modelRuntime,
     resourceLoader: loader,
     sessionManager: SessionManager.inMemory(),
+    ...(model ? { model } : {}),
   });
 
   return session;
@@ -185,6 +280,88 @@ app.get("/api/prompts/:name", async (request, reply) => {
   };
 });
 
+// List providers and their auth/configuration status
+app.get("/api/providers", async (request, reply) => {
+  try {
+    const modelRuntime = await createModelRuntime();
+    const providers = modelRuntime.getProviders().map((provider) => ({
+      id: provider.id,
+      name: provider.name ?? provider.id,
+      authStatus: modelRuntime.getProviderAuthStatus(provider.id),
+      modelCount: modelRuntime.getModels(provider.id).length,
+    }));
+    return { providers };
+  } catch (err) {
+    reply.code(500);
+    return { error: `Failed to list providers: ${err.message}` };
+  }
+});
+
+// List available models. Optionally filter with ?provider=<id>.
+app.get("/api/models", async (request, reply) => {
+  try {
+    const { provider } = request.query;
+    const modelRuntime = await createModelRuntime();
+    await modelRuntime.getAvailable();
+    const models = modelRuntime.getAvailableSnapshot();
+    const filtered = provider
+      ? models.filter((model) => model.provider === provider)
+      : models;
+    return {
+      models: filtered.map((model) => ({
+        provider: model.provider,
+        id: model.id,
+        name: model.name ?? model.id,
+        thinking: model.thinking,
+      })),
+    };
+  } catch (err) {
+    reply.code(500);
+    return { error: `Failed to list models: ${err.message}` };
+  }
+});
+
+// List models available for the provided credentials (per-request keys).
+// Accepts provider+apiKey or an apiKeys map; without keys, lists models from
+// env/stored credentials. Used by clients to validate a key and pick a model.
+app.post("/api/models", async (request, reply) => {
+  try {
+    const { provider, apiKey, apiKeys } = request.body || {};
+    const modelRuntime = await createModelRuntime();
+
+    const availableBeforeKeys = modelRuntime.getAvailableSnapshot();
+    const keysToSet = resolveApiKeys({ provider, apiKey, apiKeys }, availableBeforeKeys);
+
+    await Promise.all(
+      keysToSet.map(({ provider: providerId, key }) =>
+        modelRuntime.setRuntimeApiKey(providerId, key).catch((err) => {
+          throw new Error(`Failed to set API key for ${providerId}: ${err.message}`);
+        })
+      )
+    );
+
+    await modelRuntime.getAvailable();
+
+    let models = modelRuntime.getAvailableSnapshot();
+    if (provider) {
+      models = models.filter((model) => model.provider === provider);
+    }
+
+    return {
+      providers: [...new Set(keysToSet.map((entry) => entry.provider))],
+      models: models.map((model) => ({
+        provider: model.provider,
+        id: model.id,
+        name: model.name ?? model.id,
+        thinking: model.thinking,
+      })),
+    };
+  } catch (err) {
+    reply.code(500);
+    return { error: `Failed to list models: ${err.message}` };
+  }
+});
+
 // Execute a prompt (SSE streaming)
 app.post("/api/prompts/:name", async (request, reply) => {
   const { name } = request.params;
@@ -196,6 +373,9 @@ app.post("/api/prompts/:name", async (request, reply) => {
 
   const {
     apiKey,
+    apiKeys,
+    provider,
+    model,
     cwd = process.cwd(),
     stream = true,
     ...params
@@ -221,7 +401,13 @@ app.post("/api/prompts/:name", async (request, reply) => {
   // Create session
   let session;
   try {
-    session = await createSession({ cwd: resolve(cwd), apiKey });
+    session = await createSession({
+      cwd: resolve(cwd),
+      apiKey,
+      apiKeys,
+      provider,
+      model,
+    });
   } catch (err) {
     reply.code(500);
     return { error: `Failed to create agent session: ${err.message}` };
@@ -313,7 +499,9 @@ try {
   await app.listen({ port: PORT, host: HOST });
   console.log(`🦕 Dino API server running at http://${HOST}:${PORT}`);
   console.log(`   Prompts: http://${HOST}:${PORT}/api/prompts`);
+  console.log(`   Providers: http://${HOST}:${PORT}/api/providers`);
+  console.log(`   Models: http://${HOST}:${PORT}/api/models`);
 } catch (err) {
   app.log.error(err);
   process.exit(1);
-}
+}

package/scripts/setup-dino-api.bat

@@ -2,51 +2,51 @@
 setlocal enabledelayedexpansion
 
 echo ============================================
-echo    Dino API Server - Setup ^& Start
+echo      Dino API Server - Setup ^& Start
 echo ============================================
 echo.
 
 :: ── 1. Check Node.js ──────────────────────────────────────────────────
 echo [1/4] Checking Node.js...
 where node >nul 2>&1
-if %ERRORLEVEL% NEQ 0 (
+if !ERRORLEVEL! NEQ 0 (
     echo ERROR: Node.js is not installed.
     echo Please install Node.js from https://nodejs.org/ and re-run this script.
     pause
     exit /b 1
 )
-for /f "tokens=*" %%v in ('node -v') do echo          Found Node.js %%v
+for /f "tokens=*" %%v in ('node -v') do echo           Found Node.js %%v
 
 :: ── 2. Install pi (if missing) ────────────────────────────────────────
 echo [2/4] Checking pi CLI...
 where pi >nul 2>&1
-if %ERRORLEVEL% EQU 0 (
-    for /f "tokens=*" %%v in ('pi --version 2^>^&1') do echo          Found pi %%v
+if !ERRORLEVEL! EQU 0 (
+    for /f "tokens=*" %%v in ('pi --version 2^>^&1') do echo           Found pi %%v
 ) else (
-    echo          Installing pi...
+    echo           Installing pi...
     call npm install -g @earendil-works/pi-coding-agent
-    if %ERRORLEVEL% NEQ 0 (
+    if !ERRORLEVEL! NEQ 0 (
         echo ERROR: Failed to install pi.
         pause
         exit /b 1
     )
-    echo          pi installed successfully.
+    echo           pi installed successfully.
 )
 
 :: ── 3. Install Dino via pi (if missing) ───────────────────────────────
 echo [3/4] Checking Dino package...
 set "DINO_DIR=%USERPROFILE%\.pi\agent\npm\node_modules\@assertrx\dino"
 if not exist "%DINO_DIR%" (
-    echo          Installing @assertrx/dino via pi...
+    echo           Installing @assertrx/dino via pi...
     call pi install npm:@assertrx/dino --approve
-    if %ERRORLEVEL% NEQ 0 (
+    if !ERRORLEVEL! NEQ 0 (
         echo ERROR: Failed to install Dino package.
         pause
         exit /b 1
     )
-    echo          Dino package installed.
+    echo           Dino package installed.
 ) else (
-    echo          Dino already installed at %DINO_DIR%
+    echo           Dino already installed at %DINO_DIR%
 )
 
 :: ── 4. Start server ───────────────────────────────────────────────────
@@ -57,22 +57,22 @@ echo.
 if "%PORT%"=="" set PORT=3000
 if "%HOST%"=="" set HOST=0.0.0.0
 
-echo          Port: %PORT%
-echo          Host: %HOST%
+echo           Port: %PORT%
+echo           Host: %HOST%
 echo.
 
 :: Use ANTHROPIC_API_KEY from env if set
 if defined ANTHROPIC_API_KEY (
-    echo          API key: loaded from ANTHROPIC_API_KEY
+    echo           API key: loaded from ANTHROPIC_API_KEY
 ) else (
-    echo          WARNING: No ANTHROPIC_API_KEY set. Set it or pass apiKey in request body.
+    echo           WARNING: No ANTHROPIC_API_KEY set. Set it or pass apiKey in request body.
 )
 
 echo.
-echo          Endpoints:
-echo            GET  http://%HOST%:%PORT%/api/health
-echo            GET  http://%HOST%:%PORT%/api/prompts
-echo            POST http://%HOST%:%PORT%/api/prompts/:name
+echo           Endpoints:
+echo             GET  http://%HOST%:%PORT%/api/health
+echo             GET  http://%HOST%:%PORT%/api/prompts
+echo             POST http://%HOST%:%PORT%/api/prompts/:name
 echo.
 echo ============================================
 echo.
@@ -83,11 +83,11 @@ set "LOCAL_API=%~dp0..\scripts\api-server.mjs"
 set "INSTALLED_API=%DINO_DIR%\scripts\api-server.mjs"
 
 if exist "%INSTALLED_API%" (
-    echo          Using installed api-server.mjs
+    echo           Using installed api-server.mjs
     node "%INSTALLED_API%"
 ) else if exist "%LOCAL_API%" (
-    echo          Installed api-server.mjs not found.
-    echo          Falling back to local source: %LOCAL_API%
+    echo           Installed api-server.mjs not found.
+    echo           Falling back to local source: %LOCAL_API%
     node "%LOCAL_API%"
 ) else (
     echo ERROR: api-server.mjs not found at either of the following locations: