Drop ToolHive registry format support

README.md

@@ -133,14 +133,12 @@ In this example, the "production" registry only exposes vetted entries from the
 ```yaml
 sources:
   - name: official-catalog
-    format: upstream
     api:
       endpoint: https://registry.modelcontextprotocol.io
     syncPolicy:
       interval: "1h"
 
   - name: internal-tools
-    format: toolhive
     git:
       repository: https://github.com/myorg/mcp-catalog.git
       branch: main
@@ -232,7 +230,6 @@ All configuration is done via YAML files. The server requires a `--config` flag.
 ```yaml
 sources:
   - name: local
-    format: toolhive
     file:
       path: /data/registry.json
 

cmd/thv-registry-api/app/serve_test.go

@@ -135,8 +135,7 @@ func setupBenchmarkDB(t *testing.T) (*config.Config, string, func()) {
 		Sources: []config.SourceConfig{
 			// Add a minimal source config to satisfy validation
 			{
-				Name:   "test",
-				Format: "toolhive",
+				Name: "test",
 				File: &config.FileConfig{
 					Path: "./examples/registry-sample.json",
 				},

database/migrations/000021_drop_format_column.down.sql

@@ -0,0 +1,5 @@
+-- Restore the format column on source table.
+
+ALTER TABLE source ADD COLUMN format TEXT;
+ALTER TABLE source ADD CONSTRAINT registry_format_check
+    CHECK (format IS NULL OR format IN ('toolhive', 'upstream'));

database/migrations/000021_drop_format_column.up.sql

@@ -0,0 +1,8 @@
+-- Drop the format column from source table.
+--
+-- The ToolHive registry format is no longer supported; only the upstream
+-- MCP registry format remains. With a single format the column carries no
+-- information, so remove it entirely.
+
+ALTER TABLE source DROP CONSTRAINT registry_format_check;
+ALTER TABLE source DROP COLUMN format;

database/queries/source.sql

@@ -3,7 +3,6 @@ SELECT id,
        name,
        creation_type,
        source_type,
-       format,
        source_config,
        filter_config,
        sync_schedule,
@@ -27,7 +26,6 @@ SELECT id,
        name,
        creation_type,
        source_type,
-       format,
        source_config,
        filter_config,
        sync_schedule,
@@ -42,7 +40,6 @@ SELECT id,
        name,
        creation_type,
        source_type,
-       format,
        source_config,
        filter_config,
        sync_schedule,
@@ -63,7 +60,6 @@ INSERT INTO source (
     name,
     creation_type,
     source_type,
-    format,
     source_config,
     filter_config,
     sync_schedule,
@@ -75,7 +71,6 @@ INSERT INTO source (
     sqlc.arg(name),
     sqlc.arg(creation_type),
     sqlc.arg(source_type),
-    sqlc.narg(format),
     sqlc.narg(source_config),
     sqlc.narg(filter_config),
     sqlc.narg(sync_schedule),
@@ -86,7 +81,6 @@ INSERT INTO source (
 )
 ON CONFLICT (name) DO UPDATE SET
     source_type = EXCLUDED.source_type,
-    format = EXCLUDED.format,
     source_config = EXCLUDED.source_config,
     filter_config = EXCLUDED.filter_config,
     sync_schedule = EXCLUDED.sync_schedule,
@@ -101,7 +95,6 @@ INSERT INTO source (
     name,
     creation_type,
     source_type,
-    format,
     source_config,
     filter_config,
     sync_schedule,
@@ -114,7 +107,6 @@ SELECT
     unnest(sqlc.arg(names)::text[]),
     'CONFIG',
     unnest(sqlc.arg(source_types)::text[]),
-    NULLIF(unnest(sqlc.arg(formats)::text[]), ''),
     unnest(sqlc.arg(source_configs)::jsonb[]),
     unnest(sqlc.arg(filter_configs)::jsonb[]),
     unnest(sqlc.arg(sync_schedules)::interval[]),
@@ -124,7 +116,6 @@ SELECT
     unnest(sqlc.arg(updated_ats)::timestamp with time zone[])
 ON CONFLICT (name) DO UPDATE SET
     source_type = EXCLUDED.source_type,
-    format = EXCLUDED.format,
     source_config = EXCLUDED.source_config,
     filter_config = EXCLUDED.filter_config,
     sync_schedule = EXCLUDED.sync_schedule,
@@ -155,7 +146,6 @@ INSERT INTO source (
     name,
     creation_type,
     source_type,
-    format,
     source_config,
     filter_config,
     sync_schedule,
@@ -167,7 +157,6 @@ INSERT INTO source (
     sqlc.arg(name),
     sqlc.arg(creation_type),
     sqlc.arg(source_type),
-    sqlc.narg(format),
     sqlc.narg(source_config),
     sqlc.narg(filter_config),
     sqlc.narg(sync_schedule),
@@ -181,7 +170,6 @@ INSERT INTO source (
 -- Update an existing source. Go callers guard against modifying wrong creation_type.
 UPDATE source SET
     source_type = sqlc.arg(source_type),
-    format = sqlc.narg(format),
     source_config = sqlc.narg(source_config),
     filter_config = sqlc.narg(filter_config),
     sync_schedule = sqlc.narg(sync_schedule),
@@ -199,7 +187,6 @@ SELECT id,
        name,
        creation_type,
        source_type,
-       format,
        source_config,
        filter_config,
        sync_schedule,

deploy/charts/toolhive-registry-server/README.md

@@ -62,7 +62,6 @@ The command removes all the Kubernetes components associated with the chart and
 | config.database.user | string | `"thv_user"` |  |
 | config.registries[0].name | string | `"default"` |  |
 | config.registries[0].sources[0] | string | `"toolhive"` |  |
-| config.sources[0].format | string | `"toolhive"` |  |
 | config.sources[0].git.branch | string | `"main"` |  |
 | config.sources[0].git.path | string | `"pkg/catalog/toolhive/data/registry-legacy.json"` |  |
 | config.sources[0].git.repository | string | `"https://github.com/stacklok/toolhive-catalog.git"` |  |

deploy/charts/toolhive-registry-server/ci/ci-values.yaml

@@ -74,7 +74,6 @@ extraVolumeMounts:
 config:
   sources:
     - name: toolhive
-      format: toolhive
       git:
         repository: https://github.com/stacklok/toolhive-catalog.git
         branch: main

deploy/charts/toolhive-registry-server/ci/postgres-values.yaml

@@ -74,7 +74,6 @@ extraVolumeMounts:
 config:
   sources:
     - name: toolhive
-      format: toolhive
       git:
         repository: https://github.com/stacklok/toolhive-catalog.git
         branch: main

deploy/charts/toolhive-registry-server/values.yaml

@@ -132,7 +132,6 @@ config:
   # Sources configuration - at least one source must be configured
   sources:
     - name: toolhive
-      format: toolhive
       git:
         repository: https://github.com/stacklok/toolhive-catalog.git
         branch: main
@@ -163,7 +162,6 @@ config:
 # config:
 #   sources:
 #     - name: toolhive
-#       format: toolhive
 #       git:
 #         repository: https://github.com/stacklok/toolhive-catalog.git
 #         tag: v1.0.0
@@ -187,13 +185,11 @@ config:
 #
 #     # Additional source types:
 #     # - name: upstream-mcp
-#     #   format: upstream
 #     #   api:
 #     #     endpoint: https://registry.modelcontextprotocol.io/
 #     #   syncPolicy:
 #     #     interval: "1h"
 #     # - name: local-data
-#     #   format: toolhive
 #     #   file:
 #     #     path: /data/registry.json    # or url: https://... or inline data: '...'
 #     #   syncPolicy:

docs/configuration.md

@@ -38,7 +38,6 @@ thv-registry-api serve --config config.yaml
 ```yaml
 sources:
   - name: default
-    format: toolhive
     file:
       path: /data/registry.json
 
@@ -59,7 +58,6 @@ database:
 # Sources define where registry data comes from
 sources:
   - name: toolhive
-    format: toolhive
     git:
       repository: https://github.com/stacklok/toolhive-catalog.git
       branch: main
@@ -117,7 +115,6 @@ Sources define where registry data comes from. Multiple sources can be configure
 | Field | Type | Required | Description |
 |-------|------|----------|-------------|
 | `name` | string | Yes | Unique name for this source |
-| `format` | string | Yes | Data format: `toolhive` or `upstream` |
 | `git` | object | No* | Git repository configuration |
 | `api` | object | No* | API endpoint configuration |
 | `file` | object | No* | Local file configuration |
@@ -193,7 +190,6 @@ api:
 **Supports:**
 - Automatic background synchronization
 - Per-registry filtering
-- Format conversion (upstream → toolhive)
 
 ### Local File
 
@@ -412,7 +408,6 @@ See [Database Configuration](database.md#password-security) for password managem
 ```yaml
 sources:
   - name: local
-    format: toolhive
     file:
       path: ./examples/registry-sample.json
 
@@ -432,7 +427,6 @@ database:
 ```yaml
 sources:
   - name: toolhive
-    format: toolhive
     git:
       repository: https://github.com/stacklok/toolhive-catalog.git
       branch: main
@@ -476,7 +470,6 @@ database:
 sources:
   # Official ToolHive registry
   - name: toolhive
-    format: toolhive
     git:
       repository: https://github.com/stacklok/toolhive-catalog.git
       branch: main
@@ -486,7 +479,6 @@ sources:
 
   # Company internal registry
   - name: internal
-    format: upstream
     api:
       endpoint: https://internal-registry.company.com
     syncPolicy:
@@ -497,12 +489,10 @@ sources:
 
   # Managed registry for custom servers
   - name: custom
-    format: toolhive
     managed: {}
 
   # Kubernetes-deployed servers
   - name: k8s-deployed
-    format: toolhive
     kubernetes:
       namespaces:
         - mcp-servers

docs/deployment-docker.md

@@ -190,7 +190,6 @@ Update `examples/config-docker.yaml`:
 ```yaml
 sources:
   - name: toolhive
-    format: toolhive
     git:
       repository: https://github.com/your-org/your-repo.git
       branch: main

docs/deployment-kubernetes.md

@@ -45,7 +45,6 @@ data:
   config.yaml: |
     sources:
       - name: toolhive
-        format: toolhive
         git:
           repository: https://github.com/stacklok/toolhive-catalog.git
           branch: main
@@ -194,7 +193,6 @@ data:
   config.yaml: |
     sources:
       - name: toolhive
-        format: toolhive
         git:
           repository: https://github.com/stacklok/toolhive-catalog.git
           branch: main

docs/thv-registry-api/swagger.json

@@ -338,10 +338,6 @@
                     "filterConfig": {
                         "$ref": "#/components/schemas/github_com_stacklok_toolhive-registry-server_internal_config.FilterConfig"
                     },
-                    "format": {
-                        "description": "toolhive or upstream",
-                        "type": "string"
-                    },
                     "name": {
                         "type": "string"
                     },

docs/thv-registry-api/swagger.yaml

@@ -231,9 +231,6 @@ components:
           $ref: '#/components/schemas/github_com_stacklok_toolhive-registry-server_internal_service.CreationType'
         filterConfig:
           $ref: '#/components/schemas/github_com_stacklok_toolhive-registry-server_internal_config.FilterConfig'
-        format:
-          description: toolhive or upstream
-          type: string
         name:
           type: string
         sourceConfig:

examples/README.md

@@ -51,7 +51,6 @@ registryName: toolhive
 
 registries:
   - name: toolhive
-    format: toolhive
     git:
       repository: https://github.com/stacklok/toolhive-catalog.git
       branch: main
@@ -92,7 +91,6 @@ registryName: mcp-registry
 
 registries:
   - name: mcp-upstream
-    format: upstream
     api:
       endpoint: https://registry.modelcontextprotocol.io
     syncPolicy:
@@ -129,7 +127,6 @@ registryName: toolhive
 
 registries:
   - name: local-file
-    format: toolhive
     file:
       path: ./data/registry.json
     syncPolicy:
@@ -177,8 +174,6 @@ registryName: <name>
 # Registries configuration (can have multiple registries)
 registries:
   - name: <registry-name>
-    # Data format: toolhive (native) or upstream (MCP registry format)
-    format: <toolhive|upstream>
 
     # Source-specific config (one of: git, api, file, managed)
     git:
@@ -267,7 +262,6 @@ See the example files for format reference:
 ```yaml
 registries:
   - name: my-registry
-    format: toolhive  # or "upstream"
     git:
       repository: https://github.com/stacklok/toolhive-catalog.git
 
@@ -369,7 +363,6 @@ Fast updates for local development:
 ```yaml
 registries:
   - name: dev-registry
-    format: toolhive
     git:
       repository: https://github.com/stacklok/toolhive-catalog.git
       branch: develop  # Use dev branch
@@ -385,7 +378,6 @@ Conservative config with filtering:
 ```yaml
 registries:
   - name: prod-registry
-    format: toolhive
     git:
       repository: https://github.com/your-org/registry.git
       branch: production