Merge branch 'main' into groups

Author: eleftherias

.github/workflows/update-toolhive-reference.yml

@@ -70,7 +70,7 @@ jobs:
           title: |
             Update ToolHive reference docs for ${{ steps.imports.outputs.version }}
           body: |
-            This PR updates the ToolHive CLI and API reference documentation to the latest release: ${{ steps.imports.outputs.version }}.
+            This PR updates the ToolHive CLI and API reference documentation for release: ${{ steps.imports.outputs.version }}.
           commit-message: |
             Update ToolHive reference docs for ${{ steps.imports.outputs.version }}
           labels: |

docs/toolhive/guides-cli/registry.md

@@ -132,6 +132,15 @@ By default, ToolHive uses a built-in registry of verified MCP servers. You can
 configure ToolHive to use a custom registry instead. This is useful for
 organizations that want to maintain their own private registry of MCP servers.
 
+The registry is a JSON file that follows the
+[ToolHive registry schema](../reference/registry-schema.mdx). Once you configure
+a custom registry, ToolHive uses it for all commands that interact with the
+registry, such as `thv registry list`, `thv registry info`, and `thv run`.
+
+Refer to the
+[built-in registry file](https://github.com/stacklok/toolhive/blob/main/pkg/registry/data/registry.json)
+for examples of MCP server entries.
+
 ### Set a remote registry URL
 
 To configure ToolHive to use a remote registry, set the registry URL:
@@ -154,14 +163,6 @@ To configure ToolHive to use a local registry, set the registry file:
 thv config set-registry <PATH>
 ```
 
-The registry must be a JSON file that follows the same format as the
-[built-in registry](https://github.com/stacklok/toolhive/blob/main/pkg/registry/data/registry.json).
-Once you configure a remote registry, all registry commands
-([`thv registry list`](../reference/cli/thv_registry_list.md),
-[`thv registry info`](../reference/cli/thv_registry_info.md),
-[`thv search`](../reference/cli/thv_search.md)) will use the remote registry
-instead of the built-in one.
-
 ### Check the current registry location
 
 To see which registry (URL or path) is currently configured:
@@ -189,6 +190,8 @@ This restores the default behavior of using ToolHive's built-in registry.
 See [Run MCP servers](./run-mcp-servers.mdx) to run an MCP server from the
 registry.
 
+Learn how to [create a custom MCP registry](../tutorials/custom-registry.mdx).
+
 ## Related information
 
 - [`thv registry` command reference](../reference/cli/thv_registry.md)

docs/toolhive/reference/cli/thv.md

@@ -39,6 +39,7 @@ thv [flags]
 * [thv client](thv_client.md)	 - Manage MCP clients
 * [thv config](thv_config.md)	 - Manage application configuration
 * [thv export](thv_export.md)	 - Export a workload's run configuration to a file
+* [thv group](thv_group.md)	 - Manage logical groupings of MCP servers
 * [thv inspector](thv_inspector.md)	 - Launches the MCP Inspector UI and connects it to the specified MCP server
 * [thv list](thv_list.md)	 - List running MCP servers
 * [thv logs](thv_logs.md)	 - Output the logs of an MCP server or manage log files

docs/toolhive/reference/cli/thv_client_register.md

@@ -39,7 +39,8 @@ thv client register [client] [flags]
 ### Options
 
 ```
-  -h, --help   help for register
+      --group strings   Only register workloads from specified groups (default [default])
+  -h, --help            help for register
 ```
 
 ### Options inherited from parent commands

docs/toolhive/reference/cli/thv_client_remove.md

@@ -39,7 +39,8 @@ thv client remove [client] [flags]
 ### Options
 
 ```
-  -h, --help   help for remove
+      --group strings   Remove client from specified groups (if not set, removes all workloads from the client)
+  -h, --help            help for remove
 ```
 
 ### Options inherited from parent commands

docs/toolhive/reference/cli/thv_group.md

@@ -0,0 +1,38 @@
+---
+title: thv group
+hide_title: true
+description: Reference for ToolHive CLI command `thv group`
+last_update:
+  author: autogenerated
+slug: thv_group
+mdx:
+  format: md
+---
+
+## thv group
+
+Manage logical groupings of MCP servers
+
+### Synopsis
+
+The group command provides subcommands to manage logical groupings of MCP servers.
+
+### Options
+
+```
+  -h, --help   help for group
+```
+
+### Options inherited from parent commands
+
+```
+      --debug   Enable debug mode
+```
+
+### SEE ALSO
+
+* [thv](thv.md)	 - ToolHive (thv) is a lightweight, secure, and fast manager for MCP servers
+* [thv group create](thv_group_create.md)	 - Create a new group of MCP servers
+* [thv group list](thv_group_list.md)	 - List all groups
+* [thv group rm](thv_group_rm.md)	 - Remove a group and remove workloads from it
+

docs/toolhive/reference/cli/thv_group_create.md

@@ -0,0 +1,40 @@
+---
+title: thv group create
+hide_title: true
+description: Reference for ToolHive CLI command `thv group create`
+last_update:
+  author: autogenerated
+slug: thv_group_create
+mdx:
+  format: md
+---
+
+## thv group create
+
+Create a new group of MCP servers
+
+### Synopsis
+
+Create a new logical group of MCP servers.
+		 The group can be used to organize and manage multiple MCP servers together.
+
+```
+thv group create [group-name] [flags]
+```
+
+### Options
+
+```
+  -h, --help   help for create
+```
+
+### Options inherited from parent commands
+
+```
+      --debug   Enable debug mode
+```
+
+### SEE ALSO
+
+* [thv group](thv_group.md)	 - Manage logical groupings of MCP servers
+

docs/toolhive/reference/cli/thv_group_list.md

@@ -0,0 +1,39 @@
+---
+title: thv group list
+hide_title: true
+description: Reference for ToolHive CLI command `thv group list`
+last_update:
+  author: autogenerated
+slug: thv_group_list
+mdx:
+  format: md
+---
+
+## thv group list
+
+List all groups
+
+### Synopsis
+
+List all logical groups of MCP servers.
+
+```
+thv group list [flags]
+```
+
+### Options
+
+```
+  -h, --help   help for list
+```
+
+### Options inherited from parent commands
+
+```
+      --debug   Enable debug mode
+```
+
+### SEE ALSO
+
+* [thv group](thv_group.md)	 - Manage logical groupings of MCP servers
+

docs/toolhive/reference/cli/thv_group_rm.md

@@ -0,0 +1,40 @@
+---
+title: thv group rm
+hide_title: true
+description: Reference for ToolHive CLI command `thv group rm`
+last_update:
+  author: autogenerated
+slug: thv_group_rm
+mdx:
+  format: md
+---
+
+## thv group rm
+
+Remove a group and remove workloads from it
+
+### Synopsis
+
+Remove a group and remove all MCP servers from it. By default, this only removes the group membership from workloads without deleting them. Use --with-workloads to also delete the workloads. 
+
+```
+thv group rm [group-name] [flags]
+```
+
+### Options
+
+```
+  -h, --help             help for rm
+      --with-workloads   Delete all workloads in the group along with the group
+```
+
+### Options inherited from parent commands
+
+```
+      --debug   Enable debug mode
+```
+
+### SEE ALSO
+
+* [thv group](thv_group.md)	 - Manage logical groupings of MCP servers
+

docs/toolhive/reference/cli/thv_list.md

@@ -26,6 +26,7 @@ thv list [flags]
 ```
   -a, --all                 Show all workloads (default shows just running)
       --format string       Output format (json, text, or mcpservers) (default "text")
+      --group string        Filter workloads by group
   -h, --help                help for list
   -l, --label stringArray   Filter workloads by labels (format: key=value)
 ```