fix: --active-only and toggle fixes for all resource groups

Branch: InitialCLI

Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>

Author: gabe-l-hart

cforge/commands/resources/a2a.py

@@ -28,13 +28,14 @@
 
 
 def a2a_list(
+    active_only: bool = typer.Option(False, "--active-only", help="Show only active agents"),
     json_output: bool = typer.Option(False, "--json", help="Output as JSON"),
 ) -> None:
     """List all A2A agents."""
     console = get_console()
 
     try:
-        result = make_authenticated_request("GET", "/a2a")
+        result = make_authenticated_request("GET", "/a2a", params={"include_inactive": not active_only})
 
         if json_output:
             print_json(result, "A2A Agents")

cforge/commands/resources/mcp_servers.py

@@ -28,13 +28,14 @@
 
 
 def mcp_servers_list(
+    active_only: bool = typer.Option(False, "--active-only", help="Show only active MCP servers"),
     json_output: bool = typer.Option(False, "--json", help="Output as JSON"),
 ) -> None:
     """List all MCP server peers."""
     console = get_console()
 
     try:
-        result = make_authenticated_request("GET", "/gateways")
+        result = make_authenticated_request("GET", "/gateways", params={"include_inactive": not active_only})
 
         if json_output:
             print_json(result, "MCP Servers")

cforge/commands/resources/prompts.py

@@ -29,13 +29,14 @@
 
 def prompts_list(
     mcp_server_id: Optional[str] = typer.Option(None, "--mcp-server-id", "-m", help="Filter by MCP Server ID"),
+    active_only: bool = typer.Option(False, "--active-only", help="Show only active prompts"),
     json_output: bool = typer.Option(False, "--json", help="Output as JSON"),
 ) -> None:
     """List all prompts in the gateway."""
     console = get_console()
 
     try:
-        params: Dict[str, Any] = {}
+        params: Dict[str, Any] = {"include_inactive": not active_only}
         if mcp_server_id:
             params["gateway_id"] = mcp_server_id
 
