agentstack-cli 0.5.0rc5__tar.gz → 0.5.1rc3__tar.gz

{agentstack_cli-0.5.0rc5 → agentstack_cli-0.5.1rc3}/PKG-INFO

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

{agentstack_cli-0.5.0rc5 → agentstack_cli-0.5.1rc3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "agentstack-cli"
-version = "0.5.0-rc5"
+version = "0.5.1-rc3"
 description = "Agent Stack CLI"
 readme = "README.md"
 authors = [{ name = "IBM Corp." }]
@@ -75,7 +75,6 @@ lint.ignore = [
 force-exclude = true
 
 [tool.pyright]
-reportUnusedCallResult = false
 ignore = ["tests/**", "examples/cli.py"]
 venvPath = "."
 venv = ".venv"

{agentstack_cli-0.5.0rc5 → agentstack_cli-0.5.1rc3}/src/agentstack_cli/__init__.py

@@ -16,16 +16,14 @@ import agentstack_cli.commands.platform
 import agentstack_cli.commands.self
 import agentstack_cli.commands.server
 import agentstack_cli.commands.user
-from agentstack_cli.async_typer import AliasGroup, AsyncTyper
+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
 
 
-class RootHelpGroup(AliasGroup):
-    def get_help(self, ctx):
-        return """\
+HELP_TEXT = """\
 Usage: agentstack [OPTIONS] COMMAND [ARGS]...
 
 ╭─ Getting Started ──────────────────────────────────────────────────────────╮
@@ -63,7 +61,19 @@ Usage: agentstack [OPTIONS] COMMAND [ARGS]...
 """
 
 
-app = AsyncTyper(no_args_is_help=True, cls=RootHelpGroup)
+app = AsyncTyper()
+
+
+@app.callback(invoke_without_command=True)
+def main(
+    ctx: typer.Context,
+    help: bool = typer.Option(False, "--help", help="Show this message and exit."),
+):
+    if help or ctx.invoked_subcommand is None:
+        typer.echo(HELP_TEXT)
+        raise typer.Exit()
+
+
 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-0.5.0rc5 → agentstack_cli-0.5.1rc3}/src/agentstack_cli/api.py

@@ -16,6 +16,7 @@ import openai
 import pydantic
 from a2a.client import A2AClientHTTPError, Client, ClientConfig, ClientFactory
 from a2a.types import AgentCard
+from agentstack_sdk.platform.context import ContextToken
 from httpx import HTTPStatusError
 from httpx._types import RequestFiles
 
@@ -127,14 +128,10 @@ async def fetch_server_version() -> str | None:
 
 
 @asynccontextmanager
-async def a2a_client(agent_card: AgentCard, use_auth: bool = True) -> AsyncIterator[Client]:
+async def a2a_client(agent_card: AgentCard, context_token: ContextToken) -> AsyncIterator[Client]:
     try:
         async with httpx.AsyncClient(
-            headers=(
-                {"Authorization": f"Bearer {token}"}
-                if use_auth and (token := await config.auth_manager.load_auth_token())
-                else {}
-            ),
+            headers={"Authorization": f"Bearer {context_token.token.get_secret_value()}"},
             follow_redirects=True,
             timeout=timedelta(hours=1).total_seconds(),
         ) as httpx_client:

{agentstack_cli-0.5.0rc5 → agentstack_cli-0.5.1rc3}/src/agentstack_cli/commands/agent.py

@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import abc
+import asyncio
 import base64
 import calendar
 import inspect
@@ -61,6 +62,21 @@ from agentstack_sdk.a2a.extensions.common.form import (
     TextField,
     TextFieldValue,
 )
+from agentstack_sdk.a2a.extensions.ui.settings import (
+    AgentRunSettings,
+    CheckboxGroupField,
+    CheckboxGroupFieldValue,
+    SettingsExtensionSpec,
+    SettingsFieldValue,
+    SettingsRender,
+)
+from agentstack_sdk.a2a.extensions.ui.settings import (
+    CheckboxFieldValue as SettingsCheckboxFieldValue,
+)
+from agentstack_sdk.a2a.extensions.ui.settings import SingleSelectField as SettingsSingleSelectField
+from agentstack_sdk.a2a.extensions.ui.settings import (
+    SingleSelectFieldValue as SettingsSingleSelectFieldValue,
+)
 from agentstack_sdk.platform import BuildState, File, ModelProvider, Provider, UserFeedback
 from agentstack_sdk.platform.context import Context, ContextPermissions, ContextToken, Permissions
 from agentstack_sdk.platform.model_provider import ModelCapability
@@ -159,7 +175,22 @@ async def add_agent(
     verbose: typing.Annotated[bool, typer.Option("-v", "--verbose", help="Show verbose output")] = False,
     yes: typing.Annotated[bool, typer.Option("--yes", "-y", help="Skip confirmation prompts.")] = False,
 ) -> None:
-    """Add a docker image or GitHub repository [aliases: install]"""
+    """Add a docker image or GitHub repository.
+
+    This command supports a variety of GitHub URL formats for deploying agents:
+
+    - **Basic URL**: `https://github.com/myorg/myrepo`
+    - **Git Protocol URL**: `git+https://github.com/myorg/myrepo`
+    - **URL with .git suffix**: `https://github.com/myorg/myrepo.git`
+    - **URL with Version Tag**: `https://github.com/myorg/myrepo@v1.0.0`
+    - **URL with Branch Name**: `https://github.com/myorg/myrepo@my-branch`
+    - **URL with Subfolder Path**: `https://github.com/myorg/myrepo#path=/path/to/agent`
+    - **Combined Formats**: `https://github.com/myorg/myrepo.git@v1.0.0#path=/path/to/agent`
+    - **Enterprise GitHub**: `https://github.mycompany.com/myorg/myrepo`
+    - **With a custom Dockerfile location**: `agentstack add --dockerfile /my-agent/path/to/Dockerfile "https://github.com/my-org/my-awesome-agents@main#path=/my-agent"`
+
+    [aliases: install]
+    """
     if location is None:
         repo_input = (
             await inquirer.text(  # pyright: ignore[reportPrivateImportUsage]
@@ -308,11 +339,21 @@ async def update_agent(
         await list_agents()
 
 
-def select_provider(search_path: str, providers: list[Provider]):
+def search_path_match_providers(search_path: str, providers: list[Provider]) -> dict[str, Provider]:
     search_path = search_path.lower()
-    provider_candidates = {p.id: p for p in providers if search_path in p.id.lower()}
-    provider_candidates.update({p.id: p for p in providers if search_path in p.agent_card.name.lower()})
-    provider_candidates.update({p.id: p for p in providers if search_path in ProviderUtils.short_location(p)})
+    return {
+        p.id: p
+        for p in providers
+        if (
+            search_path in p.id.lower()
+            or search_path in p.agent_card.name.lower()
+            or search_path in ProviderUtils.short_location(p)
+        )
+    }
+
+
+def select_provider(search_path: str, providers: list[Provider]):
+    provider_candidates = search_path_match_providers(search_path, providers)
     if len(provider_candidates) != 1:
         provider_candidates = [f"  - {c}" for c in provider_candidates]
         remove_providers_detail = ":\n" + "\n".join(provider_candidates) if provider_candidates else ""
@@ -321,20 +362,75 @@ def select_provider(search_path: str, providers: list[Provider]):
     return selected_provider
 
 
+async def select_providers_multi(search_path: str, providers: list[Provider]) -> list[Provider]:
+    """Select multiple providers matching the search path."""
+    provider_candidates = search_path_match_providers(search_path, providers)
+    if not provider_candidates:
+        raise ValueError(f"No matching agents found for '{search_path}'")
+
+    if len(provider_candidates) == 1:
+        return list(provider_candidates.values())
+
+    # Multiple matches - show selection menu
+    choices = [Choice(value=p.id, name=f"{p.agent_card.name} - {p.id}") for p in provider_candidates.values()]
+
+    selected_ids = await inquirer.checkbox(  # pyright: ignore[reportPrivateImportUsage]
+        message="Select agents to remove (use ↑/↓ to navigate, Space to select):", choices=choices
+    ).execute_async()
+
+    return [provider_candidates[pid] for pid in (selected_ids or [])]
+
+
 @app.command("remove | uninstall | rm | delete")
 async def uninstall_agent(
     search_path: typing.Annotated[
-        str, typer.Argument(..., help="Short ID, agent name or part of the provider location")
-    ],
+        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,
+    all: typing.Annotated[bool, typer.Option("--all", "-a", help="Remove all agents without selection.")] = 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
-            await Provider.delete(remove_provider)
+    if search_path and all:
+        console.error(
+            "[bold]Cannot specify both --all and a search path."
+            " Use --all to remove all agents, or provide a search path for specific agents."
+            "[/bold]"
+        )
+        raise typer.Exit(1)
+
+    async with configuration.use_platform_client():
+        providers = await Provider.list()
+        if len(providers) == 0:
+            console.info("No agents found to remove.")
+            return
+
+        if all:
+            selected_providers = providers
+        else:
+            selected_providers = await select_providers_multi(search_path, providers)
+        if not selected_providers:
+            console.info("No agents selected for removal, exiting.")
+            return
+        elif len(selected_providers) == 1:
+            agent_names = f"{selected_providers[0].agent_card.name} - {selected_providers[0].id.split('-', 1)[0]}"
+        else:
+            agent_names = "\n".join([f"  - {p.agent_card.name} - {p.id.split('-', 1)[0]}" for p in selected_providers])
+
+        message = f"\n[bold]Selected agents to remove:[/bold]\n{agent_names}\n from "
+
+        url = announce_server_action(message)
+        await confirm_server_action("Proceed with removing these agents from", url=url, yes=yes)
+
+        with console.status("Uninstalling agent(s) (may take a few minutes)...", spinner="dots"):
+            delete_tasks = [Provider.delete(provider.id) for provider in selected_providers]
+            results = await asyncio.gather(*delete_tasks, return_exceptions=True)
+
+        # Check results for exceptions
+        for provider, result in zip(selected_providers, results, strict=True):
+            if isinstance(result, Exception):
+                err_console.print(f"Failed to delete {provider.agent_card.name}: {result}")
+            # else: deletion succeeded
+
     await list_agents()
 
 
@@ -431,11 +527,43 @@ async def _ask_form_questions(form_render: FormRender) -> FormResponse:
     return FormResponse(values=form_values)
 
 
+async def _ask_settings_questions(settings_render: SettingsRender) -> AgentRunSettings:
+    """Ask user to configure settings using inquirer."""
+    settings_values: dict[str, SettingsFieldValue] = {}
+
+    console.print("[bold]Agent Settings[/bold]\n")
+
+    for field in settings_render.fields:
+        if isinstance(field, CheckboxGroupField):
+            checkbox_values: dict[str, SettingsCheckboxFieldValue] = {}
+            for checkbox in field.fields:
+                answer = await inquirer.confirm(  # pyright: ignore[reportPrivateImportUsage]
+                    message=checkbox.label + ":",
+                    default=checkbox.default_value,
+                ).execute_async()
+                checkbox_values[checkbox.id] = SettingsCheckboxFieldValue(value=answer)
+            settings_values[field.id] = CheckboxGroupFieldValue(values=checkbox_values)
+        elif isinstance(field, SettingsSingleSelectField):
+            choices = [Choice(value=opt.value, name=opt.label) for opt in field.options]
+            answer = await inquirer.fuzzy(  # pyright: ignore[reportPrivateImportUsage]
+                message=field.label + ":",
+                choices=choices,
+                default=field.default_value,
+            ).execute_async()
+            settings_values[field.id] = SettingsSingleSelectFieldValue(value=answer)
+        else:
+            raise ValueError(f"Unsupported settings field type: {type(field).__name__}")
+
+    console.print()
+    return AgentRunSettings(values=settings_values)
+
+
 async def _run_agent(
     client: Client,
     input: str | DataPart | FormResponse,
     agent_card: AgentCard,
     context_token: ContextToken,
+    settings: AgentRunSettings | None = None,
     dump_files_path: Path | None = None,
     handle_input: Callable[[], str] | None = None,
     task_id: str | None = None,
@@ -508,6 +636,7 @@ async def _run_agent(
                 if platform_extension_spec
                 else {}
             )
+            | ({SettingsExtensionSpec.URI: settings.model_dump(mode="json")} if settings else {})
         )
 
     msg = Message(
@@ -556,7 +685,7 @@ async def _run_agent(
                     console.print()  # Add newline after completion
                     return
                 case Task(id=task_id), TaskStatusUpdateEvent(
-                    status=TaskStatus(state=TaskState.working, message=message)
+                    status=TaskStatus(state=TaskState.working | TaskState.submitted, message=message)
                 ):
                     # Handle streaming content during working state
                     if message:
@@ -880,8 +1009,6 @@ async def run_agent(
     ] = None,
 ) -> None:
     """Run an agent."""
-    if search_path is not None and input is None and sys.stdin.isatty():
-        input = sys.stdin.read()
     async with configuration.use_platform_client():
         providers = await Provider.list()
         await ensure_llm_provider()
@@ -926,6 +1053,15 @@ async def run_agent(
     splash_screen = Group(Markdown(f"# {agent.name}  \n{agent.description}"), NewLine())
     handle_input = _create_input_handler([], splash_screen=splash_screen)
 
+    settings_render = next(
+        (
+            SettingsRender.model_validate(ext.params)
+            for ext in agent.capabilities.extensions or ()
+            if ext.uri == SettingsExtensionSpec.URI and ext.params
+        ),
+        None,
+    )
+
     if not input:
         if interaction_mode not in {InteractionMode.MULTI_TURN, InteractionMode.SINGLE_TURN}:
             err_console.error(
@@ -946,8 +1082,9 @@ async def run_agent(
 
         if interaction_mode == InteractionMode.MULTI_TURN:
             console.print(f"{user_greeting}\n")
+            settings_input = await _ask_settings_questions(settings_render) if settings_render else None
             turn_input = await _ask_form_questions(initial_form_render) if initial_form_render else handle_input()
-            async with a2a_client(provider.agent_card) as client:
+            async with a2a_client(provider.agent_card, context_token=context_token) as client:
                 while True:
                     console.print()
                     await _run_agent(
@@ -955,6 +1092,7 @@ async def run_agent(
                         input=turn_input,
                         agent_card=agent,
                         context_token=context_token,
+                        settings=settings_input,
                         dump_files_path=dump_files,
                         handle_input=handle_input,
                     )
@@ -963,24 +1101,29 @@ async def run_agent(
         elif interaction_mode == InteractionMode.SINGLE_TURN:
             user_greeting = ui_annotations.get("user_greeting", None) or "Enter your instructions."
             console.print(f"{user_greeting}\n")
+            settings_input = await _ask_settings_questions(settings_render) if settings_render else None
             console.print()
-            async with a2a_client(provider.agent_card) as client:
+            async with a2a_client(provider.agent_card, context_token=context_token) as client:
                 await _run_agent(
                     client,
                     input=await _ask_form_questions(initial_form_render) if initial_form_render else handle_input(),
                     agent_card=agent,
                     context_token=context_token,
+                    settings=settings_input,
                     dump_files_path=dump_files,
                     handle_input=handle_input,
                 )
 
     else:
-        async with a2a_client(provider.agent_card) as client:
+        settings_input = await _ask_settings_questions(settings_render) if settings_render else None
+
+        async with a2a_client(provider.agent_card, context_token=context_token) as client:
             await _run_agent(
                 client,
                 input,
                 agent_card=agent,
                 context_token=context_token,
+                settings=settings_input,
                 dump_files_path=dump_files,
                 handle_input=handle_input,
             )

{agentstack_cli-0.5.0rc5 → agentstack_cli-0.5.1rc3}/src/agentstack_cli/commands/build.py

@@ -113,7 +113,7 @@ async def client_side_build(
         context_hash = hashlib.sha256((context + (dockerfile or "")).encode()).hexdigest()[:6]
         context_shorter = re.sub(r"https?://", "", context).replace(r".git", "")
         context_shorter = re.sub(r"[^a-zA-Z0-9_-]+", "-", context_shorter)[:32].lstrip("-") or "provider"
-        tag = (tag or f"agentstack.local/{context_shorter}-{context_hash}:latest").lower()
+        tag = (tag or f"agentstack-registry-svc.default:5001/{context_shorter}-{context_hash}:latest").lower()
         await run_command(
             command=[
                 *(
@@ -135,11 +135,22 @@ async def client_side_build(
         if import_image:
             from agentstack_cli.commands.platform import get_driver
 
+            if "agentstack-registry-svc.default" not in tag:
+                source_tag = tag
+                tag = re.sub("^[^/]*/", "agentstack-registry-svc.default:5001/", tag)
+                await run_command(["docker", "tag", source_tag, tag], "Tagging image")
+
             driver = get_driver(vm_name=vm_name)
+
             if (await driver.status()) != "running":
                 console.error("Agent Stack platform is not running.")
                 sys.exit(1)
-            await driver.import_image(tag)
+
+            await driver.import_image_to_internal_registry(tag)
+            console.success(
+                "Agent was imported to the agent stack internal registry.\n"
+                + f"You can add it using [blue]agentstack add {tag}[/blue]"
+            )
 
         return tag, agent_card
 

{agentstack_cli-0.5.0rc5 → agentstack_cli-0.5.1rc3}/src/agentstack_cli/commands/model.py

@@ -36,7 +36,7 @@ class ModelProviderError(Exception): ...
 
 @functools.cache
 def _ollama_exe() -> str:
-    for exe in ("ollama", "ollama.exe"):
+    for exe in ("ollama", "ollama.exe", os.environ.get("LOCALAPPDATA", "") + "\\Programs\\Ollama\\ollama.exe"):
         if shutil.which(exe):
             return exe
     raise RuntimeError("Ollama executable not found")

{agentstack_cli-0.5.0rc5 → agentstack_cli-0.5.1rc3}/src/agentstack_cli/commands/platform/base_driver.py

@@ -22,6 +22,7 @@ class BaseDriver(abc.ABC):
 
     def __init__(self, vm_name: str = "agentstack"):
         self.vm_name = vm_name
+        self.loaded_images: set[str] = set()
 
     @abc.abstractmethod
     async def run_in_vm(
@@ -47,6 +48,9 @@ class BaseDriver(abc.ABC):
     @abc.abstractmethod
     async def import_image(self, tag: str) -> None: ...
 
+    @abc.abstractmethod
+    async def import_image_to_internal_registry(self, tag: str) -> None: ...
+
     @abc.abstractmethod
     async def exec(self, command: list[str]) -> None: ...
 
@@ -138,20 +142,17 @@ class BaseDriver(abc.ABC):
         ).stdout.decode()
         for image in import_images or []:
             await self.import_image(image)
+            self.loaded_images.add(image)
         for image in {typing.cast(str, yaml.safe_load(line)) for line in images_str.splitlines()} - set(
             import_images or []
         ):
             async for attempt in AsyncRetrying(stop=stop_after_attempt(5)):
                 with attempt:
                     attempt_num = attempt.retry_state.attempt_number
+                    image_id = image if "." in image.split("/")[0] else f"docker.io/{image}"
+                    self.loaded_images.add(image_id)
                     await self.run_in_vm(
-                        [
-                            "k3s",
-                            "ctr",
-                            "image",
-                            "pull",
-                            image if "." in image.split("/")[0] else f"docker.io/{image}",
-                        ],
+                        ["k3s", "ctr", "image", "pull", image_id],
                         f"Pulling image {image}" + (f" (attempt {attempt_num})" if attempt_num > 1 else ""),
                     )
 

{agentstack_cli-0.5.0rc5 → agentstack_cli-0.5.1rc3}/src/agentstack_cli/commands/platform/lima_driver.py

@@ -197,6 +197,72 @@ class LimaDriver(BaseDriver):
         finally:
             await image_path.unlink(missing_ok=True)
 
+    @typing.override
+    async def import_image_to_internal_registry(self, tag: str) -> None:
+        # 1. Check if registry is running
+        try:
+            await self.run_in_vm(
+                ["k3s", "kubectl", "get", "svc", "agentstack-registry-svc"],
+                "Checking internal registry availability",
+            )
+        except Exception as e:
+            console.warning(f"Internal registry service not found. Push might fail: {e}")
+
+        # 2. Export image from Docker to shared temp dir
+        image_dir = anyio.Path("/tmp/agentstack")
+        await image_dir.mkdir(exist_ok=True, parents=True)
+        image_file = f"{uuid.uuid4()}.tar"
+        image_path = image_dir / image_file
+
+        try:
+            await run_command(
+                ["docker", "image", "save", "-o", str(image_path), tag],
+                f"Exporting image {tag} from Docker",
+            )
+
+            # 3 & 4. Run Crane Job
+            crane_image = "ghcr.io/i-am-bee/alpine/crane:0.20.6"
+            for image in self.loaded_images:
+                if "alpine/crane" in image:
+                    crane_image = image
+                    break
+
+            job_name = f"push-{uuid.uuid4().hex[:6]}"
+            job_def = {
+                "apiVersion": "batch/v1",
+                "kind": "Job",
+                "metadata": {"name": job_name, "namespace": "default"},
+                "spec": {
+                    "backoffLimit": 0,
+                    "ttlSecondsAfterFinished": 60,
+                    "template": {
+                        "spec": {
+                            "restartPolicy": "Never",
+                            "containers": [
+                                {
+                                    "name": "crane",
+                                    "image": crane_image,
+                                    "command": ["crane", "push", f"/workspace/{image_file}", tag, "--insecure"],
+                                    "volumeMounts": [{"name": "workspace", "mountPath": "/workspace"}],
+                                }
+                            ],
+                            "volumes": [{"name": "workspace", "hostPath": {"path": "/tmp/agentstack"}}],
+                        }
+                    },
+                },
+            }
+
+            await self.run_in_vm(
+                ["k3s", "kubectl", "apply", "-f", "-"], "Starting push job", input=yaml.dump(job_def).encode()
+            )
+            await self.run_in_vm(
+                ["k3s", "kubectl", "wait", "--for=condition=complete", f"job/{job_name}", "--timeout=300s"],
+                "Waiting for push to complete",
+            )
+            await self.run_in_vm(["k3s", "kubectl", "delete", "job", job_name], "Cleaning up push job")
+        finally:
+            await image_path.unlink(missing_ok=True)
+
     @typing.override
     async def exec(self, command: list[str]):
         await anyio.run_process(

{agentstack_cli-0.5.0rc5 → agentstack_cli-0.5.1rc3}/src/agentstack_cli/commands/platform/wsl_driver.py

@@ -12,8 +12,6 @@ import typing
 import anyio
 import pydantic
 import yaml
-from InquirerPy import inquirer
-from InquirerPy.base.control import Choice
 
 from agentstack_cli.commands.platform.base_driver import BaseDriver
 from agentstack_cli.configuration import Configuration
@@ -87,29 +85,9 @@ class WSLDriver(BaseDriver):
             if not config.has_section("wsl2"):
                 config.add_section("wsl2")
 
-            if (
-                config.get("wsl2", "networkingMode", fallback=None) != "mirrored"
-                and await inquirer.select(  # type: ignore
-                    textwrap.dedent("""\
-                    The Agent Stack platform needs to switch WSL to `mirrored` networking mode in order to support connecting to Windows applications -- like Ollama or self-registered agents. If you skip this step, these features won't be available.
-
-                    However, the default `nat` mode is required by some software, like Docker Desktop or Rancher Desktop, to function properly. If you use such software, you may want to keep the default `nat` mode.
-
-                    (It can be changed anytime later in C:/Users/<your name>/.wslconfig, followed by `wsl --shutdown` and `agentstack platform start` to apply changes.)
-                    """),
-                    choices=[
-                        Choice(
-                            value=True,
-                            name="Change WSL2 networking mode to `mirrored`",
-                        ),
-                        Choice(
-                            value=False,
-                            name="Leave WSL2 networking mode as `nat`",
-                        ),
-                    ],
-                ).execute_async()
-            ):
-                config.set("wsl2", "networkingMode", "mirrored")
+            wsl2_networking_mode = config.get("wsl2", "networkingMode", fallback=None)
+            if wsl2_networking_mode and wsl2_networking_mode != "nat":
+                config.set("wsl2", "networkingMode", "nat")
                 f.seek(0)
                 f.truncate(0)
                 config.write(f)
@@ -154,6 +132,16 @@ class WSLDriver(BaseDriver):
         values_file: pathlib.Path | None = None,
         import_images: list[str] | None = None,
     ) -> None:
+        host_ip = (
+            (
+                await self.run_in_vm(
+                    ["bash", "-c", "ip route show | grep -i default | cut -d' ' -f3"],
+                    "Detecting host IP address",
+                )
+            )
+            .stdout.decode()
+            .strip()
+        )
         await self.run_in_vm(
             ["k3s", "kubectl", "apply", "-f", "-"],
             "Setting up internal networking",
@@ -163,7 +151,7 @@ class WSLDriver(BaseDriver):
                     "kind": "ConfigMap",
                     "metadata": {"name": "coredns-custom", "namespace": "kube-system"},
                     "data": {
-                        "default.server": "host.docker.internal {\n    hosts {\n        127.0.0.1 host.docker.internal\n        fallthrough\n    }\n}"
+                        "default.server": f"host.docker.internal {{\n    hosts {{\n        {host_ip} host.docker.internal\n        fallthrough\n    }}\n}}"
                     },
                 }
             ).encode(),
@@ -220,6 +208,10 @@ class WSLDriver(BaseDriver):
     async def import_image(self, tag: str) -> None:
         raise NotImplementedError("Importing images is not supported on this platform.")
 
+    @typing.override
+    async def import_image_to_internal_registry(self, tag: str) -> None:
+        raise NotImplementedError("Importing images to internal registry is not supported on this platform.")
+
     @typing.override
     async def exec(self, command: list[str]):
         await anyio.run_process(

{agentstack_cli-0.5.0rc5 → agentstack_cli-0.5.1rc3}/src/agentstack_cli/utils.py

@@ -309,10 +309,15 @@ def print_log(line, ansi_mode=False, out_console: Console | None = None):
     def decode(text: str):
         return Text.from_ansi(text) if ansi_mode else text
 
-    if line["stream"] == "stderr":
-        (out_console or err_console).print(decode(line["message"]))
-    elif line["stream"] == "stdout":
-        (out_console or console).print(decode(line["message"]))
+    match line:
+        case {"stream": "stderr"}:
+            (out_console or err_console).print(decode(line["message"]))
+        case {"stream": "stdout"}:
+            (out_console or console).print(decode(line["message"]))
+        case {"event": "[DONE]"}:
+            return
+        case _:
+            (out_console or console).print(line)
 
 
 def is_github_url(url: str) -> bool: