devs-cli 4.0.7__py3-none-any.whl → 5.0.0__py3-none-any.whl

devs/cli.py

@@ -246,12 +246,13 @@ def start(dev_names: tuple, rebuild: bool, rebuild_if_changed: bool, live: bool,
     default=None,
     envvar='DEVS_SSH_HOST',
     help=(
-        'Attach VS Code to a container ALREADY RUNNING on a remote SSH host '
-        '(e.g. Tailscale or any SSH-reachable Docker host). This is connection-only: '
-            'it does NOT provision anything. '
-        'It does NOT create, start, or sync the container — you must have already '
-            'started it on the remote host yourself (e.g. run `devs start` over there). '
-            'Only builds the VS Code Remote-SSH + attach URI. '
+        'Open VS Code via direct Remote-SSH into a container ALREADY RUNNING and '
+        'reachable at this SSH host (e.g. its Tailscale name). The container is its '
+            'own ssh host, so this opens its /workspaces folder directly — no attach. '
+        'Connection-only: it does NOT create, start, or sync the container — start it '
+            'yourself first (e.g. `devs start` on the host). '
+        'Usually unnecessary: without --ssh, `devs vscode <dev>` auto-discovers the '
+            "container's tailnet name via the handshake start-tailscale.sh writes. "
         'Can also be set via the DEVS_SSH_HOST env var or ssh_host in DEVS.yml.'
     ),
 )
