agentstack-cli 0.4.2rc1__tar.gz → 0.4.2rc3__tar.gz

{agentstack_cli-0.4.2rc1 → agentstack_cli-0.4.2rc3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: agentstack-cli
-Version: 0.4.2rc1
+Version: 0.4.2rc3
 Summary: Agent Stack CLI
 Author: IBM Corp.
 Requires-Dist: anyio~=4.10.0

{agentstack_cli-0.4.2rc1 → agentstack_cli-0.4.2rc3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "agentstack-cli"
-version = "0.4.2-rc1"
+version = "0.4.2-rc3"
 description = "Agent Stack CLI"
 readme = "README.md"
 authors = [{ name = "IBM Corp." }]

agentstack_cli-0.4.2rc3/src/agentstack_cli/__init__.py

@@ -0,0 +1,116 @@
+# Copyright 2025 © BeeAI a Series of LF Projects, LLC
+# SPDX-License-Identifier: Apache-2.0
+
+import logging
+import typing
+from copy import deepcopy
+
+import typer
+
+import agentstack_cli.commands.agent
+import agentstack_cli.commands.build
+import agentstack_cli.commands.mcp
+import agentstack_cli.commands.model
+import agentstack_cli.commands.platform
+import agentstack_cli.commands.self
+import agentstack_cli.commands.server
+from agentstack_cli.async_typer import AliasGroup, AsyncTyper
+from agentstack_cli.configuration import Configuration
+
+logging.basicConfig(level=logging.INFO if Configuration().debug else logging.FATAL)
+logging.getLogger("httpx").setLevel(logging.WARNING)  # not sure why this is necessary
+
+
+class RootHelpGroup(AliasGroup):
+    def get_help(self, ctx):
+        return """\
+Usage: agentstack [OPTIONS] COMMAND [ARGS]...
+
+╭─ Getting Started ──────────────────────────────────────────────────────────╮
+│ ui       Launch the web interface                                          │
+│ list     View all available agents                                         │
+│ run      Run an agent interactively                                        │
+╰────────────────────────────────────────────────────────────────────────────╯
+
+╭─ Agent Management ─────────────────────────────────────────────────────────╮
+│ add                               Install an agent (Docker, GitHub, local) │
+│ remove                            Uninstall an agent                       │
+│ info                              Show agent details                       │
+│ logs                              Stream agent execution logs              │
+│ build                             Build an agent container image           │
+│ env                               Manage agent environment variables       │
+│ server-side-build [EXPERIMENTAL]  Build agents remotely                    │
+╰────────────────────────────────────────────────────────────────────────────╯
+
+╭─ Platform & Configuration ─────────────────────────────────────────────────╮
+│ model           Configure 15+ LLM providers                                │
+│ platform        Start, stop, or delete local platform                      │
+│ server          Connect to remote Agent Stack servers                      │
+│ self version    Show Agent Stack CLI and Platform version                  │
+│ self upgrade    Upgrade Agent Stack CLI and Platform                       │
+│ self uninstall  Uninstall Agent Stack CLI and Platform                     │
+╰────────────────────────────────────────────────────────────────────────────╯
+
+╭─ Options ──────────────────────────────────────────────────────────────────╮
+│ --help                Show this help message                               │
+│ --show-completion     Show tab completion script                           │
+│ --install-completion  Enable tab completion for commands                   │
+╰────────────────────────────────────────────────────────────────────────────╯
+"""
+
+
+app = AsyncTyper(no_args_is_help=True, cls=RootHelpGroup)
+app.add_typer(agentstack_cli.commands.model.app, name="model", no_args_is_help=True, help="Manage model providers.")
+app.add_typer(agentstack_cli.commands.agent.app, name="agent", no_args_is_help=True, help="Manage agents.")
+app.add_typer(
+    agentstack_cli.commands.platform.app, name="platform", no_args_is_help=True, help="Manage Agent Stack platform."
+)
+app.add_typer(
+    agentstack_cli.commands.mcp.app, name="mcp", no_args_is_help=True, help="Manage MCP servers and toolkits."
+)
+app.add_typer(agentstack_cli.commands.build.app, name="", no_args_is_help=True, help="Build agent images.")
+app.add_typer(
+    agentstack_cli.commands.server.app,
+    name="server",
+    no_args_is_help=True,
+    help="Manage Agent Stack servers and authentication.",
+)
+app.add_typer(
+    agentstack_cli.commands.self.app,
+    name="self",
+    no_args_is_help=True,
+    help="Manage Agent Stack installation.",
+    hidden=True,
+)
+
+
+agent_alias = deepcopy(agentstack_cli.commands.agent.app)
+for cmd in agent_alias.registered_commands:
+    cmd.rich_help_panel = "Agent commands"
+
+app.add_typer(agent_alias, name="", no_args_is_help=True)
+
+
+@app.command("version")
+async def version(verbose: typing.Annotated[bool, typer.Option("-v", help="Show verbose output")] = False):
+    """Print version of the Agent Stack CLI."""
+    import agentstack_cli.commands.self
+
+    await agentstack_cli.commands.self.version(verbose=verbose)
+
+
+@app.command("ui")
+async def ui():
+    """Launch the graphical interface."""
+    import webbrowser
+
+    import agentstack_cli.commands.model
+
+    await agentstack_cli.commands.model.ensure_llm_provider()
+    webbrowser.open(
+        "http://localhost:8334"
+    )  # TODO: This always opens the local UI, how to open the UI of a logged in server instead?
+
+
+if __name__ == "__main__":
+    app()

{agentstack_cli-0.4.2rc1 → agentstack_cli-0.4.2rc3}/src/agentstack_cli/api.py

@@ -1,17 +1,18 @@
 # Copyright 2025 © BeeAI a Series of LF Projects, LLC
 # SPDX-License-Identifier: Apache-2.0
-
+import json
 import re
 import urllib
 import urllib.parse
 from collections.abc import AsyncIterator
 from contextlib import asynccontextmanager
 from datetime import timedelta
+from textwrap import indent
 from typing import Any
 
 import httpx
 import openai
-from a2a.client import Client, ClientConfig, ClientFactory
+from a2a.client import A2AClientHTTPError, Client, ClientConfig, ClientFactory
 from a2a.types import AgentCard
 from httpx import HTTPStatusError
 from httpx._types import RequestFiles
@@ -103,16 +104,29 @@ async def api_stream(
 
 @asynccontextmanager
 async def a2a_client(agent_card: AgentCard, use_auth: bool = True) -> AsyncIterator[Client]:
-    async with httpx.AsyncClient(
-        headers=(
-            {"Authorization": f"Bearer {token}"}
-            if use_auth and (token := config.auth_manager.load_auth_token())
-            else {}
-        ),
-        follow_redirects=True,
-        timeout=timedelta(hours=1).total_seconds(),
-    ) as httpx_client:
-        yield ClientFactory(ClientConfig(httpx_client=httpx_client, use_client_preference=True)).create(card=agent_card)
+    try:
+        async with httpx.AsyncClient(
+            headers=(
+                {"Authorization": f"Bearer {token}"}
+                if use_auth and (token := config.auth_manager.load_auth_token())
+                else {}
+            ),
+            follow_redirects=True,
+            timeout=timedelta(hours=1).total_seconds(),
+        ) as httpx_client:
+            yield ClientFactory(ClientConfig(httpx_client=httpx_client, use_client_preference=True)).create(
+                card=agent_card
+            )
+    except A2AClientHTTPError as ex:
+        card_data = json.dumps(
+            agent_card.model_dump(include={"url", "additional_interfaces", "preferred_transport"}), indent=2
+        )
+        raise RuntimeError(
+            f"The agent is not reachable, please check that the agent card is configured properly.\n"
+            f"Agent connection info:\n{indent(card_data, prefix='  ')}\n"
+            "Full Error:\n"
+            f"{indent(str(ex), prefix='  ')}"
+        ) from ex
 
 
 @asynccontextmanager

{agentstack_cli-0.4.2rc1 → agentstack_cli-0.4.2rc3}/src/agentstack_cli/async_typer.py

@@ -67,7 +67,8 @@ class AliasGroup(TyperGroup):
 
 class AsyncTyper(typer.Typer):
     def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs, cls=AliasGroup)
+        kwargs["cls"] = kwargs.get("cls", AliasGroup)
+        super().__init__(*args, **kwargs)
 
     def command(self, *args, **kwargs):
         parent_decorator = super().command(*args, **kwargs)

{agentstack_cli-0.4.2rc1 → agentstack_cli-0.4.2rc3}/src/agentstack_cli/commands/agent.py

@@ -36,6 +36,8 @@ from agentstack_sdk.a2a.extensions import (
     EmbeddingFulfillment,
     EmbeddingServiceExtensionClient,
     EmbeddingServiceExtensionSpec,
+    FormRequestExtensionSpec,
+    FormServiceExtensionSpec,
     LLMFulfillment,
     LLMServiceExtensionClient,
     LLMServiceExtensionSpec,
@@ -44,17 +46,18 @@ from agentstack_sdk.a2a.extensions import (
     TrajectoryExtensionClient,
     TrajectoryExtensionSpec,
 )
-from agentstack_sdk.a2a.extensions.ui.form import (
+from agentstack_sdk.a2a.extensions.common.form import (
     CheckboxField,
     CheckboxFieldValue,
     DateField,
     DateFieldValue,
-    FormExtensionSpec,
     FormFieldValue,
     FormRender,
     FormResponse,
     MultiSelectField,
     MultiSelectFieldValue,
+    SingleSelectField,
+    SingleSelectFieldValue,
     TextField,
     TextFieldValue,
 )
@@ -84,6 +87,7 @@ if sys.platform != "win32":
 from collections.abc import Callable
 from pathlib import Path
 from typing import Any
+from urllib.parse import urlparse
 
 import jsonschema
 import rich.json
@@ -94,6 +98,8 @@ from rich.table import Column
 from agentstack_cli.api import a2a_client
 from agentstack_cli.async_typer import AsyncTyper, console, create_table, err_console
 from agentstack_cli.utils import (
+    announce_server_action,
+    confirm_server_action,
     generate_schema_example,
     parse_env_var,
     print_log,
@@ -153,39 +159,44 @@ async def add_agent(
     dockerfile: typing.Annotated[str | None, typer.Option(help="Use custom dockerfile path")] = None,
     vm_name: typing.Annotated[str, typer.Option(hidden=True)] = "agentstack",
     verbose: typing.Annotated[bool, typer.Option("-v", help="Show verbose output")] = False,
+    yes: typing.Annotated[bool, typer.Option("--yes", "-y", help="Skip confirmation prompts.")] = False,
 ) -> None:
     """Install discovered agent or add public docker image or github repository [aliases: install]"""
+    url = announce_server_action(f"Installing agent '{location}' for")
+    await confirm_server_action("Proceed with installing this agent on", url=url, yes=yes)
     agent_card = None
-    # Try extracting manifest locally for local images
     with verbosity(verbose):
-        process = await run_command(["docker", "inspect", location], check=False, message="Inspecting docker images.")
-        from subprocess import CalledProcessError
-
-        errors = []
+        if (
+            process := await run_command(
+                ["docker", "inspect", location], check=False, message="Inspecting docker images"
+            )
+        ).returncode == 0:
+            console.success(f"Found local image [bold]{location}[/bold]")
+            manifest = base64.b64decode(
+                json.loads(process.stdout)[0]["Config"]["Labels"]["beeai.dev.agent.json"]
+            ).decode()
+            agent_card = json.loads(manifest)
+        elif (
+            Path(location).expanduser().exists()
+            or location.startswith("git@")
+            or location.startswith("github.com/")
+            or location.startswith("www.github.com/")
+            or location.endswith(".git")
+            or ((u := urlparse(location)).scheme.startswith("http") and u.netloc.endswith("github.com"))
+            or u.scheme in {"ssh", "git", "git+ssh"}
+        ):
+            console.info(f"Assuming build context, attempting to build agent from [bold]{location}[/bold]")
+            location, agent_card = await build(location, dockerfile, tag=None, vm_name=vm_name, import_image=True)
+        else:
+            console.info(f"Assuming public docker image, attempting to pull {location}")
 
-        try:
-            if process.returncode:
-                # If the image was not found locally, try building image
-                location, agent_card = await build(location, dockerfile, tag=None, vm_name=vm_name, import_image=True)
-            else:
-                manifest = base64.b64decode(
-                    json.loads(process.stdout)[0]["Config"]["Labels"]["beeai.dev.agent.json"]
-                ).decode()
-                agent_card = json.loads(manifest)
-            # If all build and inspect succeeded, use the local image, else use the original; maybe it exists remotely
-        except CalledProcessError as e:
-            errors.append(e)
-            console.print("Attempting to use remote image...")
-        try:
-            with status("Registering agent to platform"):
-                async with configuration.use_platform_client():
-                    await Provider.create(
-                        location=location,
-                        agent_card=AgentCard.model_validate(agent_card) if agent_card else None,
-                    )
-            console.print("Registering agent to platform [[green]DONE[/green]]")
-        except Exception as e:
-            raise ExceptionGroup("Error occured", [*errors, e]) from e
+        with status("Registering agent to platform"):
+            async with configuration.use_platform_client():
+                await Provider.create(
+                    location=location,
+                    agent_card=AgentCard.model_validate(agent_card) if agent_card else None,
+                )
+        console.success(f"Agent [bold]{location}[/bold] added to platform")
         await list_agents()
 
 
@@ -207,8 +218,11 @@ async def uninstall_agent(
     search_path: typing.Annotated[
         str, typer.Argument(..., help="Short ID, agent name or part of the provider location")
     ],
+    yes: typing.Annotated[bool, typer.Option("--yes", "-y", help="Skip confirmation prompts.")] = False,
 ) -> None:
     """Remove agent"""
+    url = announce_server_action(f"Removing agent '{search_path}' from")
+    await confirm_server_action("Proceed with removing this agent from", url=url, yes=yes)
     with console.status("Uninstalling agent (may take a few minutes)...", spinner="dots"):
         async with configuration.use_platform_client():
             remove_provider = select_provider(search_path, await Provider.list()).id
@@ -223,6 +237,7 @@ async def stream_logs(
     ],
 ):
     """Stream agent provider logs"""
+    announce_server_action(f"Streaming logs for '{search_path}' from")
     async with configuration.use_platform_client():
         provider = select_provider(search_path, await Provider.list()).id
         async for message in Provider.stream_logs(provider):
@@ -245,6 +260,15 @@ async def _ask_form_questions(form_render: FormRender) -> FormResponse:
                 validate=EmptyInputValidator() if field.required else None,
             ).execute_async()
             form_values[field.id] = TextFieldValue(value=answer)
+        elif isinstance(field, SingleSelectField):
+            choices = [Choice(value=opt.id, name=opt.label) for opt in field.options]
+            answer = await inquirer.fuzzy(  # pyright: ignore[reportPrivateImportUsage]
+                message=field.label + ":",
+                choices=choices,
+                default=field.default_value,
+                validate=EmptyInputValidator() if field.required else None,
+            ).execute_async()
+            form_values[field.id] = SingleSelectFieldValue(value=answer)
         elif isinstance(field, MultiSelectField):
             choices = [Choice(value=opt.id, name=opt.label) for opt in field.options]
             answer = await inquirer.checkbox(  # pyright: ignore[reportPrivateImportUsage]
@@ -254,6 +278,7 @@ async def _ask_form_questions(form_render: FormRender) -> FormResponse:
                 validate=EmptyInputValidator() if field.required else None,
             ).execute_async()
             form_values[field.id] = MultiSelectFieldValue(value=answer)
+
         elif isinstance(field, DateField):
             year = await inquirer.text(  # pyright: ignore[reportPrivateImportUsage]
                 message=f"{field.label} (year):",
@@ -295,7 +320,7 @@ async def _ask_form_questions(form_render: FormRender) -> FormResponse:
             ).execute_async()
             form_values[field.id] = CheckboxFieldValue(value=answer)
     console.print()
-    return FormResponse(id=form_render.id, values=form_values)
+    return FormResponse(values=form_values)
 
 
 async def _run_agent(
@@ -360,7 +385,11 @@ async def _run_agent(
                 else {}
             )
             | (
-                {FormExtensionSpec.URI: typing.cast(FormResponse, input).model_dump(mode="json")}
+                {
+                    FormServiceExtensionSpec.URI: {
+                        "form_fulfillments": {"initial_form": typing.cast(FormResponse, input).model_dump(mode="json")}
+                    }
+                }
                 if isinstance(input, FormResponse)
                 else {}
             )
@@ -446,7 +475,7 @@ async def _run_agent(
                         raise ValueError("Agent requires input but no input handler provided")
 
                     if form_metadata := (
-                        message.metadata.get(FormExtensionSpec.URI) if message and message.metadata else None
+                        message.metadata.get(FormRequestExtensionSpec.URI) if message and message.metadata else None
                     ):
                         stream = client.send_message(
                             Message(
@@ -456,7 +485,7 @@ async def _run_agent(
                                 task_id=task_id,
                                 context_id=context_token.context_id,
                                 metadata={
-                                    FormExtensionSpec.URI: (
+                                    FormRequestExtensionSpec.URI: (
                                         await _ask_form_questions(FormRender.model_validate(form_metadata))
                                     ).model_dump(mode="json")
                                 },
@@ -737,6 +766,7 @@ async def run_agent(
     ] = None,
 ) -> None:
     """Run an agent."""
+    announce_server_action(f"Running agent '{search_path}' on")
     async with configuration.use_platform_client():
         providers = await Provider.list()
         await ensure_llm_provider()
@@ -778,9 +808,9 @@ async def run_agent(
 
         initial_form_render = next(
             (
-                FormRender.model_validate(ext.params)
+                FormRender.model_validate(ext.params["form_demands"]["initial_form"])
                 for ext in agent.capabilities.extensions or ()
-                if ext.uri == FormExtensionSpec.URI and ext.params
+                if ext.uri == FormServiceExtensionSpec.URI and ext.params
             ),
             None,
         )
@@ -827,19 +857,13 @@ async def run_agent(
             )
 
 
-def render_enum(value: str, colors: dict[str, str]) -> str:
-    if color := colors.get(value):
-        return f"[{color}]{value}[/{color}]"
-    return value
-
-
 @app.command("list")
 async def list_agents():
     """List agents."""
+    announce_server_action("Listing agents on")
     async with configuration.use_platform_client():
         providers = await Provider.list()
     max_provider_len = max(len(ProviderUtils.short_location(p)) for p in providers) if providers else 0
-    max_error_len = max(len(ProviderUtils.last_error(p) or "") for p in providers) if providers else 0
 
     def _sort_fn(provider: Provider):
         state = {"missing": "1"}
@@ -852,39 +876,32 @@ async def list_agents():
     with create_table(
         Column("Short ID", style="yellow"),
         Column("Name", style="yellow"),
-        Column("State", width=len("starting")),
-        Column("Description", ratio=2),
-        Column("Interaction"),
+        Column("State"),
         Column("Location", max_width=min(max(max_provider_len, len("Location")), 70)),
-        Column("Missing Env", max_width=50),
-        Column("Last Error", max_width=min(max(max_error_len, len("Last Error")), 50)),
+        Column("Info", ratio=2),
         no_wrap=True,
     ) as table:
         for provider in sorted(providers, key=_sort_fn):
-            state = None
-            missing_env = None
-            state = provider.state
-            missing_env = ",".join(var.name for var in provider.missing_configuration)
             table.add_row(
                 provider.id[:8],
                 provider.agent_card.name,
-                render_enum(
-                    state or "<unknown>",
-                    {
-                        "running": "green",
-                        "online": "green",
-                        "ready": "blue",
-                        "starting": "blue",
-                        "missing": "grey",
-                        "offline": "grey",
-                        "error": "red",
-                    },
-                ),
-                (provider.agent_card.description or "<none>").replace("\n", " "),
-                (ProviderUtils.detail(provider) or {}).get("interaction_mode") or "<none>",
+                {
+                    "running": "[green]▶ running[/green]",
+                    "online": "[green]● connected[/green]",
+                    "ready": "[green]● idle[/green]",
+                    "starting": "[yellow]✱ starting[/yellow]",
+                    "missing": "[bright_black]○ not started[/bright_black]",
+                    "offline": "[bright_black]○ disconnected[/bright_black]",
+                    "error": "[red]✘ error[/red]",
+                }.get(provider.state, provider.state or "<unknown>"),
                 ProviderUtils.short_location(provider) or "<none>",
-                missing_env or "<none>",
-                ProviderUtils.last_error(provider) or "<none>",
+                (
+                    f"Error: {error}"
+                    if provider.state == "error" and (error := ProviderUtils.last_error(provider))
+                    else f"Missing ENV: {{{', '.join(missing_env)}}}"
+                    if (missing_env := [var.name for var in provider.missing_configuration])
+                    else "<none>"
+                ),
             )
     console.print(table)
 
@@ -931,7 +948,9 @@ async def agent_detail(
     ],
 ):
     """Show agent details."""
-    provider = select_provider(search_path, await Provider.list())
+    announce_server_action(f"Showing agent details for '{search_path}' on")
+    async with configuration.use_platform_client():
+        provider = select_provider(search_path, await Provider.list())
     agent = provider.agent_card
 
     basic_info = f"# {agent.name}\n{agent.description}"
@@ -977,8 +996,11 @@ async def add_env(
         str, typer.Argument(..., help="Short ID, agent name or part of the provider location")
     ],
     env: typing.Annotated[list[str], typer.Argument(help="Environment variables to pass to agent")],
+    yes: typing.Annotated[bool, typer.Option("--yes", "-y", help="Skip confirmation prompts.")] = False,
 ) -> None:
     """Store environment variables"""
+    url = announce_server_action(f"Adding environment variables for '{search_path}' on")
+    await confirm_server_action("Apply these environment variable changes on", url=url, yes=yes)
     env_vars = dict(parse_env_var(var) for var in env)
     async with configuration.use_platform_client():
         provider = select_provider(search_path, await Provider.list())
@@ -993,6 +1015,7 @@ async def list_env(
     ],
 ):
     """List stored environment variables"""
+    announce_server_action(f"Listing environment variables for '{search_path}' on")
     async with configuration.use_platform_client():
         provider = select_provider(search_path, await Provider.list())
     await _list_env(provider)
@@ -1004,7 +1027,10 @@ async def remove_env(
         str, typer.Argument(..., help="Short ID, agent name or part of the provider location")
     ],
     env: typing.Annotated[list[str], typer.Argument(help="Environment variable(s) to remove")],
+    yes: typing.Annotated[bool, typer.Option("--yes", "-y", help="Skip confirmation prompts.")] = False,
 ):
+    url = announce_server_action(f"Removing environment variables from '{search_path}' on")
+    await confirm_server_action("Remove the selected environment variables on", url=url, yes=yes)
     async with configuration.use_platform_client():
         provider = select_provider(search_path, await Provider.list())
         await provider.update_variables(variables=dict.fromkeys(env))

{agentstack_cli-0.4.2rc1 → agentstack_cli-0.4.2rc3}/src/agentstack_cli/commands/build.py

@@ -24,7 +24,16 @@ from tenacity import AsyncRetrying, retry_if_exception_type, stop_after_delay, w
 
 from agentstack_cli.async_typer import AsyncTyper
 from agentstack_cli.console import console
-from agentstack_cli.utils import capture_output, extract_messages, print_log, run_command, status, verbosity
+from agentstack_cli.utils import (
+    announce_server_action,
+    capture_output,
+    confirm_server_action,
+    extract_messages,
+    print_log,
+    run_command,
+    status,
+    verbosity,
+)
 
 
 async def find_free_port():
@@ -145,6 +154,7 @@ async def server_side_build_experimental(
         str | None, typer.Option(help="Short ID, agent name or part of the provider location")
     ] = None,
     add: typing.Annotated[bool, typer.Option(help="Add agent to the platform after build")] = False,
+    yes: typing.Annotated[bool, typer.Option("--yes", "-y", help="Skip confirmation prompts.")] = False,
 ):
     """EXPERIMENTAL: Build agent from github repository in the platform."""
     from agentstack_cli.commands.agent import select_provider
@@ -157,6 +167,9 @@ async def server_side_build_experimental(
     if dockerfile:
         build_configuration = BuildConfiguration(dockerfile_path=Path(dockerfile))
 
+    url = announce_server_action(f"Starting server-side build for '{github_url}' on")
+    await confirm_server_action("Proceed with building this agent on", url=url, yes=yes)
+
     async with Configuration().use_platform_client():
         on_complete = None
         if replace:

{agentstack_cli-0.4.2rc1 → agentstack_cli-0.4.2rc3}/src/agentstack_cli/commands/mcp.py

@@ -9,9 +9,7 @@ from rich.table import Column
 
 from agentstack_cli.api import api_request
 from agentstack_cli.async_typer import AsyncTyper, console, create_table
-from agentstack_cli.utils import (
-    status,
-)
+from agentstack_cli.utils import announce_server_action, confirm_server_action, status
 
 app = AsyncTyper()
 
@@ -28,9 +26,12 @@ async def add_provider(
     transport: typing.Annotated[
         Transport, typer.Argument(help="Transport the MCP server uses")
     ] = Transport.STREAMABLE_HTTP,
+    yes: typing.Annotated[bool, typer.Option("--yes", "-y", help="Skip confirmation prompts.")] = False,
 ) -> None:
     """Install discovered MCP server."""
 
+    url = announce_server_action(f"Registering MCP server '{name}' on")
+    await confirm_server_action("Proceed with registering this MCP server on", url=url, yes=yes)
     with status("Registering server to platform"):
         await api_request(
             "POST", "mcp/providers", json={"name": name, "location": location, "transport": transport.value}
@@ -43,6 +44,7 @@ async def add_provider(
 async def list_providers():
     """List MCP servers."""
 
+    announce_server_action("Listing MCP servers on")
     providers = await api_request("GET", "mcp/providers")
     assert providers
     with create_table(
@@ -61,8 +63,11 @@ async def list_providers():
 @app.command("remove | uninstall | rm | delete")
 async def uninstall_provider(
     name: typing.Annotated[str, typer.Argument(help="Name of the MCP provider to remove")],
+    yes: typing.Annotated[bool, typer.Option("--yes", "-y", help="Skip confirmation prompts.")] = False,
 ) -> None:
     """Remove MCP server."""
+    url = announce_server_action(f"Removing MCP server '{name}' from")
+    await confirm_server_action("Proceed with removing this MCP server from", url=url, yes=yes)
     provider = await _get_provider_by_name(name)
     if provider:
         await api_request("delete", f"mcp/providers/{provider['id']}")
@@ -79,6 +84,7 @@ app.add_typer(tool_app, name="tool", no_args_is_help=True, help="Inspect tools."
 async def list_tools() -> None:
     """List tools."""
 
+    announce_server_action("Listing MCP tools on")
     tools = await api_request("GET", "mcp/tools")
     assert tools
     with create_table(
@@ -99,9 +105,12 @@ app.add_typer(toolkit_app, name="toolkit", no_args_is_help=True, help="Create to
 @toolkit_app.command("create")
 async def toolkit(
     tools: typing.Annotated[list[str], typer.Argument(help="Tools to put in the toolkit")],
+    yes: typing.Annotated[bool, typer.Option("--yes", "-y", help="Skip confirmation prompts.")] = False,
 ) -> None:
     """Create a toolkit."""
 
+    url = announce_server_action("Creating MCP toolkit on")
+    await confirm_server_action("Proceed with creating this MCP toolkit on", url=url, yes=yes)
     api_tools = await _get_tools_by_names(tools)
     assert api_tools
     toolkit = await api_request("POST", "mcp/toolkits", json={"tools": [tool["id"] for tool in api_tools]})

{agentstack_cli-0.4.2rc1 → agentstack_cli-0.4.2rc3}/src/agentstack_cli/commands/model.py

@@ -25,7 +25,7 @@ from rich.table import Column
 from agentstack_cli.api import openai_client
 from agentstack_cli.async_typer import AsyncTyper, console, create_table
 from agentstack_cli.configuration import Configuration
-from agentstack_cli.utils import run_command, verbosity
+from agentstack_cli.utils import announce_server_action, confirm_server_action, run_command, verbosity
 
 app = AsyncTyper()
 configuration = Configuration()
@@ -378,6 +378,7 @@ async def _select_default_model(capability: ModelCapability) -> str | None:
 
 @app.command("list")
 async def list_models():
+    announce_server_action("Listing models on")
     async with configuration.use_platform_client():
         config = await SystemConfiguration.get()
     async with openai_client() as client:
@@ -415,6 +416,7 @@ async def setup(
     verbose: typing.Annotated[bool, typer.Option("-v")] = False,
 ):
     """Interactive setup for LLM and embedding provider environment variables"""
+    announce_server_action("Configuring model providers for")
 
     with verbosity(verbose):
         async with configuration.use_platform_client():
@@ -439,7 +441,17 @@ async def setup(
                 default_llm_model = await _select_default_model(ModelCapability.LLM)
 
                 default_embedding_model = None
-                if ModelCapability.EMBEDDING in llm_provider.capabilities:
+                if (
+                    ModelCapability.EMBEDDING in llm_provider.capabilities
+                    and llm_provider.type
+                    != ModelProviderType.RITS  # RITS does not support embeddings, but we treat it as OTHER
+                    and (
+                        llm_provider.type != ModelProviderType.OTHER  # OTHER may not support embeddings, so we ask
+                        or inquirer.confirm(  # type: ignore
+                            "Do you want to also set up an embedding model from the same provider?", default=True
+                        )
+                    )
+                ):
                     default_embedding_model = await _select_default_model(ModelCapability.EMBEDDING)
                 elif await inquirer.confirm(  # type: ignore
                     message="Do you want to configure an embedding provider? (recommended)", default=True
@@ -447,6 +459,8 @@ async def setup(
                     console.print("[bold]Setting up embedding provider...[/bold]")
                     await _add_provider(capability=ModelCapability.EMBEDDING, use_true_localhost=use_true_localhost)
                     default_embedding_model = await _select_default_model(ModelCapability.EMBEDDING)
+                else:
+                    console.hint("You can add an embedding provider later with: [green]agentstack model add[/green]")
 
                 with console.status("Saving configuration...", spinner="dots"):
                     await SystemConfiguration.update(
@@ -468,7 +482,10 @@ async def select_default_model(
         ModelCapability | None, typer.Argument(help="Which default model to change (llm/embedding)")
     ] = None,
     model_id: typing.Annotated[str | None, typer.Argument(help="Model ID to be used as default")] = None,
+    yes: typing.Annotated[bool, typer.Option("--yes", "-y", help="Skip confirmation prompts.")] = False,
 ):
+    url = announce_server_action("Updating default model for")
+    await confirm_server_action("Proceed with updating default model on", url=url, yes=yes)
     if not capability:
         capability = await inquirer.select(  # type: ignore
             message="Which default model would you like to change?",
@@ -479,6 +496,8 @@ async def select_default_model(
         ).execute_async()
 
     assert capability
+    capability_name = str(getattr(capability, "value", capability)).lower()
+    await confirm_server_action(f"Proceed with updating the default {capability_name} model on", url=url, yes=yes)
     async with configuration.use_platform_client():
         model = model_id if model_id else await _select_default_model(capability)
         conf = await SystemConfiguration.get()
@@ -504,6 +523,7 @@ def _list_providers(providers: list[ModelProvider]):
 
 @model_provider_app.command("list")
 async def list_model_providers():
+    announce_server_action("Listing model providers on")
     async with configuration.use_platform_client():
         providers = await ModelProvider.list()
         _list_providers(providers)
@@ -516,6 +536,7 @@ async def add_provider(
         ModelCapability | None, typer.Argument(help="Which default model to change (llm/embedding)")
     ] = None,
 ):
+    announce_server_action("Adding provider for")
     if not capability:
         capability = await inquirer.select(  # type: ignore
             message="Which default provider would you like to add?",
@@ -561,7 +582,11 @@ async def remove_provider(
     search_path: typing.Annotated[
         str | None, typer.Argument(..., help="Provider type or part of the provider base url")
     ] = None,
+    yes: typing.Annotated[bool, typer.Option("--yes", "-y", help="Skip confirmation prompts.")] = False,
 ):
+    descriptor = search_path or "selected provider"
+    url = announce_server_action(f"Removing model provider '{descriptor}' from")
+    await confirm_server_action("Proceed with removing the selected model provider from", url=url, yes=yes)
     async with configuration.use_platform_client():
         conf = await SystemConfiguration.get()
 

{agentstack_cli-0.4.2rc1 → agentstack_cli-0.4.2rc3}/src/agentstack_cli/commands/platform/wsl_driver.py

@@ -57,8 +57,13 @@ class WSLDriver(BaseDriver):
     @typing.override
     async def create_vm(self):
         if (await run_command(["wsl.exe", "--status"], "Checking for WSL2", check=False)).returncode != 0:
-            await run_command(["wsl.exe", "--install", "--no-launch", "--web-download"], "Installing WSL2")
-        await run_command(["wsl.exe", "--upgrade"], "Upgrading WSL2", check=False)
+            console.error(
+                "WSL is not installed. Please follow the Agent Stack installation instructions: https://agentstack.beeai.dev/introduction/quickstart#windows"
+            )
+            console.hint(
+                "Run [green]wsl.exe --install[/green] as administrator. If you just did this, restart your PC and run the same command again. Full installation may require up to two restarts. WSL is properly set up once you reach a working Linux terminal. You can verify this by running [green]wsl.exe[/green] without arguments."
+            )
+            sys.exit(1)
 
         config_file = (
             pathlib.Path.home()

{agentstack_cli-0.4.2rc1 → agentstack_cli-0.4.2rc3}/src/agentstack_cli/commands/server.py

@@ -68,7 +68,7 @@ async def _wait_for_auth_code(port: int = 9001) -> str:
     return code
 
 
-@app.command("login | change | select | default")
+@app.command("login | change | select | default | switch")
 async def server_login(server: typing.Annotated[str | None, typer.Argument()] = None):
     """Login to a server or switch between logged in servers."""
     server = server or (

{agentstack_cli-0.4.2rc1 → agentstack_cli-0.4.2rc3}/src/agentstack_cli/utils.py

@@ -21,6 +21,7 @@ import typer
 import yaml
 from anyio import create_task_group
 from anyio.abc import ByteReceiveStream, TaskGroup
+from InquirerPy import inquirer
 from jsf import JSF
 from prompt_toolkit import PromptSession
 from prompt_toolkit.shortcuts import CompleteStyle
@@ -28,6 +29,7 @@ from pydantic import BaseModel
 from rich.console import Capture
 from rich.text import Text
 
+from agentstack_cli.configuration import Configuration
 from agentstack_cli.console import console, err_console
 
 if TYPE_CHECKING:
@@ -115,6 +117,37 @@ def remove_nullable(schema: dict[str, Any]) -> dict[str, Any]:
 prompt_session = None
 
 
+def require_active_server() -> str:
+    """Return the active server URL or exit if none is selected."""
+    if url := Configuration().auth_manager.active_server:
+        return url
+    console.error("No server selected.")
+    console.hint(
+        "Run [green]agentstack platform start[/green] to start a local server, or [green]agentstack server login[/green] to connect to a remote one."
+    )
+    sys.exit(1)
+
+
+def announce_server_action(message: str, url: str | None = None) -> str:
+    """Log an info message that includes the active server URL and return it."""
+    url = url or require_active_server()
+    console.info(f"{message} [cyan]{url}[/cyan]")
+    return url
+
+
+async def confirm_server_action(message: str, url: str | None = None, *, yes: bool = False) -> None:
+    """Ask for confirmation before continuing with an action on the active server."""
+    if yes:
+        return
+    url = url or require_active_server()
+    confirmed = await inquirer.confirm(  # type: ignore
+        message=f"{message} [cyan]{url}[/cyan]?", default=False
+    ).execute_async()
+    if not confirmed:
+        console.info("Action cancelled.")
+        raise typer.Exit(1)
+
+
 def prompt_user(
     prompt: str | None = None,
     completer: "Completer | None" = None,
@@ -162,7 +195,7 @@ async def capture_output(process: anyio.abc.Process, stream_contents: list | Non
     async def receive_logs(stream: ByteReceiveStream, index=0):
         buffer = BytesIO()
         async for chunk in stream:
-            err_console.print(Text.from_ansi(chunk.decode()), style="dim")
+            err_console.print(Text.from_ansi(chunk.decode(errors="replace")), style="dim")
             buffer.write(chunk)
         if stream_contents:
             stream_contents[index] = buffer.getvalue()

agentstack_cli-0.4.2rc1/src/agentstack_cli/__init__.py

@@ -1,77 +0,0 @@
-# Copyright 2025 © BeeAI a Series of LF Projects, LLC
-# SPDX-License-Identifier: Apache-2.0
-
-import logging
-import typing
-from copy import deepcopy
-
-import typer
-
-import agentstack_cli.commands.agent
-import agentstack_cli.commands.build
-import agentstack_cli.commands.mcp
-import agentstack_cli.commands.model
-import agentstack_cli.commands.platform
-import agentstack_cli.commands.self
-import agentstack_cli.commands.server
-from agentstack_cli.async_typer import AsyncTyper
-from agentstack_cli.configuration import Configuration
-
-logging.basicConfig(level=logging.INFO if Configuration().debug else logging.FATAL)
-logging.getLogger("httpx").setLevel(logging.WARNING)  # not sure why this is necessary
-
-app = AsyncTyper(no_args_is_help=True)
-app.add_typer(agentstack_cli.commands.model.app, name="model", no_args_is_help=True, help="Manage model providers.")
-app.add_typer(agentstack_cli.commands.agent.app, name="agent", no_args_is_help=True, help="Manage agents.")
-app.add_typer(
-    agentstack_cli.commands.platform.app, name="platform", no_args_is_help=True, help="Manage Agent Stack platform."
-)
-app.add_typer(
-    agentstack_cli.commands.mcp.app, name="mcp", no_args_is_help=True, help="Manage MCP servers and toolkits."
-)
-app.add_typer(agentstack_cli.commands.build.app, name="", no_args_is_help=True, help="Build agent images.")
-app.add_typer(
-    agentstack_cli.commands.server.app,
-    name="server",
-    no_args_is_help=True,
-    help="Manage Agent Stack servers and authentication.",
-)
-app.add_typer(
-    agentstack_cli.commands.self.app,
-    name="self",
-    no_args_is_help=True,
-    help="Manage Agent Stack installation.",
-    hidden=True,
-)
-
-
-agent_alias = deepcopy(agentstack_cli.commands.agent.app)
-for cmd in agent_alias.registered_commands:
-    cmd.rich_help_panel = "Agent commands"
-
-app.add_typer(agent_alias, name="", no_args_is_help=True)
-
-
-@app.command("version")
-async def version(verbose: typing.Annotated[bool, typer.Option("-v", help="Show verbose output")] = False):
-    """Print version of the Agent Stack CLI."""
-    import agentstack_cli.commands.self
-
-    await agentstack_cli.commands.self.version(verbose=verbose)
-
-
-@app.command("ui")
-async def ui():
-    """Launch the graphical interface."""
-    import webbrowser
-
-    import agentstack_cli.commands.model
-
-    await agentstack_cli.commands.model.ensure_llm_provider()
-    webbrowser.open(
-        "http://localhost:8334"
-    )  # TODO: This always opens the local UI, how to open the UI of a logged in server instead?
-
-
-if __name__ == "__main__":
-    app()