@gtrabanco/pi-nan-provider 1.2.0 → 1.2.1

package/AGENTS.md

@@ -270,29 +270,33 @@ Since 1.0.0 the package version **aligns its MAJOR.MINOR with the pi release lin
   the `SessionEntry` union, expanded `TurnEndEvent`, removed `shouldStopAfterTurn`,
   `SessionManager` canonical for provider context. The package touches none of them.
 - Since 0.10.0, this package uses native MCP via `pi.registerMcpServer()`.
-  Both servers are session-scoped, visible in `/mcp` with source "extension".
+  The server is session-scoped, visible in `/mcp` with source "extension".
   Server names and tool IDs:
-  - `nan-search` → tools: `mcp__nan_search__web_search`
-    (official remote, HTTP, `Authorization: Bearer <key>` header)
   - `nan-media` → tools: `mcp__nan_media__generate_image/edit_image/text_to_speech/list_voices/speech_to_text/list_models/embed_text/rerank_documents/get_quota`
     (community stdio, `npx -y nan-mcp-server@1.3.0`, 120s timeout; 9 tools as of 1.3.0)
-  - `exposure: "direct"` on both — tools are declared to the model.
+  - `exposure: "direct"` — tools are declared to the model.
   - User `mcp.json` entries with the same name take precedence.
   - `/nan-mcp enable/disable` calls `pi.registerMcpServer()` / `pi.unregisterMcpServer()` directly.
-  - Missing `NAN_API_KEY` at load: web-search server NOT registered (console.warn).
+  - Missing `NAN_API_KEY` at load: media server NOT registered (console.warn).
+  - **`nan-search` was REMOVED in 1.2.1.** NaN's official remote MCP server
+    (`https://api.nan.builders/mcp`) now exposes ZERO tools: `initialize` returns an
+    empty `capabilities.tools` and `tools/list` returns `{"tools":[]}` (verified with a
+    valid key on 2026-10-15), and NaN deleted every MCP mention from its docs (the old
+    `/docs/mcp` redirects to `/docs/agent-setup`). The `web_search` tool no longer
+    exists anywhere in NaN's surface. Users must bring their own `web_search`/fetch MCP
+    server in `mcp.json` (README documents this). `NAN_MCP_TOOLS` is gone with it.
   NaN integration facts remain:
   - pi >=0.99.2 sanitizes MCP tool/namespace names by replacing every character except
-    `[A-Za-z0-9_]` with `"_"` (0.99.0–0.99.1 kept `-`). So `mcp__nan-search__web_search`
-    became `mcp__nan_search__web_search` and `mcp__nan-media__*` became
-    `mcp__nan_media__*`. Server names differing only in `-`/`_` now collide
-    (`nan-search` and `nan-media` do not collide, they differ in more than one character).
+    `[A-Za-z0-9_]` with `"_"` (0.99.0–0.99.1 kept `-`). So `mcp__nan-media__*` keeps its
+    underscore form from 0.99.2 onward. (The removed `nan-search` server used to
+    demonstrate the hyphen→underscore rename; do not rely on it.)
   - pi 0.99.2+/1.0 accept `McpServerConfig.description` (system-prompt listing plus
     tool-search ranking); `validateMcpServerConfig` in 0.99.0–0.99.1 ignores unknown
     keys, so passing `description` stays compatible.
   - NaN's official remote MCP server: `https://api.nan.builders/mcp` (host
     root, NOT /v1; JSON-RPC 2.0 over streamable HTTP, stateless; same `sk-`
     key, shared rate limit/quota). Spec: https://nan.builders/openapi.json