@@ -165,7 +166,16 @@ def prompts_toggle(
     console = get_console()
 
     try:
-        result = make_authenticated_request("POST", f"/prompts/{prompt_id}/toggle")
+        current_status = make_authenticated_request("GET", "/prompts", params={"include_inactive": True})
+        assert isinstance(current_status, list)
+        this_status = [res for res in current_status if res.get("id") == prompt_id]
+        if not this_status:
+            console.print(f"[red]Prompt not found: {prompt_id}[/red]")
+            raise typer.Exit(1)
+        assert len(this_status) == 1, "Multiple prompts with same ID found"
+        assert isinstance(this_status[0], dict)
+        activate = not this_status[0].get("isActive")
+        result = make_authenticated_request("POST", f"/prompts/{prompt_id}/toggle", params={"activate": activate})
         console.print("[green]✓ Prompt toggled successfully![/green]")
         print_json(result, "Prompt Status")
 

cforge/commands/resources/resources.py

@@ -29,13 +29,14 @@
 
 def resources_list(
     mcp_server_id: Optional[str] = typer.Option(None, "--mcp-server-id", "-m", help="Filter by MCP Server ID"),
+    active_only: bool = typer.Option(False, "--active-only", help="Show only active resources"),
     json_output: bool = typer.Option(False, "--json", help="Output as JSON"),
 ) -> None:
     """List all resources in the gateway."""
     console = get_console()
 
     try:
-        params: Dict[str, Any] = {}
+        params: Dict[str, Any] = {"include_inactive": not active_only}
         if mcp_server_id:
             params["gateway_id"] = mcp_server_id
 
@@ -168,20 +169,15 @@ def resources_toggle(
     console = get_console()
 
     try:
-        current_status = make_authenticated_request("GET", "/resources")
+        current_status = make_authenticated_request("GET", "/resources", params={"include_inactive": True})
         assert isinstance(current_status, list)
         this_status = [res for res in current_status if res.get("id") == resource_id]
-        # NOTE: If the resources was previously deactivated, it will not show up
-        # in a list call, but will still be in the database. The only way to
-        # distinguish between this and a bad resource ID is to do a separate GET
-        # call (which will not return the active status), but the simpler way is
-        # to just try toggling and letting a 404 error be raised.
         if not this_status:
-            activate = True
-        else:
-            assert len(this_status) == 1, "Multiple resources with same ID found"
-            assert isinstance(this_status[0], dict)
-            activate = not this_status[0].get("isActive")
+            console.print(f"[red]Resource not found: {resource_id}[/red]")
+            raise typer.Exit(1)
+        assert len(this_status) == 1, "Multiple resources with same ID found"
+        assert isinstance(this_status[0], dict)
+        activate = not this_status[0].get("isActive")
         result = make_authenticated_request("POST", f"/resources/{resource_id}/toggle", params={"activate": activate})
         console.print("[green]✓ Resource toggled successfully![/green]")
         print_json(result, "Resource Status")

cforge/commands/resources/tools.py

@@ -10,7 +10,7 @@
 # Standard
 import json
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any, Dict, Optional
 
 # Third-Party
 import typer
@@ -36,11 +36,9 @@ def tools_list(
     console = get_console()
 
     try:
-        params: dict[str, Any] = {}
+        params: Dict[str, Any] = {"include_inactive": not active_only}
         if mcp_server_id:
             params["gateway_id"] = mcp_server_id
-        if active_only:
-            params["active"] = True
 
         result = make_authenticated_request("GET", "/tools", params=params)
 
@@ -63,7 +61,7 @@ def tools_list(
 
 
 def tools_get(
-    tool_id: int = typer.Argument(..., help="Tool ID"),
+    tool_id: str = typer.Argument(..., help="Tool ID"),
     json_output: bool = typer.Option(False, "--json", help="Output as JSON"),
 ) -> None:
     """Get details of a specific tool."""
@@ -117,7 +115,7 @@ def tools_create(
 
 
 def tools_update(
-    tool_id: int = typer.Argument(..., help="Tool ID"),
+    tool_id: str = typer.Argument(..., help="Tool ID"),
     data_file: Optional[Path] = typer.Argument(None, help="JSON file containing updated tool data"),
 ) -> None:
     """Update an existing tool."""
@@ -142,7 +140,7 @@ def tools_update(
 
 
 def tools_delete(
-    tool_id: int = typer.Argument(..., help="Tool ID"),
+    tool_id: str = typer.Argument(..., help="Tool ID"),
     confirm: bool = typer.Option(False, "--yes", "-y", help="Skip confirmation"),
 ) -> None:
     """Delete a tool."""
@@ -163,13 +161,19 @@ def tools_delete(
 
 
 def tools_toggle(
-    tool_id: int = typer.Argument(..., help="Tool ID"),
+    tool_id: str = typer.Argument(..., help="Tool ID"),
 ) -> None:
     """Toggle tool active status."""
     console = get_console()
 
     try:
-        result = make_authenticated_request("POST", f"/tools/{tool_id}/toggle")
+        current_status = make_authenticated_request("GET", f"/tools/{tool_id}")
+        assert isinstance(current_status, dict)
+        if current_status["enabled"]:
+            activate = False
+        else:
+            activate = True
+        result = make_authenticated_request("POST", f"/tools/{tool_id}/toggle", params={"activate": activate})
         console.print("[green]✓ Tool toggled successfully![/green]")
         print_json(result, "Tool Status")
 

cforge/commands/resources/virtual_servers.py

@@ -41,13 +41,14 @@ def _fixup_payload(data: dict) -> dict:
 
 
 def virtual_servers_list(
+    active_only: bool = typer.Option(False, "--active-only", help="Show only active virtual servers"),
     json_output: bool = typer.Option(False, "--json", help="Output as JSON"),
 ) -> None:
     """List all virtual servers."""
     console = get_console()
 
     try:
-        result = make_authenticated_request("GET", "/servers")
+        result = make_authenticated_request("GET", "/servers", params={"include_inactive": not active_only})
 
         if json_output:
             print_json(result, "Virtual Servers")
@@ -68,7 +69,7 @@ def virtual_servers_list(
 
 
 def virtual_servers_get(
-    server_id: int = typer.Argument(..., help="Server ID"),
+    server_id: str = typer.Argument(..., help="Server ID"),
 ) -> None:
     """Get details of a specific virtual server."""
     try:
@@ -122,7 +123,7 @@ def virtual_servers_create(
 
 
 def virtual_servers_update(
-    server_id: int = typer.Argument(..., help="Server ID"),
+    server_id: str = typer.Argument(..., help="Server ID"),
     data_file: Optional[Path] = typer.Argument(None, help="JSON file containing updated server data"),
 ) -> None:
     """Update an existing virtual server."""
@@ -148,7 +149,7 @@ def virtual_servers_update(
 
 
 def virtual_servers_delete(
-    server_id: int = typer.Argument(..., help="Server ID"),
+    server_id: str = typer.Argument(..., help="Server ID"),
     confirm: bool = typer.Option(False, "--yes", "-y", help="Skip confirmation"),
 ) -> None:
     """Delete a virtual server."""
@@ -169,13 +170,20 @@ def virtual_servers_delete(
 
 
 def virtual_servers_toggle(
-    server_id: int = typer.Argument(..., help="Server ID"),
+    server_id: str = typer.Argument(..., help="Server ID"),
 ) -> None:
     """Toggle virtual server active status."""
     console = get_console()
 
     try:
-        result = make_authenticated_request("POST", f"/servers/{server_id}/toggle")
+        current_status = make_authenticated_request("GET", f"/servers/{server_id}")
+        assert isinstance(current_status, dict)
+        if current_status["isActive"]:
+            activate = False
+        else:
+            activate = True
+        result = make_authenticated_request("POST", f"/servers/{server_id}/toggle", params={"activate": activate})
+        assert isinstance(result, dict)
         console.print("[green]✓ Virtual server toggled successfully![/green]")
         print_json(result, "Virtual Server Status")
 
@@ -184,7 +192,7 @@ def virtual_servers_toggle(
 
 
 def virtual_servers_tools(
-    server_id: int = typer.Argument(..., help="Server ID"),
+    server_id: str = typer.Argument(..., help="Server ID"),
     json_output: bool = typer.Option(False, "--json", help="Output as JSON"),
 ) -> None:
     """List tools available in a virtual server."""
@@ -207,7 +215,7 @@ def virtual_servers_tools(
 
 
 def virtual_servers_resources(
-    server_id: int = typer.Argument(..., help="Server ID"),
+    server_id: str = typer.Argument(..., help="Server ID"),
     json_output: bool = typer.Option(False, "--json", help="Output as JSON"),
 ) -> None:
     """List resources available in a virtual server."""
@@ -230,7 +238,7 @@ def virtual_servers_resources(
 
 
 def virtual_servers_prompts(
-    server_id: int = typer.Argument(..., help="Server ID"),
+    server_id: str = typer.Argument(..., help="Server ID"),
     json_output: bool = typer.Option(False, "--json", help="Output as JSON"),
 ) -> None:
     """List prompts available in a virtual server."""