devs-common 5.0.1__tar.gz → 5.0.3__tar.gz

{devs_common-5.0.1 → devs_common-5.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devs-common
-Version: 5.0.1
+Version: 5.0.3
 Summary: Shared utilities for devs package ecosystem
 Author: Dan Lester
 License-Expression: MIT

{devs_common-5.0.1 → devs_common-5.0.3}/devs_common/core/container.py

@@ -433,9 +433,34 @@ class ContainerManager:
         tailscaled and the tailnet node stay down, and VS Code settings aren't
         re-deployed. The script is idempotent, so running it again is harmless. Never
         raises: a container without the devs template simply has no such script.
+
+        The hook's identity env (``DEVS_PROJECT_NAME``/``DEVCONTAINER_NAME``) comes from
+        devcontainer.json ``remoteEnv``, which only the devcontainer CLI injects — a raw
+        exec sees neither. Without them start-tailscale.sh falls through to its
+        ``devcontainer`` default and the node rejoins the tailnet as ``devs-devcontainer``
+        (then clash-suffixed ``-1``, ``-2``…) instead of ``devs-<project>-<dev>`` — so
+        every name anyone SSHes to breaks on each host reboot. Re-derive them from the
+        labels set at creation, which are the container's own record of that identity.
         """
+        environment = {}
+        try:
+            labels = self.docker.get_container_labels(container_name)
+            project = labels.get("devs.project", "")
+            dev = labels.get("devs.dev", "")
+            if project and dev:
+                environment = {
+                    "DEVS_PROJECT_NAME": project,
+                    "DEVCONTAINER_NAME": dev,
+                }
+        except Exception:
+            pass  # fall back to the hook's own defaults
+
         try:
-            self.docker.exec_command(container_name, "/usr/local/bin/post-start.sh")
+            self.docker.exec_command(
+                container_name,
+                "/usr/local/bin/post-start.sh",
+                environment=environment or None,
+            )
         except Exception:
             pass  # not a devs-template container / exec unavailable
 

{devs_common-5.0.1 → devs_common-5.0.3}/devs_common/templates/Dockerfile

@@ -186,8 +186,8 @@ RUN for shell_rc in /home/node/.zshrc /home/node/.bashrc; do \
   echo "export CODEX_CONFIG_HOME=\"/home/node/codexconfig\"" >> "$shell_rc" && \
   echo "export PATH=\"/home/node/.local/bin:\$PATH\"" >> "$shell_rc" && \
   echo "alias claude=\"claude --dangerously-skip-permissions\"" >> "$shell_rc" && \
-  echo "alias codex=\"/usr/local/share/npm-global/bin/codex --dangerously-bypass-approvals-and-sandbox\"" >> "$shell_rc" && \
-  echo "alias codex-normal=\"/usr/local/share/npm-global/bin/codex\"" >> "$shell_rc" && \
+  echo "alias codex=\"/usr/local/share/npm-global/bin/codex -c check_for_update_on_startup=false --dangerously-bypass-approvals-and-sandbox\"" >> "$shell_rc" && \
+  echo "alias codex-normal=\"/usr/local/share/npm-global/bin/codex -c check_for_update_on_startup=false\"" >> "$shell_rc" && \
   echo "" >> "$shell_rc" && \
   echo "# Auto-activate Python venv if it exists" >> "$shell_rc" && \
   echo "if [ -f /home/node/.devs-venv/workspace-venv/bin/activate ]; then" >> "$shell_rc" && \
@@ -234,4 +234,3 @@ RUN echo "DEBUG: Files that need sudo:" && ls -la /tmp/sudo-scripts-list/ && \
   rm -rf /tmp/sudo-scripts-list
 
 USER node
-

{devs_common-5.0.1 → devs_common-5.0.3}/devs_common/templates/scripts/post-create-wrapper.sh

@@ -34,12 +34,23 @@ run_step() {
 # Run each step with error handling
 run_step "setup-vscode-cache" "sudo /usr/local/bin/setup-vscode-cache.sh"
 run_step "setup-devs-env.sh" "/usr/local/bin/setup-devs-env.sh"
+run_step "run-autoexec.sh" "/usr/local/bin/run-autoexec.sh"
 #run_step "init-firewall.sh" "sudo /usr/local/bin/init-firewall.sh"
 run_step "setup-workspace.sh" "/usr/local/bin/setup-workspace.sh"
 run_step "start-services.sh" "sudo /usr/local/bin/start-services.sh"
 # Optional: join the tailnet + serve a port. Non-fatal — no auth key => no-op.
 run_step "start-tailscale.sh" "/usr/local/bin/start-tailscale.sh" || true
 
+# setup-devs-env.sh runs through run_step in a subshell, so variables it exports
+# do not reach this wrapper. Load the mounted environment here as well so GH_TOKEN
+# is available while gh configures git's credential helper.
+if [ -f /home/node/.devs-env/.env ]; then
+    set -a
+    # shellcheck disable=SC1091 -- this file is supplied by the devs bind mount
+    source /home/node/.devs-env/.env
+    set +a
+fi
+
 # GitHub auth setup is optional, so handle it separately
 echo "📋 Running gh auth setup-git..."
 if output=$(gh auth setup-git 2>&1); then

devs_common-5.0.3/devs_common/templates/scripts/run-autoexec.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+# Run optional, user-supplied startup hooks from the mounted devs environment.
+# The directory's presence is the opt-in; hooks run in lexical filename order.
+set -uo pipefail
+
+hooks_dir="${DEVS_AUTOEXEC_DIR:-/home/node/.devs-env/autoexec}"
+[ -d "$hooks_dir" ] || exit 0
+
+status=0
+found=0
+for hook in "$hooks_dir"/*; do
+  [ -f "$hook" ] || continue
+  [ -x "$hook" ] || {
+    echo "ℹ️  Skipping non-executable autoexec hook: $(basename "$hook")"
+    continue
+  }
+
+  found=1
+  echo "📋 Running autoexec hook: $(basename "$hook")"
+  if "$hook"; then
+    echo "✅ Autoexec hook completed: $(basename "$hook")"
+  else
+    hook_status=$?
+    echo "⚠️  Autoexec hook failed ($hook_status): $(basename "$hook")"
+    status=1
+  fi
+done
+
+[ "$found" -eq 0 ] || echo "🏁 Autoexec hooks finished"
+exit "$status"

{devs_common-5.0.1 → devs_common-5.0.3}/devs_common/utils/devcontainer.py

@@ -1,7 +1,9 @@
 """DevContainer CLI wrapper utilities."""
 
+import json
 import os
 import re
+import socket
 import sys
 import subprocess
 from pathlib import Path
@@ -44,8 +46,8 @@ def prepare_devcontainer_environment(
     env = os.environ.copy()
     
     # Core devcontainer environment variables
-    # IMPORTANT: In live mode, we must use the actual host folder name (e.g. "workstuff")
-    # instead of our constructed name (e.g. "workstuffai-workstuffapp-dan") because
+    # IMPORTANT: In live mode, we must use the actual host folder name (e.g. "devs")
+    # instead of our constructed name (e.g. "ideonate-devs-sally") because
     # the devcontainer CLI directly mounts the host folder and preserves its name.
     # The container will have /workspaces/<host-folder-name>, not /workspaces/<constructed-name>
     workspace_folder_name = workspace_folder.name if live else container_workspace_name
@@ -80,6 +82,7 @@ def prepare_devcontainer_environment(
     bridge_mount_path = Path.home() / '.devs' / 'bridge' / f"{project_name}-{dev_name}"
     bridge_mount_path.mkdir(parents=True, exist_ok=True)
     env['DEVS_BRIDGE_MOUNT_PATH'] = str(bridge_mount_path)
+    write_bridge_info(bridge_mount_path)
 
     # Pass debug mode to container scripts
     if debug:
@@ -104,6 +107,25 @@ def prepare_devcontainer_environment(
     return env
 
 
+BRIDGE_INFO_FILENAME = '.devs-bridge.json'
+
+
+def write_bridge_info(bridge_mount_path: Path) -> None:
+    """Record the bridge's host-side location inside the bridge itself.
+
+    The bridge-drop extension shows the host path for each dropped file. It
+    reads DEVS_BRIDGE_MOUNT_PATH when set, but that arrives via remoteEnv, which
+    only the Dev Containers extension applies — a Remote-SSH session straight
+    into the container never sees it. The bridge dir is mounted in the
+    container regardless of how VS Code connects, so the info lives there too.
+    """
+    info = {'host_path': str(bridge_mount_path), 'hostname': socket.gethostname()}
+    try:
+        (bridge_mount_path / BRIDGE_INFO_FILENAME).write_text(json.dumps(info, indent=2) + '\n')
+    except OSError as e:
+        console.print(f"[yellow]Warning: could not write bridge info: {e}[/yellow]")
+
+
 def parse_docker_error(error_output: str) -> Tuple[Optional[str], Optional[str]]:
     """Parse Docker error output for specific error patterns.
 

{devs_common-5.0.1 → devs_common-5.0.3}/devs_common/utils/docker_client.py

@@ -170,6 +170,25 @@ class DockerClient:
         except DockerException as e:
             raise DockerError(f"Error finding containers by labels: {e}")
     
+    def get_container_labels(self, name: str) -> Dict[str, str]:
+        """Get a single container's labels.
+
+        Args:
+            name: Container name or id
+
+        Returns:
+            The container's label dictionary
+
+        Raises:
+            DockerError: If the container is missing or inspection fails
+        """
+        try:
+            return self.client.containers.get(name).labels or {}
+        except NotFound:
+            raise DockerError(f"Container {name} not found")
+        except DockerException as e:
+            raise DockerError(f"Error inspecting container {name}: {e}")
+
     def rename_container(self, old_name: str, new_name: str) -> None:
         """Rename a container.
         
@@ -188,26 +207,37 @@ class DockerClient:
         except DockerException as e:
             raise DockerError(f"Error renaming container {old_name} to {new_name}: {e}")
     
-    def exec_command(self, container_name: str, command: str, workdir: Optional[str] = None) -> bool:
+    def exec_command(
+        self,
+        container_name: str,
+        command: str,
+        workdir: Optional[str] = None,
+        environment: Optional[Dict[str, str]] = None,
+    ) -> bool:
         """Execute a command in a container.
-        
+
         Args:
             container_name: Container name
             command: Command to execute
             workdir: Working directory for command
-            
+            environment: Extra env vars for this exec only. A raw exec inherits the
+                image's baked-in env but NOT devcontainer.json ``remoteEnv``, which the
+                devcontainer CLI injects per-exec — pass anything the command needs from
+                there explicitly.
+
         Returns:
             True if command succeeded
-            
+
         Raises:
             DockerError: If execution fails
         """
         try:
             container = self.client.containers.get(container_name)
-            
+
             exec_result = container.exec_run(
-                command, 
+                command,
                 workdir=workdir,
+                environment=environment,
                 tty=False,
                 stream=False
             )

{devs_common-5.0.1 → devs_common-5.0.3}/devs_common.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devs-common
-Version: 5.0.1
+Version: 5.0.3
 Summary: Shared utilities for devs package ecosystem
 Author: Dan Lester
 License-Expression: MIT

{devs_common-5.0.1 → devs_common-5.0.3}/devs_common.egg-info/SOURCES.txt

@@ -29,6 +29,7 @@ devs_common/templates/scripts/install-bridge-drop.sh
 devs_common/templates/scripts/post-create-wrapper.sh
 devs_common/templates/scripts/post-start.sh
 devs_common/templates/scripts/python-venv-integration.sh
+devs_common/templates/scripts/run-autoexec.sh
 devs_common/templates/scripts/screenshot-webapp.sh
 devs_common/templates/scripts/setup-vscode-settings.sh
 devs_common/templates/scripts/setup-workspace.sh

{devs_common-5.0.1 → devs_common-5.0.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "devs-common"
-version = "5.0.1"
+version = "5.0.3"
 description = "Shared utilities for devs package ecosystem"
 authors = [
     {name = "Dan Lester"},