-    (tag "MCP"). Currently exposes `web_search`.
+    (tag "MCP"). **Currently exposes no tools** (see the removal note above).
   - Community `nan-mcp-server` (https://github.com/luciferfran/nan-mcp-server):
     stdio MCP server, version-pinned via NAN_MEDIA_MCP_VERSION (default 1.3.0)
     or full command override via NAN_MEDIA_MCP_COMMAND. Tools (1.3.0): generate_image,

package/README.es.md

@@ -1,11 +1,12 @@
 # @gtrabanco/pi-nan-provider
 
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
-[![Version](https://img.shields.io/badge/version-0.11.0-blue)](https://github.com/gtrabanco/pi-nan-provider/releases)
+[![Version](https://img.shields.io/badge/version-1.2.1-blue)](https://github.com/gtrabanco/pi-nan-provider/releases)
+[![Built with NaN](https://nan.builders/badge/built-with-nan-compact.svg)](https://cloud.nan.builders/r/7GK06FX8)
 
-[NaN Builders](https://nan.builders) model provider + MCP nativo para [pi](https://github.com/earendil-works/pi). 
+[NaN Builders](https://cloud.nan.builders/r/7GK06FX8) model provider + MCP nativo para [pi](https://github.com/earendil-works/pi). 
 
-Registra el proveedor `nan` vía `pi.registerProvider()` usando la API OpenAI-compatible de NaN (`https://api.nan.builders/v1`), y registra servidores MCP nativos con `pi.registerMcpServer()`.
+Registra el proveedor `nan` vía `pi.registerProvider()` usando la API OpenAI-compatible de NaN (`https://api.nan.builders/v1`), y registra el servidor MCP de media de la comunidad con `pi.registerMcpServer()`.
 
 ---
 
@@ -101,22 +102,48 @@ Consigue una clave en la [plataforma NaN](https://cloud.nan.builders/r/7GK06FX8)
 
 ## 🔌 MCP nativo
 
-Dado que [pi 0.99.0 incluye un cliente MCP integrado](https://github.com/earendil-works/pi/blob/main/docs/usage.md), este paquete migra sus puentes a MCP nativo (requiere `pi >=0.99, <2` — pi 0.99 hasta 1.0 son compatibles; el rango peer se amplió a `<2` en 0.11.0).
+Dado que [pi 0.99.0 incluye un cliente MCP integrado](https://github.com/earendil-works/pi/blob/main/docs/usage.md), este paquete usa MCP nativo (requiere `pi >=0.99, <2` — pi 0.99 hasta 1.2 son compatibles; el rango peer se amplió a `<2` en 0.11.0).
 
-Ambos puentes están **activados por defecto** (por sesión, visibles en `/mcp`). Usa `/nan-mcp` para gestionarlos.
+El puente de media está **activado por defecto** (por sesión, visible en `/mcp`). Usa `/nan-mcp` para gestionarlo.
 
-> [!TIP]
-> ¿Prefieres configurar los servidores MCP de NaN tú mismo? Desde pi 0.99.2/1.0, un servidor MCP HTTP en el `mcp.json` global puede autenticarse con tu token de `/login nan` en vez de una clave copiada: `{ "auth": { "provider": "nan" } }` (solo en el `mcp.json` global; requiere `https`). El registro integrado de `nan-search` sigue usando `NAN_API_KEY`/la credencial almacenada.
+> [!WARNING]
+> **El servidor MCP remoto oficial de NaN ya no expone ninguna herramienta.** Hasta 1.2.0 este paquete
+> incluía un puente `nan-search` apuntando a `https://api.nan.builders/mcp`, que exponía
+> `web_search`. Ese servidor ahora responde a `initialize` con `capabilities.tools` vacío y a
+> `tools/list` con `{"tools":[]}` — verificado con una clave válida el 2026-10-15 — y NaN eliminó toda
+> mención a MCP de su documentación (la antigua página `/docs/mcp` ahora redirige a `/docs/agent-setup`).
+> El puente se eliminó en **1.2.1** porque registrar un servidor que no expone nada solo produce un
+> servidor sin herramientas en `/mcp`.
+>
+> **Trae tu propio `web_search` y fetch.** Instala un servidor MCP que los proporcione (p. ej. el par
+> `fetch` + `brave-search` de los servidores MCP oficiales, o cualquier otro servidor MCP de
+> búsqueda/fetch) y decláralo en tu `mcp.json` global:
+>
+> ```json
+> {
+>   "mcpServers": {
+>     "fetch": { "command": "uvx", "args": ["mcp-server-fetch"] },
+>     "web-search": {
+>       "command": "npx",
+>       "args": ["-y", "@modelcontextprotocol/server-brave-search"],
+>       "env": { "BRAVE_API_KEY": "tu-clave" }
+>     }
+>   }
+> }
+> ```
+>
+> Vuelve a comprobar `https://api.nan.builders/mcp` periódicamente: si NaN publica herramientas otra
+> vez, este paquete puede restaurar el puente.
 
 ### 🛠️ Comando de Gestión: `/nan-mcp`
 
 | Comando | Efecto |
 | :--- | :--- |
-| `/nan-mcp status` | Muestra el estado actual de ambos puentes y la resolución de la clave API. |
-| `/nan-mcp enable [target]` | Activa `web-search` o `nan-mcp-server` (persiste). |
-| `/nan-mcp disable [target]` | Desactiva un puente de forma persistente. |
+| `/nan-mcp status` | Muestra el estado del puente de media y la resolución de la clave API. |
+| `/nan-mcp enable [target]` | Activa `nan-mcp-server` (persiste). |
+| `/nan-mcp disable [target]` | Lo desactiva de forma persistente. |
 
-Ambos puentes resuelven la credencial almacenada de `/login nan` (almacenada → env). Si ninguna se resuelve, el puente no se registra y se muestra un aviso en la salida de estado.
+El puente resuelve la credencial almacenada de `/login nan` (almacenada → env). Si ninguna se resuelve, el servidor no se registra y se muestra un aviso en la salida de estado.
 
 > [!NOTE]
 > El registro ocurre cuando se carga la extensión. Si ejecutas `/login nan` **después** de que la sesión haya empezado, la factoría ya se ejecutó — usa `/reload` (o `/nan-mcp enable`) para registrar los puentes sin reiniciar pi.
@@ -171,15 +198,7 @@ conector con `pi config` → Built-in extensions → `mcp`.
 
 ---
 
-### 1. Servidor MCP oficial de NaN
-*Puente oficial para herramientas remotas vía [https://api.nan.builders/mcp](https://nan.builders/docs/api).*
-
-- **`mcp__nan_search__web_search(query, ...)`**: Realiza búsquedas web a través del gateway de NaN.
-  > pi 0.99.0–0.99.1 usaba la forma con guiones (`mcp__nan-search__web_search`); pi 0.99.2+ sanitiza
-  > los nombres de herramientas a solo `[A-Za-z0-9_]`, así que los guiones se convirtieron en
-  > guiones bajos. La forma con guiones bajos aplica desde 0.99.2 hasta pi 1.0.
-
-### 2. Servidor MCP de Media (Comunidad)
+### Servidor MCP de Media (Comunidad)
 *Conecta [`nan-mcp-server`](https://github.com/luciferfran/nan-mcp-server) mediante un cliente stdio local mínimo.*
 
 - **Por sesión**: El servidor se conecta al registrarse (eager). Aparece en `/mcp` con fuente "extension".
@@ -197,10 +216,9 @@ conector con `pi config` → Built-in extensions → `mcp`.
 | `mcp__nan_media__rerank_documents` | Reordenación de documentos (Qwen3-Reranker) |
 | `mcp__nan_media__get_quota` | Cuota de tokens por modelo (usado / tope / restante / reinicio) |
 
-> pi 0.99.0–0.99.1 usaba las formas con guiones (`mcp__nan-search__web_search`,
-> `mcp__nan-media__*`); pi 0.99.2+ sanitiza los nombres de herramientas a solo
-> `[A-Za-z0-9_]`, así que los guiones se convirtieron en guiones bajos. La forma
-> con guiones bajos aplica desde 0.99.2 hasta pi 1.0.
+> pi 0.99.0–0.99.1 usaba la forma con guiones (`mcp__nan-media__*`); pi 0.99.2+ sanitiza los
+> nombres de herramientas a solo `[A-Za-z0-9_]`, así que los guiones se convirtieron en guiones
+> bajos. La forma con guiones bajos aplica desde 0.99.2 hasta pi 1.2.
 
 #### 🔧 Configuración del Puente de Media
 
@@ -210,7 +228,6 @@ conector con `pi config` → Built-in extensions → `mcp`.
 | `NAN_MEDIA_MCP_VERSION` | `1.3.0` | Versión del servidor fijada (recomendado). |
 | `NAN_MEDIA_MCP_COMMAND` | — | Override del comando personalizado. |
 | `NAN_MEDIA_MCP_TIMEOUT_MS` | `120000` | Timeout por llamada. |
-| `NAN_MCP_TOOLS` | — | Override para el puente oficial (`0` para desactivar). |
 
 #### 🤖 Detección Automática de Actualizaciones
 
@@ -384,4 +401,4 @@ bun test                  # Ejecutar todos los tests
 bun run typecheck         # Ejecutar typechecking
 ```
 
-*Las versiones siguen semver estricto. CI publica automáticamente al hacer merge a `main`.*
+*Las versiones siguen semver estricto. CI publica automáticamente al hacer merge a `main`.*

package/README.md

@@ -1,11 +1,12 @@
 # @gtrabanco/pi-nan-provider
 
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
-[![Version](https://img.shields.io/badge/version-0.11.0-blue)](https://github.com/gtrabanco/pi-nan-provider/releases)
+[![Version](https://img.shields.io/badge/version-1.2.1-blue)](https://github.com/gtrabanco/pi-nan-provider/releases)
+[![Built with NaN](https://nan.builders/badge/built-with-nan-compact.svg)](https://cloud.nan.builders/r/7GK06FX8)
 
-[NaN Builders](https://nan.builders) model provider + native MCP servers for [pi](https://github.com/earendil-works/pi). 
+[NaN Builders](https://cloud.nan.builders/r/7GK06FX8) model provider + a native MCP server for [pi](https://github.com/earendil-works/pi). 
 
-Registers the `nan` provider via `pi.registerProvider()` using NaN's OpenAI-compatible API (`https://api.nan.builders/v1`), and registers MCP servers via pi's native `pi.registerMcpServer()`.
+Registers the `nan` provider via `pi.registerProvider()` using NaN's OpenAI-compatible API (`https://api.nan.builders/v1`), and registers the community media MCP server via pi's native `pi.registerMcpServer()`.
 
 ---
 
@@ -99,24 +100,50 @@ You can override any model's `compat` per-model in `~/.pi/agent/models.json` (pi
 
 Get a key from the [NaN platform](https://cloud.nan.builders/r/7GK06FX8) (user settings → API Keys; referral link).
 
-## 🔌 Native MCP Servers
+## 🔌 Native MCP Server
 
-Since [pi 0.99.0 ships a built-in MCP client](https://github.com/earendil-works/pi/blob/main/docs/usage.md), this package migrates its bridges to native MCP (requires `pi >=0.99, <2` — pi 0.99 through 1.0 are supported; the peer range was widened to `<2` in 0.11.0).
+Since [pi 0.99.0 ships a built-in MCP client](https://github.com/earendil-works/pi/blob/main/docs/usage.md), this package bridges to native MCP (requires `pi >=0.99, <2` — pi 0.99 through 1.2 are supported; the peer range was widened to `<2` in 0.11.0).
 
-Both bridges are **enabled by default** (session-scoped, visible in `/mcp`). Use `/nan-mcp` to manage them.
+The media bridge is **enabled by default** (session-scoped, visible in `/mcp`). Use `/nan-mcp` to manage it.
 
-> [!TIP]
-> Prefer to configure NaN's MCP servers yourself? Since pi 0.99.2/1.0 an HTTP MCP server in the global `mcp.json` can authenticate with your `/login nan` token instead of a copied key: `{ "auth": { "provider": "nan" } }` (global `mcp.json` only; `https` required). The bundled `nan-search` registration keeps using `NAN_API_KEY`/the stored credential.
+> [!WARNING]
+> **NaN's official remote MCP server no longer exposes any tool.** Until 1.2.0 this package shipped a
+> `nan-search` bridge pointing at `https://api.nan.builders/mcp`, which exposed
+> `web_search`. That server now answers `initialize` with an empty `capabilities.tools` and
+> `tools/list` with `{"tools":[]}` — verified with a valid key on 2026-10-15 — and NaN removed every
+> MCP mention from its documentation (the old `/docs/mcp` page now redirects to `/docs/agent-setup`).
+> The bridge was removed in **1.2.1** because registering a server that exposes nothing only produces
+> a tool-less server in `/mcp`.
+>
+> **Bring your own `web_search` and fetch.** Install an MCP server that provides them (e.g. the
+> `fetch` + `brave-search` pair for the official MCP servers, or any other search/fetch MCP server)
+> and declare it in your global `mcp.json`:
+>
+> ```json
+> {
+>   "mcpServers": {
+>     "fetch": { "command": "uvx", "args": ["mcp-server-fetch"] },
+>     "web-search": {
+>       "command": "npx",
+>       "args": ["-y", "@modelcontextprotocol/server-brave-search"],
+>       "env": { "BRAVE_API_KEY": "your-key" }
+>     }
+>   }
+> }
+> ```
+>
+> Re-check `https://api.nan.builders/mcp` periodically: if NaN publishes tools again, this package can
+> restore the bridge.
 
 ### 🛠️ Management Command: `/nan-mcp`
 
 | Command | Effect |
 | :--- | :--- |
-| `/nan-mcp status` | Shows current state of both bridges and API key resolution. |
-| `/nan-mcp enable [target]` | Enables `web-search` or `nan-mcp-server` (persisted). |
-| `/nan-mcp disable [target]` | Disables a bridge persistently. |
+| `/nan-mcp status` | Shows the media bridge state and API key resolution. |
+| `/nan-mcp enable [target]` | Enables `nan-mcp-server` (persisted). |
+| `/nan-mcp disable [target]` | Disables it persistently. |
 
-Both bridges resolve the stored `/login nan` credential (stored → env). If neither resolves, the bridge does not register and a warning is shown in the status output.
+The bridge resolves the stored `/login nan` credential (stored → env). If neither resolves, the server does not register and a warning is shown in the status output.
 
 > [!NOTE]
 > Registration happens when the extension loads. If you run `/login nan` **after** the session started, the factory has already run — run `/reload` (or `/nan-mcp enable`) to register the bridges without restarting pi.
@@ -168,15 +195,7 @@ registering a server that can never connect. To get MCP in the CLI, enable the c
 
 ---
 
-### 1. Official NaN MCP Server
-*Official remote MCP server registered natively via `pi.registerMcpServer()`.*
-
-- **`mcp__nan_search__web_search(query, ...)`**: Performs web searches through NaN's gateway.
-  > pi 0.99.0–0.99.1 used the hyphenated form (`mcp__nan-search__web_search`); pi 0.99.2+ sanitizes
-  > tool names to `[A-Za-z0-9_]` only, so hyphens became underscores. The underscore form applies
-  > from 0.99.2 onward through pi 1.0.
-
-### 2. Community Media MCP Server
+### Community Media MCP Server
 *Bridges [`nan-mcp-server`](https://github.com/luciferfran/nan-mcp-server) via a minimal local stdio client.*
 
 - **Session-scoped**: The server connects at registration time (eager). Appears in `/mcp` with source "extension".
@@ -194,10 +213,9 @@ registering a server that can never connect. To get MCP in the CLI, enable the c
 | `mcp__nan_media__rerank_documents` | Document reranking (Qwen3-Reranker) |
 | `mcp__nan_media__get_quota` | Per-model token quota (used / cap / remaining / reset) |
 
-> pi 0.99.0–0.99.1 used the hyphenated forms (`mcp__nan-search__web_search`,
-> `mcp__nan-media__*`); pi 0.99.2+ sanitizes tool names to `[A-Za-z0-9_]` only,
-> so hyphens became underscores. The underscore form applies from 0.99.2 onward
-> through pi 1.0.
+> pi 0.99.0–0.99.1 used the hyphenated form (`mcp__nan-media__*`); pi 0.99.2+ sanitizes tool
+> names to `[A-Za-z0-9_]` only, so hyphens became underscores. The underscore form applies from
+> 0.99.2 onward through pi 1.2.
 
 #### 🔧 Media Bridge Configuration
 
@@ -207,7 +225,6 @@ registering a server that can never connect. To get MCP in the CLI, enable the c
 | `NAN_MEDIA_MCP_VERSION` | `1.3.0` | Pinned server version (recommended). |
 | `NAN_MEDIA_MCP_COMMAND` | — | Custom command override. |
 | `NAN_MEDIA_MCP_TIMEOUT_MS` | `120000` | Per-call timeout. |
-| `NAN_MCP_TOOLS` | — | Override for the official bridge (`0` to disable). |
 
 #### 🤖 Automated Update Detection
 
@@ -381,4 +398,4 @@ bun test                  # Run all tests
 bun run typecheck         # Run typechecking
 ```
 
-*Releases follow strict semver. CI publishes automatically on merge to `main`.*
+*Releases follow strict semver. CI publishes automatically on merge to `main`.*

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@gtrabanco/pi-nan-provider",
-	"version": "1.2.0",
-	"description": "NaN Builders (api.nan.builders) model provider for pi - OpenAI-compatible registration with a models.dev-generated fallback, tier-aware live catalog, and MCP bridges (official web search + optional community media server)",
+	"version": "1.2.1",
+	"description": "NaN Builders (api.nan.builders) model provider for pi - OpenAI-compatible registration with a models.dev-generated fallback, tier-aware live catalog, and an optional community media MCP bridge",
 	"keywords": [
 		"pi",
 		"pi-package",

package/scripts/models.generated.ts

@@ -1,7 +1,7 @@
 // This file is auto-generated by scripts/generate-models.ts
 // Do not edit manually — run `bun run generate-models` to update.
 //
-// Source: https://models.dev/api.json (provider "nan"), fetched 2026-10-14T15:59:01.497Z
+// Source: https://models.dev/api.json (provider "nan"), fetched 2026-10-16T17:43:45.590Z
 // Provenance: every contextWindow/maxTokens/input/cost value traces to
 // models.dev or to the per-entry notes below. Nothing is invented; entries
 // models.dev documents incompletely are omitted and flagged instead.
@@ -459,7 +459,7 @@ export const NAN_GENERATED_MODELS: readonly GeneratedModelEntry[] = [
 export const GENERATED_CATALOG_META = {
 	source: "https://models.dev/api.json",
 	modelsDevProvider: "nan",
-	fetchedAt: "2026-10-14T15:59:01.497Z",
+	fetchedAt: "2026-10-16T17:43:45.590Z",
 	modelCount: 6,
 	models: ["deepseek-v4-flash","gemma4","glm5.3-flash","mimo-v2.6-flash","qwen3.6","qwen3.8-flash"],
 	notes: [

package/src/commands.ts

@@ -1,24 +1,19 @@
 /**
- * `/nan-mcp` — slash command configuring both native MCP servers this
+ * `/nan-mcp` — slash command configuring the native MCP server this
  * package registers:
  *
- * - `nan-search` — the official NaN remote MCP server (api.nan.builders/mcp),
- *   exposing `mcp__nan_search__web_search` (pi >=0.99.2). Default: enabled.
- *   (pi 0.99.0–0.99.1 used the hyphenated form `mcp__nan-search__web_search`.)
  * - `nan-media` — the community stdio media server (flux-2-klein / kokoro /
  *   whisper), exposing `mcp__nan_media__generate_image` etc. Default: enabled.
  *   (pi 0.99.0–0.99.1 used the hyphenated form `mcp__nan-media__*`.)
  *
- * Both are session-scoped native servers (visible in /mcp, source "extension").
- * /nan-mcp enables/disables them via pi.registerMcpServer / pi.unregisterMcpServer,
+ * The server is session-scoped (visible in /mcp, source "extension").
+ * /nan-mcp enables/disables it via pi.registerMcpServer / pi.unregisterMcpServer,
  * persisting the toggle in nan-provider.json.
  *
- * Targets accept aliases: `web-search` (`search`, `web_search`, `official`,
- * `nan-web-search`) and `nan-mcp-server` (`media`, `media-mcp`, `nan-media`).
- * Explicit env vars (NAN_MCP_TOOLS, NAN_MEDIA_MCP) override the persisted
- * toggles for the session.
+ * Target aliases: `nan-mcp-server` (`media`, `media-mcp`, `nan-media`).
+ * Explicit env var (NAN_MEDIA_MCP) overrides the persisted toggle for the session.
  *
- * Native behavior changes from the old bridge:
+ * Native behavior:
  * - `disable` IMMEDIATELY hides tools (unregisterMcpServer disconnects the
  *   server; the MCP extension hides tools when disconnected).
  * - `enable` IMMEDIATELY registers the server for the current session.
@@ -29,55 +24,31 @@
 
 import type { ExtensionAPI, ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 import { mediaMcpCommand, mediaMcpEnabled, mediaMcpSource, mediaMcpEnvExplicit, mediaMcpEnvTruthy, mediaMcpTimeoutSec } from "./mcp/media-server.ts";
-import { webSearchBridgeEnabled, webSearchBridgeSource, mcpToolsEnvExplicit, mcpToolsDisabled } from "./mcp/api-key.ts";
 import { NAN_API_KEY_ENV, tryResolveNanApiKeyViaRegistry, resolveStoredNanApiKey } from "./mcp/api-key.ts";
 import { NAN_STATE_FILE, MCP_SERVER_NAMES, readBridgeState, writeBridgeState, type BridgeKey, readState, writeState } from "./mcp/state.ts";
 import { connectorMissingMessage, hasMcpConnector } from "./mcp/host-support.ts";
 
 const USAGE =
-	"Usage: /nan-mcp [status] · /nan-mcp enable [web-search|nan-mcp-server] · /nan-mcp disable [web-search|nan-mcp-server]";
+	"Usage: /nan-mcp [status] · /nan-mcp enable [nan-mcp-server] · /nan-mcp disable [nan-mcp-server]";
 
 /** Canonical bridge targets with aliases. */
 const TARGETS: Record<string, BridgeKey> = {
-	"web-search": "webSearch",
-	search: "webSearch",
-	web_search: "webSearch",
-	official: "webSearch",
-	"nan-web-search": "webSearch",
 	"nan-mcp-server": "mediaMcp",
 	media: "mediaMcp",
 	"media-mcp": "mediaMcp",
 	"nan-media": "mediaMcp",
 };
 
-function targetName(bridge: BridgeKey): string {
-	return bridge === "webSearch" ? "web-search" : "nan-mcp-server";
+function envOverrideLabel(): string {
+	return `env NAN_MEDIA_MCP=${process.env.NAN_MEDIA_MCP ?? ""} (overrides persisted)`;
 }
 
-function envOverrideLabel(bridge: BridgeKey): string {
-	return bridge === "webSearch"
-		? `env NAN_MCP_TOOLS=${process.env.NAN_MCP_TOOLS ?? ""} (overrides persisted)`
-		: `env NAN_MEDIA_MCP=${process.env.NAN_MEDIA_MCP ?? ""} (overrides persisted)`;
-}
-
-function sourceLabel(bridge: BridgeKey, source: "env" | "persisted" | "default"): string {
-	if (source === "env") return envOverrideLabel(bridge);
+function sourceLabel(source: "env" | "persisted" | "default"): string {
+	if (source === "env") return envOverrideLabel();
 	if (source === "persisted") {
-		return `persisted in <agentDir>/${NAN_STATE_FILE} (${targetName(bridge)}: ${readBridgeState(bridge)})`;
+		return `persisted in <agentDir>/${NAN_STATE_FILE} (nan-mcp-server: ${readBridgeState("mediaMcp")})`;
 	}
-	return "default (both bridges are enabled by default)";
-}
-
-/** Resolve a bridge key to its native server name. */
-function serverName(bridge: BridgeKey): string {
-	return MCP_SERVER_NAMES[bridge];
-}
-
-/** Describe the bridge in the status message. */
-function bridgeDescription(bridge: BridgeKey): string {
-	return bridge === "webSearch"
-		? "web-search bridge (official NaN MCP → mcp__nan_search__web_search)"
-		: "nan-mcp-server bridge (community media MCP → mcp__nan_media__generate_image/edit_image/text_to_speech/list_voices/speech_to_text)";
+	return "default (bridge is enabled by default)";
 }
 
 /** Check if a native server of this name is currently registered. */
@@ -89,39 +60,27 @@ function nativeServerRegistered(pi: ExtensionAPI, name: string): boolean {
 	}
 }
 
-/** Status message listing both bridges' gate state and native registration.
+/** Status message listing the media bridge gate state and native registration.
  * `ctx` is the command context (provides modelRegistry for key lookup).
  */
 async function statusMessage(pi: ExtensionAPI, ctx: ExtensionCommandContext): Promise<string> {
 	const lines: string[] = [];
 
 	if (!hasMcpConnector(pi)) {
-		lines.push(connectorMissingMessage([MCP_SERVER_NAMES.webSearch, MCP_SERVER_NAMES.mediaMcp]));
+		lines.push(connectorMissingMessage([MCP_SERVER_NAMES.mediaMcp]));
 	}
 
-	for (const bridge of ["webSearch" as BridgeKey, "mediaMcp" as BridgeKey]) {
-		const enabled = bridge === "webSearch" ? webSearchBridgeEnabled() : mediaMcpEnabled();
-		const source = bridge === "webSearch" ? webSearchBridgeSource() : mediaMcpSource();
-		const regStatus = nativeServerRegistered(pi, serverName(bridge)) ? "registered (native)" : "not registered";
-		lines.push(`${bridgeDescription(bridge)}: ${enabled ? "enabled" : "disabled"} — ${sourceLabel(bridge, source)}, ${regStatus}.`);
-
-		if (bridge === "webSearch") {
-			// Key status for web-search
-			const keyStatus = await resolveKeyStatus(ctx);
-			lines.push(`  API key: ${keyStatus}.`);
-		}
-		if (bridge === "mediaMcp") {
-			lines.push(`  Media spawn command: ${mediaMcpCommand().join(" ")}.`);
-		}
-	}
-
-	lines.push("Configure with /nan-mcp enable|disable [web-search|nan-mcp-server]; no target = both.");
+	const enabled = mediaMcpEnabled();
+	const source = mediaMcpSource();
+	const regStatus = nativeServerRegistered(pi, MCP_SERVER_NAMES.mediaMcp) ? "registered (native)" : "not registered";
+	lines.push(`nan-mcp-server bridge: ${enabled ? "enabled" : "disabled"} — ${sourceLabel(source)}, ${regStatus}.`);
+	lines.push(`  Media spawn command: ${mediaMcpCommand().join(" ")}.`);
+	lines.push(`  API key: ${await resolveKeyStatus(ctx)}.`);
+	lines.push("Configure with /nan-mcp enable|disable [nan-mcp-server]; no target for the media server.");
 	return lines.join("\n");
 }
 
-/** Check API key resolution status for web-search.
- * `ctx` is the command context (provides modelRegistry).
- */
+/** Check API key resolution status. */
 async function resolveKeyStatus(ctx: ExtensionCommandContext): Promise<string> {
 	const registryKey = await tryResolveNanApiKeyViaRegistry(ctx.modelRegistry);
 	const storedKey = resolveStoredNanApiKey();
@@ -130,37 +89,22 @@ async function resolveKeyStatus(ctx: ExtensionCommandContext): Promise<string> {
 	return "NOT SET — run /login nan or export NAN_API_KEY";
 }
 
-/** Parse an optional target argument; no target = both bridges. */
-function parseTarget(token: string | undefined): { bridges: BridgeKey[]; target?: string } | undefined {
-	if (token === undefined) return { bridges: ["webSearch", "mediaMcp"] };
-	const key = TARGETS[token.toLowerCase()];
-	if (!key) return undefined;
-	return { bridges: [key], target: token.toLowerCase() };
-}
-
-function describeBridges(bridges: BridgeKey[]): string {
-	const names = bridges.map((bridge) => targetName(bridge));
-	return names.length === 2 ? "both bridges" : names.join(" and ");
-}
-
-/**
- * Check if a bridge is effectively enabled (gate resolved).
- */
-function bridgeEffectivelyEnabled(bridge: BridgeKey): boolean {
-	return bridge === "webSearch" ? webSearchBridgeEnabled() : mediaMcpEnabled();
+/** Parse an optional target argument; no target = media server. */
+function parseTarget(token: string | undefined): string | undefined {
+	if (token === undefined) return "mediaMcp";
+	return TARGETS[token.toLowerCase()];
 }
 
 export function registerNanMcpCommand(pi: ExtensionAPI): void {
 	pi.registerCommand("nan-mcp", {
 		description:
-			"NaN MCP configuration: enable/disable/status for both native servers (official web-search + community media)",
+			"NaN MCP configuration: enable/disable/status for the community media server",
 		getArgumentCompletions: (argumentPrefix: string) => {
 			const prefix = argumentPrefix.trim().toLowerCase();
 			const items = [
-				{ value: "enable", label: "enable", description: "Enable a native server (or both) and persist it" },
-				{ value: "disable", label: "disable", description: "Disable a native server (or both) persistently" },
+				{ value: "enable", label: "enable", description: "Enable the media server and persist it" },
+				{ value: "disable", label: "disable", description: "Disable the media server persistently" },
 				{ value: "status", label: "status", description: "Show current server status and registration" },
-				{ value: "enable web-search", label: "enable web-search", description: "Enable the official NaN web-search server" },
 				{ value: "enable nan-mcp-server", label: "enable nan-mcp-server", description: "Enable the community media server" },
 			];
 			const filtered = items.filter((item) => item.value.startsWith(prefix));
@@ -181,20 +125,17 @@ export function registerNanMcpCommand(pi: ExtensionAPI): void {
 				if (parsed === undefined || rest.length > 0) {
 					ctx.ui.notify(
 						parsed === undefined
-							? `Unknown target "${[rawTarget, ...rest].filter(Boolean).join(" ")}". Targets: web-search, nan-mcp-server (or omit for both).`
+							? `Unknown target "${[rawTarget, ...rest].filter(Boolean).join(" ")}". Target: nan-mcp-server (or omit).`
 							: USAGE,
 						"warning",
 					);
 					return;
 				}
-				const { bridges, target } = parsed;
 				const enabled = subcommand === "enable";
+				const where = rawTarget ? `for "${rawTarget.toLowerCase()}"` : "for the media server";
 
-				for (const bridge of bridges) {
-					writeBridgeState(bridge, enabled);
-				}
+				writeBridgeState("mediaMcp", enabled);
 
-				const where = target ? `for "${target}"` : "for both bridges";
 				const persistence = `persisted in <agentDir>/${NAN_STATE_FILE}`;
 
 				// Without an extension that handles `mcp_servers_change` pi cannot connect the
@@ -203,84 +144,56 @@ export function registerNanMcpCommand(pi: ExtensionAPI): void {
 				// so it applies as soon as a connector (built-in `mcp`) is available.
 				if (enabled && !hasMcpConnector(pi)) {
 					ctx.ui.notify(
-						`Enabled ${describeBridges(bridges)} ${where}, ${persistence} — NOT registered. ` +
-							connectorMissingMessage(bridges.map(serverName)),
+						`Enabled ${where}, ${persistence} — NOT registered. ` +
+							connectorMissingMessage([MCP_SERVER_NAMES.mediaMcp]),
 						"warning",
 					);
 					return;
 				}
 
 				// Immediate native registration/unregistration.
-				for (const bridge of bridges) {
-					const name = serverName(bridge);
-					if (enabled) {
-						// Only register if gate allows it.
-						if (bridgeEffectivelyEnabled(bridge)) {
-							if (bridge === "webSearch") {
-								// Resolve key: stored credential → registry → env.
-								const registryKey = await tryResolveNanApiKeyViaRegistry(ctx.modelRegistry);
-								const storedKey = resolveStoredNanApiKey();
-								const apiKey = storedKey ?? registryKey ?? process.env[NAN_API_KEY_ENV];
-								if (apiKey) {
-									pi.registerMcpServer(name, {
-										type: "http",
-										url: "https://api.nan.builders/mcp",
-										headers: { Authorization: `Bearer ${apiKey}` },
-										exposure: "direct",
-									});
-								} else {
-									ctx.ui.notify(
-										`${NAN_API_KEY_ENV} is not set. Export it or run /login nan.`,
-										"warning",
-									);
-								}
-							} else {
-								// Resolve key for media: stored credential → registry → env.
-								const registryKey = await tryResolveNanApiKeyViaRegistry(ctx.modelRegistry);
-								const storedKey = resolveStoredNanApiKey();
-								const apiKey = storedKey ?? registryKey ?? process.env[NAN_API_KEY_ENV];
-								if (apiKey) {
-									const mediaArgs = mediaMcpCommand();
-									pi.registerMcpServer(name, {
-										type: "stdio",
-										command: mediaArgs[0]!,
-										args: mediaArgs.slice(1),
-										env: { [NAN_API_KEY_ENV]: apiKey },
-										exposure: "direct",
-										timeout: mediaMcpTimeoutSec(),
-									});
-								} else {
-									ctx.ui.notify(
-										`${NAN_API_KEY_ENV} is not set. Export it or run /login nan.`,
-										"warning",
-									);
-								}
-							}
+				const name = MCP_SERVER_NAMES.mediaMcp;
+				if (enabled) {
+					if (mediaMcpEnabled()) {
+						const registryKey = await tryResolveNanApiKeyViaRegistry(ctx.modelRegistry);
+						const storedKey = resolveStoredNanApiKey();
+						const apiKey = storedKey ?? registryKey ?? process.env[NAN_API_KEY_ENV];
+						if (apiKey) {
+							const mediaArgs = mediaMcpCommand();
+							pi.registerMcpServer(name, {
+								type: "stdio",
+								command: mediaArgs[0]!,
+								args: mediaArgs.slice(1),
+								env: { [NAN_API_KEY_ENV]: apiKey },
+								exposure: "direct",
+								timeout: mediaMcpTimeoutSec(),
+							});
+						} else {
+							ctx.ui.notify(
+								`${NAN_API_KEY_ENV} is not set. Export it or run /login nan.`,
+								"warning",
+							);
 						}
-					} else {
-						pi.unregisterMcpServer(name);
 					}
+				} else {
+					pi.unregisterMcpServer(name);
 				}
 
 				if (enabled) {
-					// Only claim success if servers were actually registered.
-					const allRegistered = bridges.every((b: BridgeKey) =>
-						nativeServerRegistered(pi, serverName(b)),
-					);
-					if (allRegistered) {
+					if (nativeServerRegistered(pi, name)) {
 						ctx.ui.notify(
-							`Enabled ${describeBridges(bridges)} ${where}, ${persistence}. Native servers registered for this session.`,
+							`Enabled ${where}, ${persistence}. Native server registered for this session.`,
 							"info",
 						);
 					} else {
 						ctx.ui.notify(
-							`Enabled ${describeBridges(bridges)} ${where}, ${persistence} — API key missing; servers not registered.`,
+							`Enabled ${where}, ${persistence} — API key missing; server not registered.`,
 							"warning",
 						);
 					}
 				} else {
 					ctx.ui.notify(
-						`Disabled ${describeBridges(bridges)} ${where}, ${persistence}. Native servers unregistered — tools hidden immediately.`,
+						`Disabled ${where}, ${persistence}. Native server unregistered — tools hidden immediately.`,
 						"warning",
 					);
 				}

package/src/index.ts

@@ -15,17 +15,13 @@
  *     0.84 alike), and the openai-completions streaming implementation is
  *     resolved dynamically — see provider-factory.ts for why.
  *
- *  2. MCP servers via pi's native registerMcpServer (pi >=0.99):
- *     - `nan-search` — the official NaN remote MCP server
- *       (https://api.nan.builders/mcp), exposing `mcp__nan_search__web_search`
- *       (pi >=0.99.2; 0.99.0-0.99.1 kept the hyphen: `mcp__nan-search__web_search`).
- *       Default: enabled. NAN_MCP_TOOLS=0 to disable.
+ *  2. MCP server via pi's native registerMcpServer (pi >=0.99):
  *     - `nan-media` — the community stdio media server
  *       (flux-2-klein / kokoro / whisper), exposing
  *       `mcp__nan_media__generate_image` etc. Default: enabled,
  *       NAN_MEDIA_MCP=0 to disable.
  *
- *     Both are session-scoped (visible in /mcp with source "extension").
+ *     It is session-scoped (visible in /mcp with source "extension").
  *     Exposure: `direct` — tools are declared to the model like built-ins.
  */
 
@@ -40,7 +36,7 @@ import {
 import { baselineModels } from "./fetch-models.ts";
 import { createNanCompatibleProvider, type OpenAICompatibleProviderConfig } from "./provider-factory.ts";
 import { PROVIDERS } from "./providers.ts";
-import { NAN_API_KEY_ENV, mcpToolsDisabled, mcpToolsEnvExplicit, resolveNanApiKey, tryResolveNanApiKeyViaRegistry, resolveStoredNanApiKey, NAN_MCP_TOOLS_ENV, webSearchBridgeEnabled } from "./mcp/api-key.ts";
+import { NAN_API_KEY_ENV, resolveNanApiKey, tryResolveNanApiKeyViaRegistry, resolveStoredNanApiKey } from "./mcp/api-key.ts";
 import { mediaMcpCommand, mediaMcpEnabled, mediaMcpEnvExplicit, mediaMcpEnvTruthy, mediaMcpTimeoutSec } from "./mcp/media-server.ts";
 import { registerMcpHostGuard } from "./mcp/host-support.ts";
 
@@ -95,26 +91,6 @@ async function registerProviderCompat(
 const NO_NATIVE_MCP_GUARD_MSG =
 	"pi-nan-provider 0.10+ requires pi >= 0.99 for MCP tools (native MCP); upgrade pi or stay on package 0.9.x";
 
-/** Register the official NaN web-search MCP server (session-scoped). */
-async function registerWebSearchMcpServer(pi: ExtensionAPI, apiKey: string | undefined): Promise<boolean> {
-	if (!webSearchBridgeEnabled()) return false;
-	if (!apiKey) {
-		console.warn(
-			"[pi-nan-provider] NAN_API_KEY is not set — web-search server not registered. " +
-				"Run `/login nan` in pi or export `NAN_API_KEY=<your-key>`.",
-		);
-		return false;
-	}
-	pi.registerMcpServer("nan-search", {
-		type: "http",
-		url: "https://api.nan.builders/mcp",
-		headers: { Authorization: `Bearer ${apiKey}` },
-		exposure: "direct",
-		description: "Web search through NaN's gateway (official NaN MCP server)",
-	});
-	return true;
-}
-
 /** Register the community media stdio MCP server (session-scoped). */
 function registerMediaMcpServer(pi: ExtensionAPI, apiKey: string | undefined): boolean {
 	if (!mediaMcpEnabled()) return false;
@@ -139,11 +115,11 @@ function registerMediaMcpServer(pi: ExtensionAPI, apiKey: string | undefined): b
 }
 
 /**
- * Register MCP servers via pi's native registerMcpServer.
+ * Register the MCP server via pi's native registerMcpServer.
  *
- * Session-scoped: servers appear in /mcp with source "extension", are
- * visible to the model (exposure: "direct"), and user mcp.json entries
- * with the same name take precedence.
+ * Session-scoped: the server appears in /mcp with source "extension", is
+ * visible to the model (exposure: "direct"), and a user mcp.json entry
+ * with the same name takes precedence.
  *
  * On pi <0.99 (registerMcpServer absent) this does NOT bridge — it
  * notifies once and skips (same loud-skip style as existing guards).
@@ -162,7 +138,6 @@ async function registerMcpServersNative(pi: ExtensionAPI): Promise<void> {
 	const storedKey = resolveStoredNanApiKey();
 	const apiKey = storedKey ?? process.env[NAN_API_KEY_ENV];
 
-	await registerWebSearchMcpServer(pi, apiKey);
 	registerMediaMcpServer(pi, apiKey);
 }
 

package/src/mcp/api-key.ts

@@ -1,8 +1,7 @@
-import { bridgeSource, resolveBridgeEnabled } from "./state.ts";
 import { readStoredCredential } from "@earendil-works/pi-coding-agent";
 
 /**
- * NaN API key resolution — shared across every surface (web search, media, usage).
+ * NaN API key resolution — shared across every surface (media, usage).
  *
  * Strategy: pi's stored credential (modelRegistry) wins → env var fallback.
  * Never logs or embeds the key beyond the Authorization header.
@@ -40,8 +39,6 @@ export function resolveStoredNanApiKey(): string | undefined {
 	}
 }
 
-/** Env var that overrides the official web_search bridge. */
-export const NAN_MCP_TOOLS_ENV = "NAN_MCP_TOOLS";
 /** Env var that overrides the media bridge. */
 export const NAN_MEDIA_MCP_ENV = "NAN_MEDIA_MCP";
 /** The NaN API key env var used everywhere. */
@@ -74,18 +71,6 @@ export async function tryResolveNanApiKeyViaRegistry(
 	}
 }
 
-/** Whether MCP tool registration is disabled via env (NAN_MCP_TOOLS=0|false|off). */
-export function mcpToolsDisabled(): boolean {
-	const value = process.env[NAN_MCP_TOOLS_ENV]?.trim().toLowerCase();
-	return value === "0" || value === "false" || value === "off";
-}
-
-/** Whether NAN_MCP_TOOLS is explicitly set (any value). */
-export function mcpToolsEnvExplicit(): boolean {
-	const value = process.env[NAN_MCP_TOOLS_ENV];
-	return value !== undefined && value.trim() !== "";
-}
-
 /** Whether NAN_MEDIA_MCP is explicitly set (any value). */
 export function mediaMcpEnvExplicit(): boolean {
 	const value = process.env[NAN_MEDIA_MCP_ENV];
@@ -97,13 +82,3 @@ export function mediaMcpEnvTruthy(): boolean {
 	const value = process.env[NAN_MEDIA_MCP_ENV]?.trim().toLowerCase();
 	return value === "1" || value === "true" || value === "on";
 }
-
-/** Source of the effective web-search enablement (env / persisted / default). */
-export function webSearchBridgeSource(): import("./state.ts").BridgeSource {
-	return bridgeSource("webSearch", mcpToolsEnvExplicit());
-}
-
-/** Whether the web-search bridge is enabled by gate (env → persisted → default). */
-export function webSearchBridgeEnabled(): boolean {
-	return resolveBridgeEnabled("webSearch", mcpToolsEnvExplicit(), !mcpToolsDisabled(), true);
-}

package/src/mcp/state.ts

@@ -17,8 +17,6 @@ import { getAgentDir } from "@earendil-works/pi-coding-agent";
 export const NAN_STATE_FILE = "nan-provider.json";
 
 export interface NanProviderState {
-	/** Persisted enablement of the official web_search MCP bridge. */
-	webSearch?: boolean;
 	/** Persisted enablement of the community nan-mcp-server media bridge. */
 	mediaMcp?: boolean;
 }
@@ -27,7 +25,6 @@ export type BridgeKey = keyof NanProviderState;
 
 /** Server name each bridge registers with `pi.registerMcpServer()`. Single source of truth. */
 export const MCP_SERVER_NAMES: Record<BridgeKey, string> = {
-	webSearch: "nan-search",
 	mediaMcp: "nan-media",
 };