fix: migrate toolbox config to v1.1.0 map-based format

BREAKING: requires MCP Toolbox for Databases v1.0.0+
- tools.yaml: kind-based documents -> map-based sources/tools format
- mcp.json: --tools-file -> --config flag
- README: update repo URL (genai-toolbox -> mcp-toolbox), min version v1.0.0+

Author: viragtripathi

README.md

@@ -17,7 +17,7 @@ Install from the [Cursor Marketplace](https://cursor.com/marketplace/cockroachdb
 
 This plugin connects to CockroachDB via MCP (Model Context Protocol). Choose the backend that fits your setup — see [MCP Backends](#mcp-backends) below.
 
-For the **MCP Toolbox** backend (available now), install [MCP Toolbox for Databases](https://github.com/googleapis/genai-toolbox) (v0.27.0+):
+For the **MCP Toolbox** backend (available now), install [MCP Toolbox for Databases](https://github.com/googleapis/mcp-toolbox) (v1.0.0+):
 
 ```bash
 brew install mcp-toolbox
@@ -43,15 +43,15 @@ For CockroachDB Cloud, find connection details in the [Cloud Console](https://co
 <details>
 <summary><strong>MCP Toolbox</strong> (self-hosted, any cluster) — Default</summary>
 
-Connect to any CockroachDB cluster (Cloud, self-hosted, local) via [MCP Toolbox for Databases](https://github.com/googleapis/genai-toolbox).
+Connect to any CockroachDB cluster (Cloud, self-hosted, local) via [MCP Toolbox for Databases](https://github.com/googleapis/mcp-toolbox).
 
-**Install:** `brew install mcp-toolbox` (v0.27.0+)
+**Install:** `brew install mcp-toolbox` (v1.0.0+)
 
-**Run (stdio, default):** `toolbox --tools-file tools.yaml --stdio`
+**Run (stdio, default):** `toolbox --config tools.yaml --stdio`
 
-**Run (HTTP):** `toolbox --tools-file tools.yaml --address 0.0.0.0 --port 5000`
+**Run (HTTP):** `toolbox --config tools.yaml --address 0.0.0.0 --port 5000`
 
-**Run (with web UI):** `toolbox --tools-file tools.yaml --ui --port 5000` (opens at `http://127.0.0.1:5000/ui`)
+**Run (with web UI):** `toolbox --config tools.yaml --ui --port 5000` (opens at `http://127.0.0.1:5000/ui`)
 
 > **Note:** Toolbox must successfully connect to CockroachDB on startup. If the database is unreachable (wrong host/port, env vars not set), the server will hang during initialization and the UI will be stuck on "Fetching tools...". Make sure your `COCKROACHDB_*` environment variables are set and the database is accessible before starting.
 </details>
@@ -151,7 +151,7 @@ See the [quickstart guide](https://www.cockroachlabs.com/docs/cockroachcloud/con
 
 | Backend                    | Status      | Transport       | Use Case                                                                                                                          |
 |----------------------------|-------------|-----------------|-----------------------------------------------------------------------------------------------------------------------------------|
-| `cockroachdb-toolbox`      | Active      | stdio           | Any CockroachDB cluster via [MCP Toolbox](https://github.com/googleapis/genai-toolbox)                                            |
+| `cockroachdb-toolbox`      | Active      | stdio           | Any CockroachDB cluster via [MCP Toolbox](https://github.com/googleapis/mcp-toolbox)                                            |
 | `cockroachdb-cloud`        | Active      | Streamable HTTP | [Managed MCP Server](https://www.cockroachlabs.com/blog/cockroachdb-ai-agents-managed-mcp-server/) — CockroachDB Cloud (OAuth/API key) |
 | `cockroachdb-toolbox-http` | Available   | Streamable HTTP | MCP Toolbox remote/multi-user via HTTP                                                                                            |
 
@@ -240,7 +240,7 @@ This repo uses [Release Please](https://github.com/googleapis/release-please) fo
 - [Cloud MCP Quickstart Guide](https://www.cockroachlabs.com/docs/cockroachcloud/connect-to-the-cockroachdb-cloud-mcp-server)
 - [ccloud CLI for AI Agents Blog Post](https://www.cockroachlabs.com/blog/cockroachdb-ai-agents-cli-database-automation/)
 - [ccloud CLI Reference](https://www.cockroachlabs.com/docs/cockroachcloud/ccloud-get-started)
-- [MCP Toolbox for Databases](https://github.com/googleapis/genai-toolbox)
+- [MCP Toolbox for Databases](https://github.com/googleapis/mcp-toolbox)
 - [Report Issues](https://github.com/cockroachdb/cursor-plugin/issues)
 
 ## License

mcp.json

@@ -2,7 +2,7 @@
   "mcpServers": {
     "cockroachdb-toolbox": {
       "command": "toolbox",
-      "args": ["--tools-file", "tools.yaml", "--stdio"],
+      "args": ["--config", "tools.yaml", "--stdio"],
       "env": {
         "COCKROACHDB_HOST": "${COCKROACHDB_HOST}",
         "COCKROACHDB_PORT": "${COCKROACHDB_PORT}",
@@ -15,7 +15,7 @@
     "cockroachdb-toolbox-http": {
       "type": "http",
       "url": "http://127.0.0.1:5000/mcp",
-      "_comment": "Streamable HTTP transport — run 'toolbox --tools-file tools.yaml' first, then connect via this URL"
+      "_comment": "Streamable HTTP transport — run 'toolbox --config tools.yaml' first, then connect via this URL"
     },
     "cockroachdb-cloud": {
       "type": "http",

tools.yaml

@@ -1,52 +1,42 @@
-kind: sources
-name: crdb-source
-type: cockroachdb
-host: ${COCKROACHDB_HOST}
-port: "${COCKROACHDB_PORT:26257}"
-database: ${COCKROACHDB_DATABASE}
-user: ${COCKROACHDB_USER}
-password: ${COCKROACHDB_PASSWORD}
-maxRetries: 5
-retryBaseDelay: 500ms
-readOnlyMode: true
-enableWriteMode: false
-maxRowLimit: 1000
-queryTimeoutSec: 30
-queryParams:
-  sslmode: ${COCKROACHDB_SSLMODE:require}
-  application_name: cockroachdb-cursor-plugin
-
----
-
-kind: tools
-name: cockroachdb-execute-sql
-type: cockroachdb-execute-sql
-source: crdb-source
-description: |
-  Execute ad-hoc SQL statements against a CockroachDB database.
-  Use this for any SQL: SELECT queries, DDL statements (CREATE, ALTER, DROP),
-  and DML statements (INSERT, UPDATE, DELETE).
-
----
-
-kind: tools
-name: cockroachdb-list-schemas
-type: cockroachdb-list-schemas
-source: crdb-source
-description: |
-  List all schemas in the connected CockroachDB database.
-  Returns schema names and metadata. Use this as the first step
-  when exploring an unfamiliar database.
-
----
-
-kind: tools
-name: cockroachdb-list-tables
-type: cockroachdb-list-tables
-source: crdb-source
-description: |
-  List all tables in a CockroachDB database with detailed schema information
-  including column names, data types, constraints, and indexes.
-  Use this to understand table structure before writing queries.
-
-
+sources:
+  crdb-source:
+    type: cockroachdb
+    host: ${COCKROACHDB_HOST:localhost}
+    port: "${COCKROACHDB_PORT:26257}"
+    user: ${COCKROACHDB_USER:root}
+    password: ${COCKROACHDB_PASSWORD:}
+    database: ${COCKROACHDB_DATABASE:defaultdb}
+    maxRetries: 5
+    retryBaseDelay: 500ms
+    readOnlyMode: true
+    enableWriteMode: false
+    maxRowLimit: 1000
+    queryTimeoutSec: 30
+    queryParams:
+      sslmode: ${COCKROACHDB_SSLMODE:require}
+      application_name: cockroachdb-cursor-plugin
+
+tools:
+  cockroachdb-execute-sql:
+    type: cockroachdb-execute-sql
+    source: crdb-source
+    description: |
+      Execute ad-hoc SQL statements against a CockroachDB database.
+      Use this for any SQL: SELECT queries, DDL statements (CREATE, ALTER, DROP),
+      and DML statements (INSERT, UPDATE, DELETE).
+
+  cockroachdb-list-schemas:
+    type: cockroachdb-list-schemas
+    source: crdb-source
+    description: |
+      List all schemas in the connected CockroachDB database.
+      Returns schema names and metadata. Use this as the first step
+      when exploring an unfamiliar database.
+
+  cockroachdb-list-tables:
+    type: cockroachdb-list-tables
+    source: crdb-source
+    description: |
+      List all tables in a CockroachDB database with detailed schema information
+      including column names, data types, constraints, and indexes.
+      Use this to understand table structure before writing queries.