@@ -264,7 +265,8 @@ def vscode(dev_names: tuple, delay: float, live: bool, env: tuple, ssh_host: str
     Example: devs vscode sally bob
     Example: devs vscode sally --live  # Start with current directory mounted
     Example: devs vscode sally --env QUART_PORT=5001
-    Example: devs vscode sally --ssh myhost.tailnet.ts.net  # Attach to a container ALREADY running on myhost
+    Example: devs vscode sally  # Auto: direct Remote-SSH if sally's container is on the tailnet, else local
+    Example: devs vscode sally --ssh devs-myorg-myrepo-sally  # Force direct Remote-SSH into that node
     """
     check_dependencies()
     project = get_project()
@@ -275,79 +277,88 @@ def vscode(dev_names: tuple, delay: float, live: bool, env: tuple, ssh_host: str
 
     vscode_integration = VSCodeIntegration(project)
 
+    # Decide, per dev, whether to open via direct Remote-SSH (the container is its
+    # own tailnet ssh host) or to manage it locally. An explicit --ssh / env / DEVS.yml
+    # host forces SSH for every dev; otherwise auto-discover via the tailnet handshake
+    # that start-tailscale.sh writes (set only when the container is up + Tailscale SSH
+    # is on). Devs that don't resolve fall through to normal local mode.
     if ssh_host:
-        # SSH mode is attach-only: we do NOT provision anything. The container must
-        # already be running on the remote host (start it there yourself, e.g. by
-        # running `devs start` on the remote machine). We skip ContainerManager /
-        # WorkspaceManager entirely and only need the workspace path to construct the
-        # URI; derive it from the project name and dev name (no filesystem access needed).
-        workspace_dirs = []
-        valid_dev_names = []
+        ssh_hosts = {dev_name: ssh_host for dev_name in dev_names}
+    else:
+        ssh_hosts = {}
         for dev_name in dev_names:
-            workspace_name = project.get_workspace_name(dev_name)
-            # Use a synthetic Path so generate_devcontainer_uri can derive workspace_name.
-            # The path itself is never accessed locally in SSH mode.
-            workspace_dirs.append(config.workspaces_dir / workspace_name)
-            valid_dev_names.append(dev_name)
-
+            host = vscode_integration.resolve_tailnet_ssh_host(dev_name)
+            if host:
+                ssh_hosts[dev_name] = host
+
+    ssh_dev_names = [d for d in dev_names if d in ssh_hosts]
+    local_dev_names = [d for d in dev_names if d not in ssh_hosts]
+
+    # --- Direct Remote-SSH (attach-only: container already running on its host) ---
+    if ssh_dev_names:
+        for dev_name in ssh_dev_names:
+            console.print(f"   🔗 {dev_name} → ssh://{ssh_hosts[dev_name]} (direct Remote-SSH into container)")
+        # Synthetic workspace Paths: only the name is used to build the URI; the path
+        # is never accessed locally in SSH mode.
+        workspace_dirs = [config.workspaces_dir / project.get_workspace_name(d) for d in ssh_dev_names]
         try:
             success_count = vscode_integration.launch_multiple_devcontainers(
                 workspace_dirs,
-                valid_dev_names,
+                ssh_dev_names,
                 delay_between_windows=delay,
                 live=live,
-                ssh_host=ssh_host,
+                ssh_hosts=ssh_hosts,
             )
             if success_count == 0:
-                console.print("❌ Failed to open any VS Code windows")
+                console.print("❌ Failed to open any VS Code windows (Remote-SSH)")
         except VSCodeError as e:
             console.print(f"❌ VS Code integration error: {e}")
-        return
 
-    # Local mode: manage containers and workspaces as normal
-    container_manager = ContainerManager(project, config)
-    workspace_manager = WorkspaceManager(project, config)
+    # --- Local mode: manage containers and workspaces as normal ---
+    if local_dev_names:
+        container_manager = ContainerManager(project, config)
+        workspace_manager = WorkspaceManager(project, config)
 
-    workspace_dirs = []
-    valid_dev_names = []
+        workspace_dirs = []
+        valid_dev_names = []
 
-    for dev_name in dev_names:
-        console.print(f"   Preparing: {dev_name}")
+        for dev_name in local_dev_names:
+            console.print(f"   Preparing: {dev_name}")
 
-        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
+            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())}")
+            if extra_env:
+                console.print(f"🔧 Environment variables: {', '.join(f'{k}={v}' for k, v in extra_env.items())}")
 
-        try:
-            workspace_dir = workspace_manager.create_workspace(dev_name, live=live)
+            try:
+                workspace_dir = workspace_manager.create_workspace(dev_name, live=live)
 
-            if container_manager.ensure_container_running(dev_name, workspace_dir, check_rebuild=False, debug=debug, live=live, extra_env=extra_env):
-                workspace_dirs.append(workspace_dir)
-                valid_dev_names.append(dev_name)
-            else:
-                console.print(f"   ❌ Failed to start container for {dev_name}, skipping...")
+                if container_manager.ensure_container_running(dev_name, workspace_dir, check_rebuild=False, debug=debug, live=live, extra_env=extra_env):
+                    workspace_dirs.append(workspace_dir)
+                    valid_dev_names.append(dev_name)
+                else:
+                    console.print(f"   ❌ Failed to start container for {dev_name}, skipping...")
 
-        except (ContainerError, WorkspaceError) as e:
-            console.print(f"   ❌ Error preparing {dev_name}: {e}")
-            continue
+            except (ContainerError, WorkspaceError) as e:
+                console.print(f"   ❌ Error preparing {dev_name}: {e}")
+                continue
 
-    if workspace_dirs:
-        try:
-            success_count = vscode_integration.launch_multiple_devcontainers(
-                workspace_dirs,
-                valid_dev_names,
-                delay_between_windows=delay,
-                live=live,
-            )
+        if workspace_dirs:
+            try:
+                success_count = vscode_integration.launch_multiple_devcontainers(
+                    workspace_dirs,
+                    valid_dev_names,
+                    delay_between_windows=delay,
+                    live=live,
+                )
 
-            if success_count == 0:
-                console.print("❌ Failed to open any VS Code windows")
+                if success_count == 0:
+                    console.print("❌ Failed to open any VS Code windows")
 
-        except VSCodeError as e:
-            console.print(f"❌ VS Code integration error: {e}")
+            except VSCodeError as e:
+                console.print(f"❌ VS Code integration error: {e}")
 
 
 @cli.command()

devs/core/integration.py

@@ -11,6 +11,7 @@ from rich.console import Console
 
 from ..exceptions import VSCodeError
 from devs_common.core.project import Project
+from devs_common.utils.config_hash import get_env_mount_path
 from devs_common.utils.devcontainer import prepare_devcontainer_environment
 
 console = Console()
@@ -51,6 +52,41 @@ class VSCodeIntegration:
         except FileNotFoundError:
             return False
     
+    def resolve_tailnet_ssh_host(self, dev_name: str) -> Optional[str]:
+        """Discover a container's own tailnet SSH name via the writeback handshake.
+
+        Joins docker <-> tailnet by docker container id, WITHOUT `docker exec`:
+        ``docker inspect`` the container for its hostname (== its short container id,
+        == the ``$HOSTNAME`` start-tailscale.sh keyed its handshake file by), then read
+        that file out of the host-shared env mount. Returns the short MagicDNS name
+        (e.g. ``devs-acme-app-eamonn-1``) only when the container is up AND Tailscale
+        SSH is on; otherwise None (caller falls back to local mode).
+        """
+        container_name = self.project.get_container_name(dev_name)
+        try:
+            inspect = subprocess.run(
+                ["docker", "inspect", "--format", "{{.Config.Hostname}}", container_name],
+                capture_output=True, text=True, check=False,
+            )
+        except FileNotFoundError:
+            return None  # no docker here
+        if inspect.returncode != 0:
+            return None  # container doesn't exist / not inspectable
+        container_id = inspect.stdout.strip()
+        if not container_id:
+            return None
+
+        handshake = get_env_mount_path(self.project.info.name) / "ts-nodes" / f"{container_id}.json"
+        if not handshake.exists():
+            return None
+        try:
+            data = json.loads(handshake.read_text())
+        except (OSError, ValueError):
+            return None
+        if not data.get("ssh"):
+            return None  # on the tailnet but not accepting SSH
+        return data.get("short") or None
+
     def generate_devcontainer_uri(
         self,
         workspace_dir: Path,
@@ -66,38 +102,34 @@ class VSCodeIntegration:
             dev_name: Development environment name
             live: Whether to use live mode (mount current directory)
             attach_to_existing: Whether to attach to existing container (vs create new one)
-            ssh_host: If set, generate a Remote-SSH + attached-container URI for this host.
-                      The host can be a Tailscale MagicDNS name or any SSH-reachable hostname.
+            ssh_host: If set, generate a plain Remote-SSH folder URI for this host.
+                      In the devs+Tailscale model the container IS its own SSH host
+                      (you SSH straight into it — there's no separate Docker daemon to
+                      attach through), so this is NOT an attached-container URI.
 
         Returns:
             VS Code devcontainer URI
         """
-        if attach_to_existing:
-            container_name = self.project.get_container_name(dev_name)
-            workspace_name = workspace_dir.name if live else self.project.get_workspace_name(dev_name)
+        # IMPORTANT: In live mode, use the actual host folder name because devcontainer CLI
+        # mounts the host directory directly and VS Code must match that path.
+        workspace_name = workspace_dir.name if live else self.project.get_workspace_name(dev_name)
 
-            if ssh_host:
-                # JSON-encoded container info that includes the SSH host so VS Code's
-                # Dev Containers extension connects through Remote-SSH first.
-                # Container name is prefixed with "/" as Docker returns it in Names field.
-                container_info = {
-                    "containerName": f"/{container_name}",
-                    "settings": {"host": f"ssh://{ssh_host}"},
-                }
-                container_hex = json.dumps(container_info, separators=(",", ":")).encode("utf-8").hex()
-            else:
-                container_hex = container_name.encode("utf-8").hex()
+        if ssh_host:
+            # Direct Remote-SSH INTO the container. With Tailscale the container is its
+            # own tailnet node running Tailscale SSH, so VS Code opens the in-container
+            # workspace folder over SSH — no Docker host, no attach. Wrapping this in an
+            # attached-container URI would make VS Code SSH in and then hunt for a Docker
+            # daemon that isn't there.
+            return f"vscode-remote://ssh-remote+{ssh_host}/workspaces/{workspace_name}"
 
-            vscode_uri = f"vscode-remote://attached-container+{container_hex}/workspaces/{workspace_name}"
-        else:
-            # Original behavior: create new container from devcontainer.json
-            workspace_hex = workspace_dir.as_posix().encode("utf-8").hex()
-            # IMPORTANT: In live mode, use the actual host folder name because devcontainer CLI
-            # mounts the host directory directly and VS Code must match that path.
-            workspace_name = workspace_dir.name if live else self.project.get_workspace_name(dev_name)
-            vscode_uri = f"vscode-remote://dev-container+{workspace_hex}/workspaces/{workspace_name}"
+        if attach_to_existing:
+            container_name = self.project.get_container_name(dev_name)
+            container_hex = container_name.encode("utf-8").hex()
+            return f"vscode-remote://attached-container+{container_hex}/workspaces/{workspace_name}"
 
-        return vscode_uri
+        # Create new container from devcontainer.json
+        workspace_hex = workspace_dir.as_posix().encode("utf-8").hex()
+        return f"vscode-remote://dev-container+{workspace_hex}/workspaces/{workspace_name}"
 
     def _format_code_command(
         self,
@@ -129,15 +161,17 @@ class VSCodeIntegration:
         new_window: bool,
         ssh_host: Optional[str],
     ) -> None:
-        """Print the 'code' command(s) for this container.
+        """Print the 'code' command for this container.
 
-        Always prints the plain (non-SSH) command. When an SSH host is set, the SSH
-        form is printed too, so you can copy whichever matches where you're running it.
+        When an SSH host is set we print only the Remote-SSH command (the plain
+        attached-container command wouldn't work from another machine and is just
+        noise). Otherwise we print the local attached-container command.
         """
         if ssh_host:
             ssh_cmd = self._format_code_command(workspace_dir, dev_name, live, new_window, ssh_host)
-            console.print(f"   📋 VS Code command (via SSH: {ssh_host}):")
+            console.print(f"   📋 VS Code command (Remote-SSH: {ssh_host}):")
             console.print(f"      {ssh_cmd}")
+            return
 
         plain_cmd = self._format_code_command(workspace_dir, dev_name, live, new_window, None)
         console.print(f"   📋 VS Code command:")
@@ -182,14 +216,23 @@ class VSCodeIntegration:
             self._print_code_commands(workspace_dir, dev_name, live, new_window, ssh_host)
 
             # No local 'code' command (e.g. a headless remote dev box reached over SSH):
-            # don't fail — the container is already prepared, so just point to the
-            # command printed above and stop here.
+            # don't fail — just point to the command printed above and stop here.
             if not self.code_available:
-                console.print(
-                    f"   ⚠️  VS Code 'code' command not found here — container is ready, "
-                    "but VS Code can't be launched from this machine. "
-                    "Run the command above from a machine with VS Code installed."
-                )
+                if ssh_host:
+                    # SSH mode is attach-only: we never created/started the container,
+                    # so we can't claim it's ready. The user must ensure it's running
+                    # on the remote host themselves.
+                    console.print(
+                        f"   ⚠️  VS Code 'code' command not found here — printed the attach "
+                        f"URI only. Make sure the container is already running on '{ssh_host}', "
+                        "then run the command above from a machine with VS Code installed."
+                    )
+                else:
+                    console.print(
+                        f"   ⚠️  VS Code 'code' command not found here — container is ready, "
+                        "but VS Code can't be launched from this machine. "
+                        "Run the command above from a machine with VS Code installed."
+                    )
                 return True
 
             if ssh_host:
@@ -235,6 +278,7 @@ class VSCodeIntegration:
         delay_between_windows: float = 2.0,
         live: bool = False,
         ssh_host: Optional[str] = None,
+        ssh_hosts: Optional[dict] = None,
     ) -> int:
         """Launch multiple devcontainers in separate VS Code windows.
 
@@ -243,7 +287,10 @@ class VSCodeIntegration:
             dev_names: List of development environment names
             delay_between_windows: Delay between opening windows (seconds)
             live: Whether to use live mode (mount current directory)
-            ssh_host: If set, connect via Remote-SSH to this host then attach to each container.
+            ssh_host: If set, connect every dev via direct Remote-SSH to this host.
+            ssh_hosts: Optional per-dev override mapping ``dev_name -> ssh host``
+                (each container is its own tailnet host, so they differ). Falls back
+                to ``ssh_host`` for any dev not present in the map.
 
         Returns:
             Number of successfully launched windows
@@ -251,10 +298,11 @@ class VSCodeIntegration:
         if len(workspace_dirs) != len(dev_names):
             raise VSCodeError("Workspace directories and dev names lists must have same length")
 
-        if ssh_host:
+        ssh_hosts = ssh_hosts or {}
+        if ssh_host or ssh_hosts:
             console.print(
                 f"📂 Opening {len(dev_names)} devcontainers in VS Code "
-                f"(via SSH: {ssh_host}) for project: {self.project.info.name}"
+                f"(via Remote-SSH) for project: {self.project.info.name}"
             )
         else:
             console.print(f"📂 Opening {len(dev_names)} devcontainers in VS Code for project: {self.project.info.name}")
@@ -262,9 +310,10 @@ class VSCodeIntegration:
         success_count = 0
 
         for workspace_dir, dev_name in zip(workspace_dirs, dev_names):
+            host = ssh_hosts.get(dev_name, ssh_host)
             try:
                 if self.launch_devcontainer(
-                    workspace_dir, dev_name, new_window=True, live=live, ssh_host=ssh_host
+                    workspace_dir, dev_name, new_window=True, live=live, ssh_host=host
                 ):
                     success_count += 1
 

{devs_cli-4.0.7.dist-info → devs_cli-5.0.0.dist-info}/METADATA

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

devs_cli-5.0.0.dist-info/RECORD

@@ -0,0 +1,13 @@
+devs/__init__.py,sha256=dMk0J_JrmBmknPvt6HNUa04qxgHYpxhnIXa3PZFk_N0,571
+devs/cli.py,sha256=inWDnumsDeaQcvY8y42HcNPY-HJxYkCOUGHgsjYx4nI,44985
+devs/config.py,sha256=DaS2_1x0h63cHn34RmWbEhUx_1u3-sAo16tM3AXMKfQ,1561
+devs/exceptions.py,sha256=7xO7ihJu_U6CupZPMv89B4N5EBSUcdj2OdA6GPAFPEE,490
+devs/core/__init__.py,sha256=TPy3eZi-AEztci_QZ37YAAl2zvUQlwBALpyiQx2ED7Q,363
+devs/core/integration.py,sha256=_zT5kJi_L34uU3yhLinLI7bbjI5Q27dX9ABxgwHkx2Y,16557
+devs/utils/__init__.py,sha256=f-sEWETPfW2Xkaxgd-l6FS-jIQAorLlQZOicIZvp-W0,638
+devs_cli-5.0.0.dist-info/licenses/LICENSE,sha256=bi2EUiv-lmC_quQVkNqzTYXJpjVarkPsVKfqhJl7ccQ,1067
+devs_cli-5.0.0.dist-info/METADATA,sha256=3YGHAfTQZrjl-5eJ7w2a_49LqHjPhcdO6Z2bRdF1orQ,5282
+devs_cli-5.0.0.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+devs_cli-5.0.0.dist-info/entry_points.txt,sha256=s8-pgqZ1QvzPJgHP9vNxwBYdezmGsFdRUHacJPZ4WOs,39
+devs_cli-5.0.0.dist-info/top_level.txt,sha256=9RIVUPVGuOdO84qkBh_9XcKoTV7773o3py78wz2-IZk,5
+devs_cli-5.0.0.dist-info/RECORD,,

{devs_cli-4.0.7.dist-info → devs_cli-5.0.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (82.0.1)
+Generator: setuptools (83.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

devs_cli-4.0.7.dist-info/RECORD

@@ -1,13 +0,0 @@
-devs/__init__.py,sha256=dMk0J_JrmBmknPvt6HNUa04qxgHYpxhnIXa3PZFk_N0,571
-devs/cli.py,sha256=wRqKwdyGYAqemrabrH7NhMpBYX4iFJpowWxwDqptYmk,44125
-devs/config.py,sha256=DaS2_1x0h63cHn34RmWbEhUx_1u3-sAo16tM3AXMKfQ,1561
-devs/exceptions.py,sha256=7xO7ihJu_U6CupZPMv89B4N5EBSUcdj2OdA6GPAFPEE,490
-devs/core/__init__.py,sha256=TPy3eZi-AEztci_QZ37YAAl2zvUQlwBALpyiQx2ED7Q,363
-devs/core/integration.py,sha256=cM3bIok06Z4faIkTyF8h35FeKdHpnx3_h2mXnJ1SaW0,13935
-devs/utils/__init__.py,sha256=f-sEWETPfW2Xkaxgd-l6FS-jIQAorLlQZOicIZvp-W0,638
-devs_cli-4.0.7.dist-info/licenses/LICENSE,sha256=bi2EUiv-lmC_quQVkNqzTYXJpjVarkPsVKfqhJl7ccQ,1067
-devs_cli-4.0.7.dist-info/METADATA,sha256=kak8KcJlQeXQGLObaeobYBGZWS9CsCFOOaRYMu9j6B0,5282
-devs_cli-4.0.7.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-devs_cli-4.0.7.dist-info/entry_points.txt,sha256=s8-pgqZ1QvzPJgHP9vNxwBYdezmGsFdRUHacJPZ4WOs,39
-devs_cli-4.0.7.dist-info/top_level.txt,sha256=9RIVUPVGuOdO84qkBh_9XcKoTV7773o3py78wz2-IZk,5
-devs_cli-4.0.7.dist-info/RECORD,,