a2a-handler 0.1.26__tar.gz → 0.2.0__tar.gz

{a2a_handler-0.1.26 → a2a_handler-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: a2a-handler
-Version: 0.1.26
+Version: 0.2.0
 Summary: An A2A Protocol client TUI and CLI.
 Keywords: a2a,a2a-protocol,agent,agent-to-agent,ai,cli,tui
 Author: Al Duncanson
@@ -20,11 +20,10 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
 Requires-Dist: a2a-sdk[http-server]>=1.0.0,<2.0.0
 Requires-Dist: click>=8.0.0
-Requires-Dist: google-adk[mcp]>=2.5.0
 Requires-Dist: httpx>=0.27.0
-Requires-Dist: litellm>=1.0.0
 Requires-Dist: python-dotenv>=1.0.0
 Requires-Dist: rich>=13.0.0
+Requires-Dist: starlette>=0.37.0
 Requires-Dist: textual>=0.47.0
 Requires-Dist: uvicorn>=0.30.0
 Requires-Dist: textual-serve>=1.1.0
@@ -55,7 +54,7 @@ MCP server that lets other agents integrate with A2A services directly. Handler
 also supports global and repo-scoped A2A server configuration with bearer,
 API key, mTLS, and OAuth2 client credentials auth.
 
-![Handler TUI connected to the built-in Handler Agent, showing the agent card and a completed assistant response](https://raw.githubusercontent.com/alDuncanson/Handler/73915875903b60dad6e4e404aa7ed91b6d94559f/assets/tui.png)
+![Handler TUI connected to an A2A agent, showing the agent card and a completed assistant response](https://raw.githubusercontent.com/alDuncanson/Handler/73915875903b60dad6e4e404aa7ed91b6d94559f/assets/tui.png)
 
 ## Install
 

{a2a_handler-0.1.26 → a2a_handler-0.2.0}/README.md

@@ -14,7 +14,7 @@ MCP server that lets other agents integrate with A2A services directly. Handler
 also supports global and repo-scoped A2A server configuration with bearer,
 API key, mTLS, and OAuth2 client credentials auth.
 
-![Handler TUI connected to the built-in Handler Agent, showing the agent card and a completed assistant response](https://raw.githubusercontent.com/alDuncanson/Handler/73915875903b60dad6e4e404aa7ed91b6d94559f/assets/tui.png)
+![Handler TUI connected to an A2A agent, showing the agent card and a completed assistant response](https://raw.githubusercontent.com/alDuncanson/Handler/73915875903b60dad6e4e404aa7ed91b6d94559f/assets/tui.png)
 
 ## Install
 

{a2a_handler-0.1.26 → a2a_handler-0.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "a2a-handler"
-version = "0.1.26"
+version = "0.2.0"
 description = "An A2A Protocol client TUI and CLI."
 readme = "README.md"
 requires-python = ">=3.11"
@@ -31,11 +31,10 @@ classifiers = [
 dependencies = [
     "a2a-sdk[http-server]>=1.0.0,<2.0.0",
     "click>=8.0.0",
-    "google-adk[mcp]>=2.5.0",
     "httpx>=0.27.0",
-    "litellm>=1.0.0",
     "python-dotenv>=1.0.0",
     "rich>=13.0.0",
+    "starlette>=0.37.0",
     "textual>=0.47.0",
     "uvicorn>=0.30.0",
     "textual-serve>=1.1.0",
@@ -76,6 +75,11 @@ build-backend = "uv_build"
 [tool.uv.build-backend]
 module-root = "src"
 
+[[tool.uv.index]]
+name = "pypi"
+url = "https://pypi.org/simple"
+default = true
+
 [tool.pytest.ini_options]
 asyncio_mode = "auto"
 

{a2a_handler-0.1.26 → a2a_handler-0.2.0}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "a2a-handler"
-version = "0.1.26"
+version = "0.2.0"
 description = "An A2A Protocol client TUI and CLI."
 readme = "README.md"
 requires-python = ">=3.11"
@@ -34,11 +34,12 @@ classifiers = [
 dependencies = [
     "a2a-sdk[http-server]>=1.0.0,<2.0.0",
     "click>=8.0.0",
-    "google-adk[mcp]>=2.5.0",
     "httpx>=0.27.0",
-    "litellm>=1.0.0",
     "python-dotenv>=1.0.0",
     "rich>=13.0.0",
+    # Imported directly by the push notification webhook server. Declared rather
+    # than relied upon transitively via a2a-sdk[http-server].
+    "starlette>=0.37.0",
     "textual>=0.47.0",
     "uvicorn>=0.30.0",
     "textual-serve>=1.1.0",
@@ -75,6 +76,15 @@ build-backend = "uv_build"
 [tool.uv.build-backend]
 module-root = "src"
 
+# This is a public package published to PyPI, so its lockfile must resolve from
+# pypi.org. Pinned explicitly because an ambient UV_INDEX_URL (e.g. a corporate
+# mirror) would otherwise rewrite every source URL in uv.lock on the next
+# `uv lock`, leaking internal infrastructure and breaking CI for contributors.
+[[tool.uv.index]]
+name = "pypi"
+url = "https://pypi.org/simple"
+default = true
+
 [tool.pytest.ini_options]
 asyncio_mode = "auto"
 

{a2a_handler-0.1.26 → a2a_handler-0.2.0}/src/a2a_handler/cli/__init__.py

@@ -6,7 +6,7 @@ Provides commands for interacting with A2A agents:
 - task notification set: Configure push notifications
 - card get/validate: Agent card operations
 - server list/show/add/remove/validate: Manage configured servers
-- server run agent/push: Run local servers
+- server run push: Run the local push notification webhook server
 - session list/show/clear: Manage saved conversation sessions
 
 Authentication is configured per-server via `handler server add` or

{a2a_handler-0.1.26 → a2a_handler-0.2.0}/src/a2a_handler/cli/_helpers.py

@@ -292,6 +292,29 @@ def resolve_agent_target(
     return selection.agent_url, credentials
 
 
+def resolve_task_id(positional: str | None, option: str | None) -> str | None:
+    """Resolve a task ID given either positionally or via --task.
+
+    Returns None when neither is supplied, because `--params` may still carry a
+    task_id; callers check for a missing ID after merging that payload.
+    """
+    if positional is not None and option is not None and positional != option:
+        raise click.UsageError(
+            "Conflicting task IDs: "
+            f"{positional!r} was given positionally and {option!r} with --task."
+        )
+    return positional if positional is not None else option
+
+
+def require_task_id(task_id: str | None) -> str:
+    """Return the resolved task ID, or fail with usage guidance when absent."""
+    if not task_id:
+        raise click.UsageError(
+            "Missing task ID. Pass it positionally (e.g. `task-123`) or with --task."
+        )
+    return task_id
+
+
 def handle_validation_error(error: InputValidationError, output: Output) -> None:
     """Render input validation errors in the standard envelope."""
     output.error(

{a2a_handler-0.1.26 → a2a_handler-0.2.0}/src/a2a_handler/cli/server.py

@@ -7,7 +7,7 @@ import stat
 import tempfile
 import tomllib
 from pathlib import Path
-from typing import Optional, cast
+from typing import cast
 
 import click
 
@@ -16,7 +16,6 @@ from a2a_handler.common.input_validation import (
     InputValidationError,
     validate_header_name,
 )
-from a2a_handler.server import run_server
 from a2a_handler.servers import (
     SERVERS_FILENAME,
     SERVER_SCHEMA_VERSION,
@@ -613,47 +612,6 @@ def server_run() -> None:
     pass
 
 
-@server_run.command("agent")
-@click.option("--host", default="0.0.0.0", help="Host to bind to", show_default=True)
-@click.option("--port", default=8000, help="Port to bind to", show_default=True)
-@click.option("--auth/--no-auth", default=False, help="Require API key authentication")
-@click.option(
-    "--api-key",
-    default=None,
-    help="Specific API key to use (auto-generated if not set)",
-)
-@click.option(
-    "--model",
-    "-m",
-    default=None,
-    help="Model to use (e.g., 'gemma4:e2b', 'qwen3', 'gemini-2.0-flash')",
-)
-def server_agent(
-    host: str,
-    port: int,
-    auth: bool,
-    api_key: Optional[str],
-    model: Optional[str],
-) -> None:
-    """Start a local A2A agent server.
-
-    \b
-    Examples:
-      $ handler server run agent
-      $ handler server run agent --port 9000
-      $ handler server run agent --auth --api-key my-secret
-      $ handler server run agent --model gemma4:e4b
-    """
-    log.info("Starting A2A server on %s:%d", host, port)
-    run_server(
-        host=host,
-        port=port,
-        require_auth=auth,
-        api_key=api_key,
-        model=model,
-    )
-
-
 @server_run.command("push")
 @click.option("--host", default="127.0.0.1", help="Host to bind to", show_default=True)
 @click.option("--port", default=9000, help="Port to bind to", show_default=True)

{a2a_handler-0.1.26 → a2a_handler-0.2.0}/src/a2a_handler/cli/task.py

@@ -28,8 +28,10 @@ from ._helpers import (
     build_streaming_http_client,
     handle_client_error,
     handle_validation_error,
+    require_task_id,
     resolve_agent_selection,
     resolve_selection_credentials,
+    resolve_task_id,
 )
 
 log = get_logger(__name__)
@@ -42,9 +44,10 @@ def task() -> None:
 
 
 @task.command("get")
+@click.argument("task_id_arg", metavar="[TASK_ID]", required=False)
 @click.option("--url", "agent_url", help="Agent URL")
 @click.option("--server", "-s", "server_name", help="Named server from servers.toml")
-@click.option("--task", "task_id", required=True, help="Task ID to retrieve")
+@click.option("--task", "task_id", help="Task ID to retrieve (alias for TASK_ID)")
 @click.option(
     "--history-length", "-n", type=int, help="Number of history messages to include"
 )
@@ -60,9 +63,10 @@ def task() -> None:
     "--api-key-env", "-k", help="Env var containing API key (overrides saved)"
 )
 def task_get(
+    task_id_arg: Optional[str],
     agent_url: Optional[str],
     server_name: Optional[str],
-    task_id: str,
+    task_id: Optional[str],
     history_length: Optional[int],
     json_params: Optional[str],
     bearer_env: Optional[str],
@@ -72,12 +76,14 @@ def task_get(
 
     \b
     Examples:
+      $ handler task get task-123 --server my_agent
       $ handler task get --server my_agent --task task-123
       $ handler task get --url http://localhost:8000 --task task-123
-      $ handler task get --server my_agent --task task-123 --history-length 10
+      $ handler task get task-123 --server my_agent --history-length 10
     """
     output = Output()
     payload: dict[str, Any] = {}
+    task_id = resolve_task_id(task_id_arg, task_id)
 
     selection = resolve_agent_selection(agent_url, server_name)
     resolved_url = selection.agent_url
@@ -99,6 +105,7 @@ def task_get(
         if history_length is None and isinstance(payload_history_length, int):
             history_length = payload_history_length
 
+        task_id = require_task_id(task_id)
         validate_resource_id(task_id, "task_id")
     except InputValidationError as error:
         handle_validation_error(error, output)
@@ -122,9 +129,10 @@ def task_get(
 
 
 @task.command("cancel")
+@click.argument("task_id_arg", metavar="[TASK_ID]", required=False)
 @click.option("--url", "agent_url", help="Agent URL")
 @click.option("--server", "-s", "server_name", help="Named server from servers.toml")
-@click.option("--task", "task_id", required=True, help="Task ID to cancel")
+@click.option("--task", "task_id", help="Task ID to cancel (alias for TASK_ID)")
 @click.option(
     "--bearer-env", "-b", help="Env var containing bearer token (overrides saved)"
 )
@@ -132,9 +140,10 @@ def task_get(
     "--api-key-env", "-k", help="Env var containing API key (overrides saved)"
 )
 def task_cancel(
+    task_id_arg: Optional[str],
     agent_url: Optional[str],
     server_name: Optional[str],
-    task_id: str,
+    task_id: Optional[str],
     bearer_env: Optional[str],
     api_key_env: Optional[str],
 ) -> None:
@@ -142,10 +151,12 @@ def task_cancel(
 
     \b
     Examples:
+      $ handler task cancel task-123 --server my_agent
       $ handler task cancel --server my_agent --task task-123
       $ handler task cancel --url http://localhost:8000 --task task-123
     """
     output = Output()
+    task_id = require_task_id(resolve_task_id(task_id_arg, task_id))
 
     selection = resolve_agent_selection(agent_url, server_name)
     resolved_url = selection.agent_url
@@ -177,9 +188,10 @@ def task_cancel(
 
 
 @task.command("resubscribe")
+@click.argument("task_id_arg", metavar="[TASK_ID]", required=False)
 @click.option("--url", "agent_url", help="Agent URL")
 @click.option("--server", "-s", "server_name", help="Named server from servers.toml")
-@click.option("--task", "task_id", required=True, help="Task ID to resubscribe to")
+@click.option("--task", "task_id", help="Task ID to resubscribe to (alias for TASK_ID)")
 @click.option(
     "--bearer-env", "-b", help="Env var containing bearer token (overrides saved)"
 )
@@ -187,9 +199,10 @@ def task_cancel(
     "--api-key-env", "-k", help="Env var containing API key (overrides saved)"
 )
 def task_resubscribe(
+    task_id_arg: Optional[str],
     agent_url: Optional[str],
     server_name: Optional[str],
-    task_id: str,
+    task_id: Optional[str],
     bearer_env: Optional[str],
     api_key_env: Optional[str],
 ) -> None:
@@ -197,10 +210,12 @@ def task_resubscribe(
 
     \b
     Examples:
+      $ handler task resubscribe task-123 --server my_agent
       $ handler task resubscribe --server my_agent --task task-123
       $ handler task resubscribe --url http://localhost:8000 --task task-123
     """
     output = Output()
+    task_id = require_task_id(resolve_task_id(task_id_arg, task_id))
 
     selection = resolve_agent_selection(agent_url, server_name)
     resolved_url = selection.agent_url
@@ -255,9 +270,10 @@ def task_notification() -> None:
 
 
 @task_notification.command("set")
+@click.argument("task_id_arg", metavar="[TASK_ID]", required=False)
 @click.option("--url", "agent_url", help="Agent URL")
 @click.option("--server", "-s", "server_name", help="Named server from servers.toml")
-@click.option("--task", "task_id", required=True, help="Task ID")
+@click.option("--task", "task_id", help="Task ID (alias for TASK_ID)")
 @click.option(
     "--webhook-url", required=True, help="Webhook URL to receive notifications"
 )
@@ -269,9 +285,10 @@ def task_notification() -> None:
     "--api-key-env", "-k", help="Env var containing API key (overrides saved)"
 )
 def notification_set(
+    task_id_arg: Optional[str],
     agent_url: Optional[str],
     server_name: Optional[str],
-    task_id: str,
+    task_id: Optional[str],
     webhook_url: str,
     token: Optional[str],
     bearer_env: Optional[str],
@@ -281,10 +298,12 @@ def notification_set(
 
     \b
     Examples:
+      $ handler task notification set task-123 --server my_agent --webhook-url http://webhook.example.com
       $ handler task notification set --server my_agent --task task-123 --webhook-url http://webhook.example.com
       $ handler task notification set --url http://localhost:8000 --task task-123 --webhook-url http://webhook.example.com --token SECRET
     """
     output = Output()
+    task_id = require_task_id(resolve_task_id(task_id_arg, task_id))
 
     selection = resolve_agent_selection(agent_url, server_name)
     resolved_url = selection.agent_url
@@ -319,9 +338,10 @@ def notification_set(
 
 
 @task_notification.command("get")
+@click.argument("task_id_arg", metavar="[TASK_ID]", required=False)
 @click.option("--url", "agent_url", help="Agent URL")
 @click.option("--server", "-s", "server_name", help="Named server from servers.toml")
-@click.option("--task", "task_id", required=True, help="Task ID")
+@click.option("--task", "task_id", help="Task ID (alias for TASK_ID)")
 @click.option("--config-id", "-c", help="Specific push notification config ID")
 @click.option(
     "--bearer-env", "-b", help="Env var containing bearer token (overrides saved)"
@@ -330,9 +350,10 @@ def notification_set(
     "--api-key-env", "-k", help="Env var containing API key (overrides saved)"
 )
 def notification_get(
+    task_id_arg: Optional[str],
     agent_url: Optional[str],
     server_name: Optional[str],
-    task_id: str,
+    task_id: Optional[str],
     config_id: Optional[str],
     bearer_env: Optional[str],
     api_key_env: Optional[str],
@@ -341,10 +362,12 @@ def notification_get(
 
     \b
     Examples:
+      $ handler task notification get task-123 --server my_agent
       $ handler task notification get --server my_agent --task task-123
       $ handler task notification get --url http://localhost:8000 --task task-123
     """
     output = Output()
+    task_id = require_task_id(resolve_task_id(task_id_arg, task_id))
 
     selection = resolve_agent_selection(agent_url, server_name)
     resolved_url = selection.agent_url

{a2a_handler-0.1.26 → a2a_handler-0.2.0}/src/a2a_handler/mcp/server.py

@@ -6,6 +6,7 @@ from typing import Literal
 import httpx
 from mcp.server.fastmcp import FastMCP
 
+from a2a_handler import __version__
 from a2a_handler.auth import (
     AuthCredentials,
     AuthType,
@@ -122,6 +123,11 @@ def create_mcp_server() -> FastMCP:
         website_url="https://github.com/alDuncanson/handler",
     )
 
+    # FastMCP exposes no `version` parameter, and the low-level server reports the
+    # `mcp` library version when its own is left unset. Set Handler's version so
+    # clients inspecting `serverInfo` see the server they are talking to.
+    mcp._mcp_server.version = __version__
+
     @mcp.tool()
     async def validate_agent_card(
         source: str,

{a2a_handler-0.1.26 → a2a_handler-0.2.0}/src/a2a_handler/servers.py

@@ -39,9 +39,6 @@ logger = get_logger(__name__)
 DEFAULT_SERVER_DIRECTORY = Path(user_config_dir("handler"))
 SERVERS_FILENAME = "servers.toml"
 SERVER_SCHEMA_VERSION = 1
-DEFAULT_HANDLER_AGENT_NAME = "Handler Agent"
-DEFAULT_HANDLER_AGENT_URL = "http://localhost:8000"
-DEFAULT_HANDLER_AGENT_SERVER_ID = "global:handler-agent"
 _ENV_NAME_PATTERN = re.compile(r"^[A-Za-z_][A-Za-z0-9_]*$")
 
 
@@ -107,22 +104,6 @@ class ServerCatalog:
         }
 
 
-def default_handler_agent_server() -> ServerDefinition:
-    """Return Handler's built-in embedded-agent server entry."""
-    return ServerDefinition(
-        server_id=DEFAULT_HANDLER_AGENT_SERVER_ID,
-        source=ServerSource.GLOBAL,
-        name=DEFAULT_HANDLER_AGENT_NAME,
-        agent_url=DEFAULT_HANDLER_AGENT_URL,
-        origin_label=server_source_label(ServerSource.GLOBAL),
-    )
-
-
-def is_default_handler_agent_server(server_def: ServerDefinition) -> bool:
-    """Return whether a server definition is Handler's built-in local agent."""
-    return server_def.server_id == DEFAULT_HANDLER_AGENT_SERVER_ID
-
-
 class ServerConfigError(ValueError):
     """Raised when server configuration is malformed."""
 
@@ -425,22 +406,6 @@ def load_server_catalog(
                 load_servers(local_server_dir, ServerSource.REPOSITORY)
             )
 
-    if server_directory is None:
-        configured_names = {
-            server_def.name.casefold()
-            for server_def in (*repository_servers, *global_servers)
-            if server_def.name is not None
-        }
-        configured_urls = {
-            server_def.agent_url
-            for server_def in (*repository_servers, *global_servers)
-        }
-        if (
-            DEFAULT_HANDLER_AGENT_NAME.casefold() not in configured_names
-            and DEFAULT_HANDLER_AGENT_URL not in configured_urls
-        ):
-            global_servers = (*global_servers, default_handler_agent_server())
-
     return ServerCatalog(
         repository_servers=repository_servers,
         global_servers=global_servers,

{a2a_handler-0.1.26 → a2a_handler-0.2.0}/src/a2a_handler/tui/app.py

@@ -24,7 +24,6 @@ from a2a_handler.tui.commands import (
 )
 from a2a_handler.tui.components import AgentCardPanel, TabbedMessagesPanel
 from a2a_handler.tui.server.save import save_connections_to_workspace
-from a2a_handler.tui.server.tab import shutdown_default_handler_agent
 from a2a_handler.tui.server.tabs import ServerTabs
 from a2a_handler.tui.server.workspace import (
     remove_workspace_server,
@@ -409,7 +408,6 @@ class HandlerTUI(App[Any]):
     async def on_unmount(self) -> None:
         if self._tui_log_handler is not None:
             self._tui_log_handler.set_callback(None)
-        shutdown_default_handler_agent()
         logger.info("Shutting down TUI application")