devs-cli 5.0.5__tar.gz → 6.0.0__tar.gz

{devs_cli-5.0.5/devs_cli.egg-info → devs_cli-6.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devs-cli
-Version: 5.0.5
+Version: 6.0.0
 Summary: DevContainer Management Tool - Manage multiple named devcontainers for any project
 Author: Dan Lester
 License-Expression: MIT

{devs_cli-5.0.5 → devs_cli-6.0.0}/devs/cli.py

@@ -5,6 +5,7 @@ import sys
 import subprocess
 import traceback
 from functools import wraps
+from typing import Callable, Sequence
 from importlib.metadata import version, PackageNotFoundError
 
 import click
@@ -14,6 +15,7 @@ from rich.table import Table
 from .config import config
 from .core import Project, ContainerManager, WorkspaceManager
 from .core.integration import VSCodeIntegration, ExternalToolIntegration
+from devs_common.agents import AgentSpec, get_agent
 from devs_common.devs_config import DevsConfigLoader
 from devs_common.utils.repo_cache import RepoCache
 from .exceptions import (
@@ -379,9 +381,21 @@ def stop(dev_names: tuple) -> None:
 
     container_manager = ContainerManager(project, config)
 
+    failed = []
     for dev_name in dev_names:
         console.print(f"   Stopping: {dev_name}")
-        container_manager.stop_container(dev_name, remove=False)
+        # Keep going past a failure so one bad container doesn't leave the rest running.
+        # stop_container reports Docker errors and missing containers itself, returning False.
+        try:
+            stopped = container_manager.stop_container(dev_name, remove=False)
+        except ContainerError as e:
+            console.print(f"   ❌ Error stopping {dev_name}: {e}")
+            stopped = False
+        if stopped is False:
+            failed.append(dev_name)
+
+    if failed:
+        sys.exit(1)
 
 
 @cli.command()
@@ -424,46 +438,8 @@ def shell(dev_name: str, live: bool, env: tuple, debug: bool) -> None:
         sys.exit(1)
 
 
-@cli.command()
-@click.argument('dev_name', required=False)
-@click.argument('prompt', required=False)
-@click.option('--auth', is_flag=True, help='Show Claude authentication setup instructions')
-@click.option('--reset-workspace', is_flag=True, help='Reset workspace contents before execution')
-@click.option('--live', is_flag=True, help='Start container with current directory mounted as workspace')
-@click.option('--env', multiple=True, help='Environment variables to pass to container (format: VAR=value)')
-@debug_option
-def claude(dev_name: str, prompt: str, auth: bool, reset_workspace: bool, live: bool, env: tuple, debug: bool) -> None:
-    """Execute Claude CLI in devcontainer or set up authentication.
-
-    DEV_NAME: Development environment name
-    PROMPT: Prompt to send to Claude
-
-    Example: devs claude sally "Summarize this codebase"
-    Example: devs claude sally "Fix the tests" --reset-workspace
-    Example: devs claude sally "Fix the tests" --live  # Run with current directory
-    Example: devs claude sally "Start the server" --env QUART_PORT=5001
-    Example: devs claude --auth                        # Show auth setup instructions
-    """
-    # Handle authentication mode
-    if auth:
-        console.print("🔐 Claude authentication for devcontainers")
-        console.print("")
-        console.print("1. Generate a token (on a machine with a browser):")
-        console.print("   [cyan]claude setup-token[/cyan]")
-        console.print("")
-        console.print("2. Add the token to your environment:")
-        console.print("   [cyan]export CLAUDE_CODE_OAUTH_TOKEN=<token>[/cyan]")
-        console.print("")
-        console.print("   Or add it to [cyan]~/.devs/envs/default/.env[/cyan]:")
-        console.print("   [dim]CLAUDE_CODE_OAUTH_TOKEN=<token>[/dim]")
-        console.print("")
-        console.print("The token will be automatically passed to all devcontainers.")
-        return
-
-    # Validate required arguments for execution mode
-    if not dev_name or not prompt:
-        raise click.UsageError("DEV_NAME and PROMPT are required unless using --auth")
-
+def _run_agent(agent: AgentSpec, dev_name: str, prompt: str, reset_workspace: bool, live: bool, env: tuple, debug: bool) -> None:
+    """Run a coding agent against a prompt in a devcontainer, streaming its output."""
     check_dependencies()
     project = get_project()
 
@@ -482,14 +458,15 @@ def claude(dev_name: str, prompt: str, auth: bool, reset_workspace: bool, live:
         # Ensure workspace exists (handles live mode and reset internally)
         workspace_dir = workspace_manager.create_workspace(dev_name, reset_contents=reset_workspace, live=live)
 
-        # Execute Claude (ensure_container_running is called internally)
-        console.print(f"🤖 Executing Claude in {dev_name}...")
+        # Execute the agent (ensure_container_running is called internally)
+        console.print(f"🤖 Executing {agent.display_name} in {dev_name}...")
         if reset_workspace and not live:
             console.print("🗑️  Workspace contents reset")
         console.print(f"📝 Prompt: {prompt}")
         console.print("")
 
-        success, output, error, _ = container_manager.exec_claude(
+        success, output, error, _ = container_manager.exec_agent(
+            agent,
             dev_name=dev_name,
             workspace_dir=workspace_dir,
             prompt=prompt,
@@ -501,9 +478,9 @@ def claude(dev_name: str, prompt: str, auth: bool, reset_workspace: bool, live:
 
         console.print("")  # Add spacing after streamed output
         if success:
-            console.print("✅ Claude execution completed")
+            console.print(f"✅ {agent.display_name} execution completed")
         else:
-            console.print("❌ Claude execution failed")
+            console.print(f"❌ {agent.display_name} execution failed")
             if error:
                 console.print("")
                 console.print("🚫 Error:")
@@ -511,98 +488,99 @@ def claude(dev_name: str, prompt: str, auth: bool, reset_workspace: bool, live:
             sys.exit(1)
 
     except (ContainerError, WorkspaceError) as e:
-        console.print(f"❌ Error executing Claude in {dev_name}: {e}")
+        console.print(f"❌ Error executing {agent.display_name} in {dev_name}: {e}")
         sys.exit(1)
 
 
+def _add_agent_command(
+    name: str,
+    auth_help: str,
+    handle_auth: Callable[..., None],
+    auth_options: Sequence[Callable] = (),
+    auth_examples: Sequence[str] = (),
+) -> None:
+    """Register a `devs <agent> DEV_NAME PROMPT` command for an agent in devs_common.agents.
 
-    except Exception as e:
-        console.print(f"❌ Failed to configure Claude authentication: {e}")
-        if debug:
-            console.print(traceback.format_exc())
-        sys.exit(1)
-
-
-@cli.command()
-@click.argument('dev_name', required=False)
-@click.argument('prompt', required=False)
-@click.option('--auth', is_flag=True, help='Set up Codex authentication for devcontainers')
-@click.option('--api-key', help='OpenAI API key to authenticate with (use with --auth)')
-@click.option('--reset-workspace', is_flag=True, help='Reset workspace contents before execution')
-@click.option('--live', is_flag=True, help='Start container with current directory mounted as workspace')
-@click.option('--env', multiple=True, help='Environment variables to pass to container (format: VAR=value)')
-@debug_option
-def codex(dev_name: str, prompt: str, auth: bool, api_key: str, reset_workspace: bool, live: bool, env: tuple, debug: bool) -> None:
-    """Execute OpenAI Codex CLI in devcontainer or set up authentication.
-
-    DEV_NAME: Development environment name
-    PROMPT: Prompt to send to Codex
-
-    Example: devs codex sally "Summarize this codebase"
-    Example: devs codex sally "Fix the tests" --reset-workspace
-    Example: devs codex sally "Fix the tests" --live  # Run with current directory
-    Example: devs codex sally "Start the server" --env QUART_PORT=5001
-    Example: devs codex --auth                        # Interactive authentication
-    Example: devs codex --auth --api-key <YOUR_KEY>   # API key authentication
+    Args:
+        name: Agent name in the AGENTS registry
+        auth_help: Help text for the --auth flag
+        handle_auth: Called for `--auth` with debug= plus any auth_options values
+        auth_options: Extra click options that only apply to --auth (e.g. --api-key)
+        auth_examples: Extra `devs <agent> --auth ...` example lines for the help text
     """
-    # Handle authentication mode
-    if auth:
-        _handle_codex_auth(api_key=api_key, debug=debug)
-        return
-
-    # Validate required arguments for execution mode
-    if not dev_name or not prompt:
-        raise click.UsageError("DEV_NAME and PROMPT are required unless using --auth")
-
-    check_dependencies()
-    project = get_project()
-
-    # Load environment variables from DEVS.yml and merge with CLI --env flags
-    devs_env = DevsConfigLoader.load_env_vars(dev_name, project.info.name)
-    cli_env = parse_env_vars(env) if env else {}
-    extra_env = merge_env_vars(devs_env, cli_env) if devs_env or cli_env else None
-
-    if extra_env:
-        console.print(f"🔧 Environment variables: {', '.join(f'{k}={v}' for k, v in extra_env.items())}")
-
-    container_manager = ContainerManager(project, config)
-    workspace_manager = WorkspaceManager(project, config)
+    agent = get_agent(name)
 
-    try:
-        # Ensure workspace exists (handles live mode and reset internally)
-        workspace_dir = workspace_manager.create_workspace(dev_name, reset_contents=reset_workspace, live=live)
-
-        # Execute Codex (ensure_container_running is called internally)
-        console.print(f"🤖 Executing Codex in {dev_name}...")
-        if reset_workspace and not live:
-            console.print("🗑️  Workspace contents reset")
-        console.print(f"📝 Prompt: {prompt}")
-        console.print("")
-
-        success, output, error, _ = container_manager.exec_codex(
-            dev_name=dev_name,
-            workspace_dir=workspace_dir,
-            prompt=prompt,
-            debug=debug,
-            stream=True,
-            live=live,
-            extra_env=extra_env
-        )
+    def command(dev_name: str, prompt: str, auth: bool, reset_workspace: bool, live: bool,
+                env: tuple, debug: bool, **auth_values) -> None:
+        if auth:
+            handle_auth(debug=debug, **auth_values)
+            return
+        # Validate required arguments for execution mode
+        if not dev_name or not prompt:
+            raise click.UsageError("DEV_NAME and PROMPT are required unless using --auth")
+        _run_agent(agent, dev_name, prompt, reset_workspace, live, env, debug)
+
+    examples = [
+        f'devs {name} sally "Summarize this codebase"',
+        f'devs {name} sally "Fix the tests" --reset-workspace',
+        f'devs {name} sally "Fix the tests" --live  # Run with current directory',
+        f'devs {name} sally "Start the server" --env QUART_PORT=5001',
+        f'devs {name} --auth',
+        *auth_examples,
+    ]
+    command.__name__ = name
+    command.__doc__ = (
+        f"Execute {agent.description} in devcontainer or set up authentication.\n\n"
+        f"DEV_NAME: Development environment name\n\n"
+        f"PROMPT: Prompt to send to {agent.display_name}\n\n"
+        + "\n\n".join(f"Example: {example}" for example in examples)
+    )
+
+    decorators = [
+        cli.command(name=name),
+        click.argument('dev_name', required=False),
+        click.argument('prompt', required=False),
+        click.option('--auth', is_flag=True, help=auth_help),
+        *auth_options,
+        click.option('--reset-workspace', is_flag=True, help='Reset workspace contents before execution'),
+        click.option('--live', is_flag=True, help='Start container with current directory mounted as workspace'),
+        click.option('--env', multiple=True, help='Environment variables to pass to container (format: VAR=value)'),
+        debug_option,
+    ]
+    for decorator in reversed(decorators):
+        command = decorator(command)
+
+
+def _show_claude_auth(debug: bool) -> None:
+    """Explain how to give devcontainers a Claude token."""
+    console.print("🔐 Claude authentication for devcontainers")
+    console.print("")
+    console.print("1. Generate a token (on a machine with a browser):")
+    console.print("   [cyan]claude setup-token[/cyan]")
+    console.print("")
+    console.print("2. Add the token to your environment:")
+    console.print("   [cyan]export CLAUDE_CODE_OAUTH_TOKEN=<token>[/cyan]")
+    console.print("")
+    console.print("   Or add it to [cyan]~/.devs/envs/default/.env[/cyan]:")
+    console.print("   [dim]CLAUDE_CODE_OAUTH_TOKEN=<token>[/dim]")
+    console.print("")
+    console.print("The token will be automatically passed to all devcontainers.")
 
-        console.print("")  # Add spacing after streamed output
-        if success:
-            console.print("✅ Codex execution completed")
-        else:
-            console.print("❌ Codex execution failed")
-            if error:
-                console.print("")
-                console.print("🚫 Error:")
-                console.print(error)
-            sys.exit(1)
 
-    except (ContainerError, WorkspaceError) as e:
-        console.print(f"❌ Error executing Codex in {dev_name}: {e}")
-        sys.exit(1)
+def _show_hermes_auth(debug: bool) -> None:
+    """Explain how to give devcontainers an OpenRouter key for Hermes."""
+    console.print("🔐 Hermes Agent authentication for devcontainers")
+    console.print("")
+    console.print("Hermes runs against OpenRouter. Create an API key at:")
+    console.print("   [cyan]https://openrouter.ai/keys[/cyan]")
+    console.print("")
+    console.print("Add it to [cyan]~/.devs/envs/default/.env[/cyan] (or a project-specific env dir):")
+    console.print("   [dim]OPENROUTER_API_KEY=<key>[/dim]")
+    console.print("")
+    console.print("The default model is [cyan]z-ai/glm-5.3[/cyan]. To use another OpenRouter model:")
+    console.print("   [dim]HERMES_INFERENCE_MODEL=<provider/model>[/dim]")
+    console.print("")
+    console.print("The env file is mounted into every devcontainer and loaded on each shell.")
 
 
 def _handle_codex_auth(api_key: str, debug: bool) -> None:
@@ -619,54 +597,32 @@ def _handle_codex_auth(api_key: str, debug: bool) -> None:
         console.print("🔐 Setting up Codex authentication...")
         console.print(f"   Configuration will be saved to: {config.codex_config_dir}")
 
+        # Codex reads its state directory from CODEX_HOME (default ~/.codex); pointing it
+        # at the directory that is bind-mounted into containers shares the login with them.
+        env = os.environ.copy()
+        env['CODEX_HOME'] = str(config.codex_config_dir)
+
         if api_key:
-            # Set API key directly using Codex CLI
             console.print("   Using provided API key...")
-
-            # Set CODEX_CONFIG_HOME to our config directory and run auth with API key
-            env = os.environ.copy()
-            env['CODEX_CONFIG_HOME'] = str(config.codex_config_dir)
-
-            cmd = ['codex', 'auth', '--api-key', api_key]
-
-            if debug:
-                console.print(f"[dim]Running: {' '.join(cmd)}[/dim]")
-                console.print(f"[dim]CODEX_CONFIG_HOME: {config.codex_config_dir}[/dim]")
-
-            result = subprocess.run(
-                cmd,
-                env=env,
-                capture_output=True,
-                text=True
-            )
-
-            if result.returncode != 0:
-                error_msg = result.stderr or result.stdout or "Unknown error"
-                raise Exception(f"Codex authentication failed: {error_msg}")
-
+            # The key goes in on stdin so it never shows up in the process list
+            cmd = ['codex', 'login', '--with-api-key']
         else:
-            # Interactive authentication
             console.print("   Starting interactive authentication...")
             console.print("   Follow the prompts to authenticate with Codex")
             console.print("")
+            cmd = ['codex', 'login']
 
-            # Set CODEX_CONFIG_HOME to our config directory
-            env = os.environ.copy()
-            env['CODEX_CONFIG_HOME'] = str(config.codex_config_dir)
-
-            cmd = ['codex', 'auth']
-
-            if debug:
-                console.print(f"[dim]Running: {' '.join(cmd)}[/dim]")
-                console.print(f"[dim]CODEX_CONFIG_HOME: {config.codex_config_dir}[/dim]")
-
-            # Run interactively
-            result = subprocess.run(
-                cmd,
-                env=env,
-                check=False
-            )
+        if debug:
+            console.print(f"[dim]Running: {' '.join(cmd)}[/dim]")
+            console.print(f"[dim]CODEX_HOME: {config.codex_config_dir}[/dim]")
 
+        if api_key:
+            result = subprocess.run(cmd, env=env, input=api_key, capture_output=True, text=True)
+            if result.returncode != 0:
+                error_msg = result.stderr or result.stdout or "Unknown error"
+                raise Exception(f"Codex authentication failed: {error_msg}")
+        else:
+            result = subprocess.run(cmd, env=env, check=False)
             if result.returncode != 0:
                 raise Exception("Codex authentication was cancelled or failed")
 
@@ -695,6 +651,25 @@ def _handle_codex_auth(api_key: str, debug: bool) -> None:
         sys.exit(1)
 
 
+_add_agent_command(
+    "claude",
+    auth_help='Show Claude authentication setup instructions',
+    handle_auth=_show_claude_auth,
+)
+_add_agent_command(
+    "codex",
+    auth_help='Set up Codex authentication for devcontainers',
+    handle_auth=_handle_codex_auth,
+    auth_options=[click.option('--api-key', help='OpenAI API key to authenticate with (use with --auth)')],
+    auth_examples=['devs codex --auth --api-key <YOUR_KEY>   # API key authentication'],
+)
+_add_agent_command(
+    "hermes",
+    auth_help='Show Hermes (OpenRouter) authentication setup instructions',
+    handle_auth=_show_hermes_auth,
+)
+
+
 @cli.command()
 @click.argument('dev_name')
 @click.option('--reset-workspace', is_flag=True, help='Reset workspace contents before execution')

{devs_cli-5.0.5 → devs_cli-6.0.0/devs_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devs-cli
-Version: 5.0.5
+Version: 6.0.0
 Summary: DevContainer Management Tool - Manage multiple named devcontainers for any project
 Author: Dan Lester
 License-Expression: MIT

{devs_cli-5.0.5 → devs_cli-6.0.0}/devs_cli.egg-info/SOURCES.txt

@@ -14,6 +14,7 @@ devs_cli.egg-info/dependency_links.txt
 devs_cli.egg-info/entry_points.txt
 devs_cli.egg-info/requires.txt
 devs_cli.egg-info/top_level.txt
+tests/test_agents.py
 tests/test_cli.py
 tests/test_cli_clean.py
 tests/test_cli_misc.py

{devs_cli-5.0.5 → devs_cli-6.0.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "devs-cli"
-version = "5.0.5"
+version = "6.0.0"
 description = "DevContainer Management Tool - Manage multiple named devcontainers for any project"
 readme = "README.md"
 requires-python = ">=3.8"

devs_cli-6.0.0/tests/test_agents.py

@@ -0,0 +1,45 @@
+"""Tests for the coding agent registry and the commands generated from it."""
+
+from unittest.mock import patch
+
+import pytest
+from click.testing import CliRunner
+
+from devs.cli import cli
+from devs_common.agents import AGENTS, get_agent
+from devs_common.core.container import ContainerManager
+
+
+def test_every_registered_agent_has_a_cli_command():
+    """Each AgentSpec gets a `devs <name>` command."""
+    for name in AGENTS:
+        assert name in cli.commands, f"missing `devs {name}` command"
+
+
+@pytest.mark.parametrize("name", list(AGENTS))
+def test_agent_command_help_uses_spec(name):
+    result = CliRunner().invoke(cli, [name, '--help'])
+
+    assert result.exit_code == 0
+    assert f"Execute {AGENTS[name].description} in devcontainer" in result.output
+    assert f"devs {name} sally" in result.output
+
+
+def test_get_agent_unknown_name():
+    with pytest.raises(ValueError, match="Unknown agent 'nope'"):
+        get_agent('nope')
+
+
+@pytest.mark.parametrize("name", list(AGENTS))
+def test_exec_agent_runs_spec_command_with_prompt_on_stdin(name, tmp_path):
+    # exec_agent only delegates to exec_command, so skip __init__ (which needs Docker)
+    manager = ContainerManager.__new__(ContainerManager)
+    with patch.object(manager, 'exec_command', return_value=(True, "ok", "", 0)) as exec_command:
+        result = manager.exec_agent(name, dev_name='sally', workspace_dir=tmp_path,
+                                    prompt='Fix the tests', live=True)
+
+    assert result == (True, "ok", "", 0)
+    kwargs = exec_command.call_args.kwargs
+    assert kwargs['command'] == AGENTS[name].command
+    assert kwargs['stdin_input'] == 'Fix the tests'
+    assert kwargs['live'] is True

{devs_cli-5.0.5 → devs_cli-6.0.0}/tests/test_cli.py

@@ -29,7 +29,7 @@ class TestCLI:
         result = runner.invoke(cli, ['--version'])
         
         assert result.exit_code == 0
-        assert "0.1.0" in result.output
+        assert "devs-cli" in result.output
     
     def test_start_command_help(self):
         """Test start command help."""
@@ -55,7 +55,7 @@ class TestCLI:
         result = runner.invoke(cli, ['stop', '--help'])
         
         assert result.exit_code == 0
-        assert "Stop and remove devcontainers" in result.output
+        assert "Stop devcontainers" in result.output
         assert "DEV_NAMES" in result.output
     
     def test_shell_command_help(self):
@@ -178,10 +178,10 @@ class TestCLI:
         # Verify subprocess was called with correct arguments
         mock_subprocess.assert_called_once()
         call_args = mock_subprocess.call_args
-        assert 'codex' in call_args[0][0]
-        assert 'auth' in call_args[0][0]
-        assert '--api-key' in call_args[0][0]
-        assert 'test-key-123' in call_args[0][0]
+        assert call_args[0][0] == ['codex', 'login', '--with-api-key']
+        # Key is passed on stdin, not argv, and login state goes to the mounted dir
+        assert call_args.kwargs['input'] == 'test-key-123'
+        assert call_args.kwargs['env']['CODEX_HOME'] == '/tmp/test-codex-config'
 
     @patch('devs.cli.subprocess.run')
     @patch('devs.cli.config')
@@ -203,9 +203,8 @@ class TestCLI:
         # Verify subprocess was called for interactive auth
         mock_subprocess.assert_called_once()
         call_args = mock_subprocess.call_args
-        assert 'codex' in call_args[0][0]
-        assert 'auth' in call_args[0][0]
-        assert '--api-key' not in call_args[0][0]
+        assert call_args[0][0] == ['codex', 'login']
+        assert call_args.kwargs['env']['CODEX_HOME'] == '/tmp/test-codex-config'
 
     @patch('devs.cli.subprocess.run')
     @patch('devs.cli.config')
@@ -223,6 +222,31 @@ class TestCLI:
         assert "Codex CLI not found" in result.output
         assert "npm install -g @openai/codex" in result.output
 
+    def test_hermes_command_help(self):
+        """Test hermes command help."""
+        runner = CliRunner()
+        result = runner.invoke(cli, ['hermes', '--help'])
+
+        assert result.exit_code == 0
+        assert "Execute Hermes Agent" in result.output
+        assert "--auth" in result.output
+
+    def test_hermes_auth_shows_instructions(self):
+        """Test hermes --auth shows OpenRouter setup instructions."""
+        runner = CliRunner()
+        result = runner.invoke(cli, ['hermes', '--auth'])
+
+        assert result.exit_code == 0
+        assert "OPENROUTER_API_KEY" in result.output
+
+    def test_hermes_missing_args(self):
+        """Test hermes command without required args (not using --auth)."""
+        runner = CliRunner()
+        result = runner.invoke(cli, ['hermes'])
+
+        assert result.exit_code != 0
+        assert "DEV_NAME and PROMPT are required unless using --auth" in result.output
+
     def test_codex_missing_args(self):
         """Test codex command without required args (not using --auth)."""
         runner = CliRunner()

{devs_cli-5.0.5 → devs_cli-6.0.0}/tests/test_cli_misc.py

@@ -288,7 +288,7 @@ class TestShellCommand:
 
         # Container manager raises error
         mock_container_manager = Mock()
-        mock_container_manager.ensure_container_running.side_effect = ContainerError("Container failed")
+        mock_container_manager.exec_shell.side_effect = ContainerError("Container failed")
         mock_container_manager_class.return_value = mock_container_manager
 
         # Run command
@@ -319,7 +319,7 @@ class TestClaudeCommand:
 
         mock_container_manager = Mock()
         mock_container_manager.ensure_container_running.return_value = True
-        mock_container_manager.exec_claude.return_value = (True, "Claude response", None, None)
+        mock_container_manager.exec_agent.return_value = (True, "Claude response", None, None)
         mock_container_manager_class.return_value = mock_container_manager
 
         # Run command
@@ -328,7 +328,7 @@ class TestClaudeCommand:
         # Verify
         assert result.exit_code == 0
         assert "Executing Claude in alice" in result.output
-        mock_container_manager.exec_claude.assert_called_once()
+        mock_container_manager.exec_agent.assert_called_once()
 
     @patch('devs.cli.get_project')
     @patch('devs.cli.WorkspaceManager')
@@ -349,7 +349,7 @@ class TestClaudeCommand:
 
         # Container manager raises error
         mock_container_manager = Mock()
-        mock_container_manager.ensure_container_running.side_effect = ContainerError("Container failed")
+        mock_container_manager.exec_agent.side_effect = ContainerError("Container failed")
         mock_container_manager_class.return_value = mock_container_manager
 
         # Run command
@@ -376,7 +376,7 @@ class TestClaudeCommand:
 
         mock_container_manager = Mock()
         mock_container_manager.ensure_container_running.return_value = True
-        mock_container_manager.exec_claude.return_value = (True, "Claude response", None, None)
+        mock_container_manager.exec_agent.return_value = (True, "Claude response", None, None)
         mock_container_manager_class.return_value = mock_container_manager
 
         # Run command with env vars

{devs_cli-5.0.5 → devs_cli-6.0.0}/tests/test_cli_stop.py

@@ -11,6 +11,24 @@ from devs.cli import cli
 class TestStopCommand:
     """Test suite for 'devs stop' command."""
 
+    @patch('devs.cli.get_project')
+    @patch('devs.cli.ContainerManager')
+    def test_stop_exits_nonzero_when_stop_fails(self, mock_container_manager_class, mock_get_project,
+                                                cli_runner, temp_project):
+        """stop_container returns False (container missing or Docker error) -> exit 1."""
+        mock_project = Mock()
+        mock_project.info.name = "test-org-test-repo"
+        mock_get_project.return_value = mock_project
+
+        mock_container_manager = Mock()
+        mock_container_manager.stop_container.side_effect = [False, True]
+        mock_container_manager_class.return_value = mock_container_manager
+
+        result = cli_runner.invoke(cli, ['stop', 'alice', 'bob'])
+
+        assert result.exit_code == 1
+        assert mock_container_manager.stop_container.call_count == 2
+
     @patch('devs.cli.get_project')
     @patch('devs.cli.ContainerManager')
     def test_stop_single_container(self, mock_container_manager_class, mock_get_project,
@@ -32,7 +50,7 @@ class TestStopCommand:
         assert result.exit_code == 0
         assert "Stopping" in result.output
         assert "alice" in result.output
-        mock_container_manager.stop_container.assert_called_once_with("alice")
+        mock_container_manager.stop_container.assert_called_once_with("alice", remove=False)
 
     @patch('devs.cli.get_project')
     @patch('devs.cli.ContainerManager')
@@ -77,7 +95,7 @@ class TestStopCommand:
 
         # Verify it completes
         assert result.exit_code == 0
-        mock_container_manager.stop_container.assert_called_once_with("alice")
+        mock_container_manager.stop_container.assert_called_once_with("alice", remove=False)
 
     @patch('devs.cli.get_project')
     @patch('devs.cli.ContainerManager')
@@ -112,15 +130,16 @@ class TestStopCommand:
         mock_get_project.return_value = mock_project
 
         mock_container_manager = Mock()
-        mock_container_manager.stop_container.side_effect = ContainerError("Failed to stop")
+        mock_container_manager.stop_container.side_effect = [ContainerError("Failed to stop"), True]
         mock_container_manager_class.return_value = mock_container_manager
 
-        # Run command - CLI doesn't catch this exception currently
-        result = cli_runner.invoke(cli, ['stop', 'alice'])
+        result = cli_runner.invoke(cli, ['stop', 'alice', 'bob'])
 
-        # The command may fail or show error
-        # Just verify it was called
-        mock_container_manager.stop_container.assert_called_once_with("alice")
+        # The error is reported, bob is still stopped, and the command exits non-zero
+        assert result.exit_code == 1
+        assert "Error stopping alice: Failed to stop" in result.output
+        assert mock_container_manager.stop_container.call_count == 2
+        mock_container_manager.stop_container.assert_called_with("bob", remove=False)
 
     @patch('devs.cli.get_project')
     @patch('devs.cli.ContainerManager')

{devs_cli-5.0.5 → devs_cli-6.0.0}/tests/test_cli_vscode.py

@@ -1,5 +1,4 @@
 """Integration tests for the 'vscode' command."""
-import json
 from pathlib import Path
 from unittest.mock import MagicMock, Mock, patch
 
@@ -12,7 +11,14 @@ from devs.exceptions import VSCodeError, WorkspaceError
 
 
 class TestVSCodeCommand:
-    """Test suite for 'devs vscode' command."""
+    """Test suite for 'devs vscode' command in local mode (no SSH host)."""
+
+    @pytest.fixture(autouse=True)
+    def no_ssh_host(self, monkeypatch):
+        """Keep these tests on the local path: no --ssh from env or DEVS.yml."""
+        monkeypatch.delenv('DEVS_SSH_HOST', raising=False)
+        with patch('devs.cli.DevsConfigLoader.load_ssh_host', return_value=None):
+            yield
 
     @patch('devs.cli.get_project')
     @patch('devs.cli.ContainerManager')
@@ -36,6 +42,7 @@ class TestVSCodeCommand:
         mock_container_manager_class.return_value = mock_container_manager
 
         mock_vscode = Mock()
+        mock_vscode.resolve_tailnet_ssh_host.return_value = None  # not on the tailnet
         mock_vscode.launch_multiple_devcontainers.return_value = 1
         mock_vscode_class.return_value = mock_vscode
 
@@ -68,6 +75,7 @@ class TestVSCodeCommand:
         mock_container_manager_class.return_value = mock_container_manager
 
         mock_vscode = Mock()
+        mock_vscode.resolve_tailnet_ssh_host.return_value = None  # not on the tailnet
         mock_vscode.launch_multiple_devcontainers.return_value = 1
         mock_vscode_class.return_value = mock_vscode
 
@@ -100,6 +108,7 @@ class TestVSCodeCommand:
         mock_container_manager_class.return_value = mock_container_manager
 
         mock_vscode = Mock()
+        mock_vscode.resolve_tailnet_ssh_host.return_value = None  # not on the tailnet
         mock_vscode_class.return_value = mock_vscode
 
         # Run command
@@ -126,7 +135,7 @@ class TestVSCodeCommand:
         mock_workspace_manager_class.return_value = mock_workspace_manager
 
         mock_container_manager_class.return_value = Mock()
-        mock_vscode_class.return_value = Mock()
+        mock_vscode_class.return_value = Mock(**{'resolve_tailnet_ssh_host.return_value': None})
 
         # Run command
         result = cli_runner.invoke(cli, ['vscode', 'alice'])
@@ -156,6 +165,7 @@ class TestVSCodeCommand:
         mock_container_manager_class.return_value = mock_container_manager
 
         mock_vscode = Mock()
+        mock_vscode.resolve_tailnet_ssh_host.return_value = None  # not on the tailnet
         mock_vscode.launch_multiple_devcontainers.return_value = 1
         mock_vscode_class.return_value = mock_vscode
 
@@ -187,6 +197,7 @@ class TestVSCodeCommand:
         mock_container_manager_class.return_value = mock_container_manager
 
         mock_vscode = Mock()
+        mock_vscode.resolve_tailnet_ssh_host.return_value = None  # not on the tailnet
         mock_vscode.launch_multiple_devcontainers.side_effect = VSCodeError("Failed to open")
         mock_vscode_class.return_value = mock_vscode
 
@@ -220,6 +231,7 @@ class TestVSCodeCommand:
         mock_container_manager_class.return_value = mock_container_manager
 
         mock_vscode = Mock()
+        mock_vscode.resolve_tailnet_ssh_host.return_value = None  # not on the tailnet
         mock_vscode.launch_multiple_devcontainers.return_value = 1
         mock_vscode_class.return_value = mock_vscode
 
@@ -251,6 +263,7 @@ class TestVSCodeCommand:
         mock_container_manager_class.return_value = mock_container_manager
 
         mock_vscode = Mock()
+        mock_vscode.resolve_tailnet_ssh_host.return_value = None  # not on the tailnet
         mock_vscode.launch_multiple_devcontainers.return_value = 1
         mock_vscode_class.return_value = mock_vscode
 
@@ -351,7 +364,8 @@ class TestVSCodeSSHMode:
         mock_vscode.launch_multiple_devcontainers.return_value = 1
         mock_vscode_class.return_value = mock_vscode
 
-        result = cli_runner.invoke(cli, ['vscode', 'alice'])
+        # DEVS_SSH_HOST in the caller's environment would take priority over DEVS.yml
+        result = cli_runner.invoke(cli, ['vscode', 'alice'], env={'DEVS_SSH_HOST': None})
 
         assert result.exit_code == 0
         mock_container_manager_class.assert_not_called()
@@ -382,15 +396,12 @@ class TestSSHURIGeneration:
         assert decoded == 'dev-test-org-repo-alice'
         assert '/workspaces/test-org-repo-alice' in uri
 
-    def test_ssh_uri_contains_json_with_host(self):
-        """SSH URI encodes JSON with containerName (leading /) and settings.host."""
+    def test_ssh_uri_is_direct_remote_ssh(self):
+        """SSH URI opens the container's workspace directly over Remote-SSH (no attach)."""
         vsi = self._make_vsi()
         workspace_dir = Path('/home/user/.devs/workspaces/test-org-repo-alice')
         uri = vsi.generate_devcontainer_uri(workspace_dir, 'alice', ssh_host='myhost.ts.net')
-        hex_part = uri.split('attached-container+')[1].split('/')[0]
-        decoded = json.loads(bytes.fromhex(hex_part).decode('utf-8'))
-        assert decoded['containerName'] == '/dev-test-org-repo-alice'
-        assert decoded['settings']['host'] == 'ssh://myhost.ts.net'
+        assert uri == 'vscode-remote://ssh-remote+myhost.ts.net/workspaces/test-org-repo-alice'
 
     def test_ssh_uri_workspace_path_correct(self):
         """SSH URI workspace path matches the devs naming convention."""
@@ -404,6 +415,4 @@ class TestSSHURIGeneration:
         vsi = self._make_vsi()
         workspace_dir = Path('/home/user/.devs/workspaces/test-org-repo-alice')
         uri = vsi.generate_devcontainer_uri(workspace_dir, 'alice', ssh_host='myhost.ts.net:2222')
-        hex_part = uri.split('attached-container+')[1].split('/')[0]
-        decoded = json.loads(bytes.fromhex(hex_part).decode('utf-8'))
-        assert decoded['settings']['host'] == 'ssh://myhost.ts.net:2222'
+        assert uri.startswith('vscode-remote://ssh-remote+myhost.ts.net:2222/')

{devs_cli-5.0.5 → devs_cli-6.0.0}/tests/test_live_mode.py

@@ -96,12 +96,14 @@ class TestLiveMode:
         # Mock VSCodeIntegration
         with patch('devs.cli.VSCodeIntegration') as mock_vscode:
             mock_vscode_instance = Mock()
+            mock_vscode_instance.resolve_tailnet_ssh_host.return_value = None  # not on the tailnet
             mock_vscode_instance.launch_multiple_devcontainers.return_value = 1
             mock_vscode.return_value = mock_vscode_instance
             
             # Run command
             runner = CliRunner()
-            result = runner.invoke(cli, ['vscode', 'test-dev', '--live'])
+            with patch('devs.cli.DevsConfigLoader.load_ssh_host', return_value=None):
+                result = runner.invoke(cli, ['vscode', 'test-dev', '--live'], env={'DEVS_SSH_HOST': None})
             
             # Verify live mode was passed
             mock_container.ensure_container_running.assert_called_once()
@@ -135,12 +137,7 @@ class TestLiveMode:
         runner = CliRunner()
         result = runner.invoke(cli, ['shell', 'test-dev', '--live'])
         
-        # Verify live mode was passed
-        mock_container.ensure_container_running.assert_called_once()
-        call_args = mock_container.ensure_container_running.call_args
-        assert call_args.kwargs.get('live') is True
-        
-        # Verify exec_shell was called with live=True
+        # Verify exec_shell was called with live=True (it starts the container internally)
         mock_container.exec_shell.assert_called_once()
         call_args = mock_container.exec_shell.call_args
         assert call_args.kwargs.get('live') is True
@@ -161,7 +158,7 @@ class TestLiveMode:
         
         mock_container = Mock()
         mock_container.ensure_container_running.return_value = True
-        mock_container.exec_claude = Mock(return_value=(True, "output", ""))
+        mock_container.exec_agent = Mock(return_value=(True, "output", ""))
         mock_container_mgr.return_value = mock_container
         
         mock_workspace = Mock()
@@ -172,14 +169,9 @@ class TestLiveMode:
         runner = CliRunner()
         result = runner.invoke(cli, ['claude', 'test-dev', 'test prompt', '--live'])
         
-        # Verify live mode was passed
-        mock_container.ensure_container_running.assert_called_once()
-        call_args = mock_container.ensure_container_running.call_args
-        assert call_args.kwargs.get('live') is True
-        
-        # Verify exec_claude was called with live=True
-        mock_container.exec_claude.assert_called_once()
-        call_args = mock_container.exec_claude.call_args
+        # Verify exec_agent was called with live=True (it starts the container internally)
+        mock_container.exec_agent.assert_called_once()
+        call_args = mock_container.exec_agent.call_args
         assert call_args.kwargs.get('live') is True
         
         # Verify workspace.create_workspace was called with live=True and reset_contents=False