devlaunch 0.0.2__tar.gz → 0.0.4__tar.gz

{devlaunch-0.0.2 → devlaunch-0.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devlaunch
-Version: 0.0.2
+Version: 0.0.4
 Summary: DevLaunch - A streamlined CLI for devpod workspaces
 Project-URL: Source, https://github.com/blooop/devlaunch
 Project-URL: Home, https://github.com/blooop/devlaunch
@@ -30,6 +30,7 @@ A streamlined CLI for [devpod](https://devpod.sh) with intuitive autocomplete an
 [![GitHub issues](https://img.shields.io/github/issues/blooop/devlaunch.svg)](https://GitHub.com/blooop/devlaunch/issues/)
 [![GitHub pull-requests merged](https://badgen.net/github/merged-prs/blooop/devlaunch)](https://github.com/blooop/devlaunch/pulls?q=is%3Amerged)
 [![GitHub release](https://img.shields.io/github/release/blooop/devlaunch.svg)](https://GitHub.com/blooop/devlaunch/releases/)
+[![PyPI](https://img.shields.io/pypi/v/devlaunch)](https://pypi.org/project/devlaunch/)
 [![License](https://img.shields.io/github/license/blooop/devlaunch)](https://opensource.org/license/mit/)
 [![Python](https://img.shields.io/badge/python-3.10%20%7C%203.11%20%7C%203.12%20%7C%203.13-blue)](https://www.python.org/downloads/)
 [![Pixi Badge](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/prefix-dev/pixi/main/assets/badge/v0.json)](https://pixi.sh)
@@ -54,51 +55,53 @@ source ~/.bashrc  # or restart your terminal
 ## Usage
 
 ```bash
-dl                           # Interactive workspace selector (fzf)
-dl <workspace>               # Start workspace and attach shell
-dl <workspace> <command>     # Run command in workspace
-dl owner/repo                # Create workspace from GitHub repo
-dl owner/repo@branch         # Create workspace from specific branch
-dl ./path                    # Create workspace from local path
+dl                               # Interactive workspace selector (fzf)
+dl <user/repo>                   # Start workspace and attach shell
+dl <user/repo> <cmd>             # Run workspace command (stop, code, etc.)
+dl <user/repo> -- <command>      # Run shell command in workspace
 ```
 
-## Commands
+## Workspace Sources
+
+```bash
+dl myproject                     # Existing workspace by name
+dl user/repo                     # Create from GitHub repo
+dl user/repo@branch              # Create from specific branch
+dl ./path                        # Create from local path
+```
+
+## Workspace Commands
+
+| Command | Description |
+|---------|-------------|
+| `dl <user/repo> stop` | Stop the workspace |
+| `dl <user/repo> rm, prune` | Delete the workspace |
+| `dl <user/repo> code` | Open in VS Code |
+| `dl <user/repo> restart` | Stop and start (no rebuild) |
+| `dl <user/repo> recreate` | Recreate container |
+| `dl <user/repo> reset` | Clean slate (remove all, recreate) |
+| `dl <user/repo> -- <command>` | Run shell command in workspace |
+
+## Global Commands
 
 | Command | Description |
 |---------|-------------|
 | `dl --ls` | List all workspaces |
-| `dl --stop <workspace>` | Stop a workspace |
-| `dl --rm <workspace>` | Delete a workspace |
-| `dl --code <workspace>` | Open workspace in VS Code |
-| `dl --status <workspace>` | Show workspace status |
-| `dl --recreate <workspace>` | Recreate workspace container |
-| `dl --reset <workspace>` | Reset workspace (clean slate) |
 | `dl --install` | Install shell completions |
-| `dl --help` | Show help |
+| `dl --help, -h` | Show this help |
+| `dl --version` | Show version |
 
 ## Examples
 
 ```bash
-# Select workspace interactively with fzf
-dl
-
-# Open an existing workspace
-dl myproject
-
-# Create workspace from GitHub repository
-dl loft-sh/devpod
-
-# Create workspace from specific branch
-dl blooop/devlaunch@main
-
-# Create workspace from local folder
-dl ./my-project
-
-# Open workspace in VS Code
-dl --code myproject
-
-# Run a command in workspace
-dl myproject 'make test'
+dl                               # Select workspace with fzf
+dl devpod                        # Open existing workspace
+dl loft-sh/devpod                # Create from GitHub
+dl blooop/devlaunch@main         # Create from specific branch
+dl ./my-project                  # Create from local folder
+dl blooop/devlaunch code         # Open in VS Code
+dl blooop/devlaunch -- make test # Run command in workspace
+dl blooop/devlaunch stop         # Stop workspace
 ```
 
 ## Features
@@ -116,7 +119,7 @@ After running `dl --install`, you get intelligent tab completion:
 - Workspace names from your devpod list
 - Known GitHub owners and repositories from your workspaces
 - File/directory paths when starting with `./`, `/`, or `~`
-- All command flags (`--ls`, `--stop`, etc.)
+- All global flags (`--ls`, `--install`, etc.) and workspace commands
 
 ## Development
 

{devlaunch-0.0.2 → devlaunch-0.0.4}/README.md

@@ -9,6 +9,7 @@ A streamlined CLI for [devpod](https://devpod.sh) with intuitive autocomplete an
 [![GitHub issues](https://img.shields.io/github/issues/blooop/devlaunch.svg)](https://GitHub.com/blooop/devlaunch/issues/)
 [![GitHub pull-requests merged](https://badgen.net/github/merged-prs/blooop/devlaunch)](https://github.com/blooop/devlaunch/pulls?q=is%3Amerged)
 [![GitHub release](https://img.shields.io/github/release/blooop/devlaunch.svg)](https://GitHub.com/blooop/devlaunch/releases/)
+[![PyPI](https://img.shields.io/pypi/v/devlaunch)](https://pypi.org/project/devlaunch/)
 [![License](https://img.shields.io/github/license/blooop/devlaunch)](https://opensource.org/license/mit/)
 [![Python](https://img.shields.io/badge/python-3.10%20%7C%203.11%20%7C%203.12%20%7C%203.13-blue)](https://www.python.org/downloads/)
 [![Pixi Badge](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/prefix-dev/pixi/main/assets/badge/v0.json)](https://pixi.sh)
@@ -33,51 +34,53 @@ source ~/.bashrc  # or restart your terminal
 ## Usage
 
 ```bash
-dl                           # Interactive workspace selector (fzf)
-dl <workspace>               # Start workspace and attach shell
-dl <workspace> <command>     # Run command in workspace
-dl owner/repo                # Create workspace from GitHub repo
-dl owner/repo@branch         # Create workspace from specific branch
-dl ./path                    # Create workspace from local path
+dl                               # Interactive workspace selector (fzf)
+dl <user/repo>                   # Start workspace and attach shell
+dl <user/repo> <cmd>             # Run workspace command (stop, code, etc.)
+dl <user/repo> -- <command>      # Run shell command in workspace
 ```
 
-## Commands
+## Workspace Sources
+
+```bash
+dl myproject                     # Existing workspace by name
+dl user/repo                     # Create from GitHub repo
+dl user/repo@branch              # Create from specific branch
+dl ./path                        # Create from local path
+```
+
+## Workspace Commands
+
+| Command | Description |
+|---------|-------------|
+| `dl <user/repo> stop` | Stop the workspace |
+| `dl <user/repo> rm, prune` | Delete the workspace |
+| `dl <user/repo> code` | Open in VS Code |
+| `dl <user/repo> restart` | Stop and start (no rebuild) |
+| `dl <user/repo> recreate` | Recreate container |
+| `dl <user/repo> reset` | Clean slate (remove all, recreate) |
+| `dl <user/repo> -- <command>` | Run shell command in workspace |
+
+## Global Commands
 
 | Command | Description |
 |---------|-------------|
 | `dl --ls` | List all workspaces |
-| `dl --stop <workspace>` | Stop a workspace |
-| `dl --rm <workspace>` | Delete a workspace |
-| `dl --code <workspace>` | Open workspace in VS Code |
-| `dl --status <workspace>` | Show workspace status |
-| `dl --recreate <workspace>` | Recreate workspace container |
-| `dl --reset <workspace>` | Reset workspace (clean slate) |
 | `dl --install` | Install shell completions |
-| `dl --help` | Show help |
+| `dl --help, -h` | Show this help |
+| `dl --version` | Show version |
 
 ## Examples
 
 ```bash
-# Select workspace interactively with fzf
-dl
-
-# Open an existing workspace
-dl myproject
-
-# Create workspace from GitHub repository
-dl loft-sh/devpod
-
-# Create workspace from specific branch
-dl blooop/devlaunch@main
-
-# Create workspace from local folder
-dl ./my-project
-
-# Open workspace in VS Code
-dl --code myproject
-
-# Run a command in workspace
-dl myproject 'make test'
+dl                               # Select workspace with fzf
+dl devpod                        # Open existing workspace
+dl loft-sh/devpod                # Create from GitHub
+dl blooop/devlaunch@main         # Create from specific branch
+dl ./my-project                  # Create from local folder
+dl blooop/devlaunch code         # Open in VS Code
+dl blooop/devlaunch -- make test # Run command in workspace
+dl blooop/devlaunch stop         # Stop workspace
 ```
 
 ## Features
@@ -95,7 +98,7 @@ After running `dl --install`, you get intelligent tab completion:
 - Workspace names from your devpod list
 - Known GitHub owners and repositories from your workspaces
 - File/directory paths when starting with `./`, `/`, or `~`
-- All command flags (`--ls`, `--stop`, etc.)
+- All global flags (`--ls`, `--install`, etc.) and workspace commands
 
 ## Development
 

{devlaunch-0.0.2 → devlaunch-0.0.4}/devlaunch/completions/dl.bash

@@ -19,6 +19,7 @@ _dl_completion() {
     local DL_WORKSPACES=""
     local DL_REPOS=""
     local DL_OWNERS=""
+    local DL_BRANCHES=""
 
     # Source the bash cache file (fast, no jq needed)
     if [[ -f "$cache_file" ]]; then
@@ -33,18 +34,25 @@ _dl_completion() {
             return 0
         fi
 
-        # Don't add space after completion to allow @branch suffix
-        compopt -o nospace
-
         # If typing a path, complete files/directories
         if [[ "$cur" == ./* || "$cur" == /* || "$cur" == ~/* ]]; then
-            compopt +o nospace
             COMPREPLY=( $(compgen -d -- ${cur}) )
             return 0
         fi
 
+        # Check if completing branch (contains @)
+        if [[ "$cur" == *@* ]]; then
+            # Use cached branches (format: owner/repo@branch)
+            if [[ -n "$DL_BRANCHES" ]]; then
+                COMPREPLY=( $(compgen -W "${DL_BRANCHES}" -- ${cur}) )
+            fi
+            return 0
+        fi
+
         # Check if completing owner/repo format (contains /)
         if [[ "$cur" == */* ]]; then
+            # Don't add space - allow @branch suffix
+            compopt -o nospace
             # Complete from known repos
             if [[ -n "$DL_REPOS" ]]; then
                 COMPREPLY=( $(compgen -W "${DL_REPOS}" -- ${cur}) )
@@ -53,6 +61,7 @@ _dl_completion() {
         fi
 
         # Default: complete workspace names and offer owner/ completion
+        compopt -o nospace  # For owner/ completions
         local completions="$DL_WORKSPACES"
 
         # Add owners with trailing slash
@@ -82,5 +91,6 @@ _dl_completion() {
     return 0
 }
 
-complete -F _dl_completion dl
+# Use -o default for better completion behavior
+complete -o default -F _dl_completion dl
 # end dl completion

{devlaunch-0.0.2 → devlaunch-0.0.4}/devlaunch/dl.py

@@ -92,11 +92,13 @@ def write_bash_completion_cache(data: Dict[str, Any]) -> None:
         workspaces = " ".join(data.get("workspaces", []))
         repos = " ".join(data.get("repos", []))
         owners = " ".join(data.get("owners", []))
+        branches = " ".join(data.get("branches", []))
         lines = [
             "# Auto-generated by dl - do not edit",
             f'DL_WORKSPACES="{workspaces}"',
             f'DL_REPOS="{repos}"',
             f'DL_OWNERS="{owners}"',
+            f'DL_BRANCHES="{branches}"',
         ]
         with open(BASH_CACHE_FILE, "w", encoding="utf-8") as f:
             f.write("\n".join(lines) + "\n")
@@ -104,6 +106,29 @@ def write_bash_completion_cache(data: Dict[str, Any]) -> None:
         pass
 
 
+def get_remote_branches(owner_repo: str) -> List[str]:
+    """Get list of branches from a remote GitHub repository."""
+    url = f"git@github.com:{owner_repo}.git"
+    try:
+        result = subprocess.run(
+            ["git", "ls-remote", "--heads", url],
+            capture_output=True,
+            text=True,
+            check=False,
+            timeout=5,  # Don't hang on slow connections
+        )
+        if result.returncode == 0:
+            branches = []
+            for line in result.stdout.strip().split("\n"):
+                if line and "refs/heads/" in line:
+                    branch = line.split("refs/heads/")[-1]
+                    branches.append(branch)
+            return branches
+    except (OSError, subprocess.SubprocessError, subprocess.TimeoutExpired):
+        pass
+    return []
+
+
 def update_completion_cache() -> Dict[str, Any]:
     """Update the completion cache with current data."""
     workspaces = list_workspaces()
@@ -119,10 +144,18 @@ def update_completion_cache() -> Dict[str, Any]:
     # Extract unique owners
     owners = sorted(repos.keys())
 
+    # Fetch branches for all known repos (as owner/repo@branch strings)
+    all_branches = []
+    for owner_repo in known_repos:
+        branches = get_remote_branches(owner_repo)
+        for branch in branches:
+            all_branches.append(f"{owner_repo}@{branch}")
+
     data = {
         "workspaces": workspace_ids,
         "repos": known_repos,
         "owners": owners,
+        "branches": all_branches,
     }
     write_completion_cache(data)
     write_bash_completion_cache(data)
@@ -148,6 +181,27 @@ def update_cache_background() -> None:
 OWNER_REPO_PATTERN = re.compile(r"^[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+(@[a-zA-Z0-9_./%-]+)?$")
 
 
+def parse_owner_repo_branch(spec: str) -> Optional[tuple]:
+    """Parse owner/repo[@branch] spec into (owner_repo, branch) tuple.
+
+    Returns None if spec doesn't match owner/repo format.
+    Branch may be None if not specified.
+    """
+    # Skip paths and full URLs
+    if is_path_spec(spec) or "://" in spec:
+        return None
+    if spec.startswith("github.com/") or spec.startswith("gitlab.com/"):
+        return None
+
+    if not OWNER_REPO_PATTERN.match(spec):
+        return None
+
+    if "@" in spec:
+        owner_repo, branch = spec.split("@", 1)
+        return (owner_repo, branch)
+    return (spec, None)
+
+
 def is_path_spec(spec: str) -> bool:
     """Check if spec looks like a filesystem path."""
     return spec.startswith("./") or spec.startswith("/") or spec.startswith("~")
@@ -180,30 +234,59 @@ def expand_workspace_spec(spec: str) -> str:
     return spec
 
 
+def sanitize_workspace_id(name: str) -> str:
+    """Sanitize a name to match devpod's workspace ID format.
+
+    Devpod converts names to lowercase and replaces / with -.
+    """
+    return name.lower().replace("/", "-")
+
+
 def spec_to_workspace_id(spec: str) -> str:
-    """Derive the workspace ID that devpod will use for a given spec.
+    """Derive the workspace ID for a given spec.
 
-    Devpod uses:
-    - For git repos: the repo name (e.g., owner/repo -> repo)
+    When a branch is specified, we use the branch name as the workspace ID
+    to allow multiple branches of the same repo to be open simultaneously.
+    This requires passing --id to devpod.
+
+    - For git repos with branch: sanitized branch name
+    - For git repos without branch: sanitized full URL
     - For paths: the directory name (e.g., ./my-project -> my-project)
     - For existing IDs: the ID as-is
     """
-    # Strip @branch suffix if present
-    base_spec = spec.split("@")[0]
+    # Check for @branch suffix
+    branch = None
+    if "@" in spec:
+        base_spec, branch = spec.split("@", 1)
+    else:
+        base_spec = spec
 
     # For paths, use the directory name
     if is_path_spec(base_spec):
         return pathlib.Path(base_spec).expanduser().resolve().name
 
-    # For git URLs or owner/repo, extract repo name
+    # For git URLs or owner/repo
     if is_git_spec(base_spec):
-        # Handle various formats: github.com/owner/repo, owner/repo, https://...
-        parts = base_spec.rstrip("/").split("/")
-        repo_name = parts[-1]
-        # Remove .git suffix if present
-        if repo_name.endswith(".git"):
-            repo_name = repo_name[:-4]
-        return repo_name
+        # If branch specified, use branch name as workspace ID
+        # This allows multiple branches of same repo open simultaneously
+        if branch:
+            return sanitize_workspace_id(branch)
+
+        # Otherwise derive from full source URL
+        full_source = expand_workspace_spec(base_spec)
+        # Strip protocol prefix if present
+        if "://" in full_source:
+            full_source = full_source.split("://", 1)[1]
+        # Strip .git suffix if present
+        if full_source.endswith(".git"):
+            full_source = full_source[:-4]
+        # Devpod sanitizes: lowercase, replace . and / with -, remove _
+        workspace_id = full_source.lower()
+        workspace_id = workspace_id.replace(".", "-").replace("/", "-")
+        workspace_id = workspace_id.replace("_", "")
+        # Remove trailing - if any
+        workspace_id = workspace_id.rstrip("-")
+        return workspace_id
 
     # Otherwise assume it's already a workspace ID
     return spec
@@ -317,6 +400,138 @@ def get_git_branches(path: str) -> List[str]:
     return []
 
 
+def _git_ls_remote(owner_repo: str, *args: str) -> Optional[str]:
+    """Run git ls-remote and return stdout, or None on error.
+
+    Uses SSH URL for consistency with other git operations.
+    Includes timeout to prevent hanging on slow/unreachable remotes.
+    """
+    url = f"git@github.com:{owner_repo}.git"
+    try:
+        result = subprocess.run(
+            ["git", "ls-remote", url, *args],
+            capture_output=True,
+            text=True,
+            check=False,
+            timeout=5,
+        )
+        if result.returncode == 0 and result.stdout.strip():
+            return result.stdout
+    except (OSError, subprocess.SubprocessError, subprocess.TimeoutExpired):
+        pass
+    return None
+
+
+def remote_branch_exists(owner_repo: str, branch: str) -> bool:
+    """Check if a branch exists on a remote GitHub repository."""
+    output = _git_ls_remote(owner_repo, "--heads", branch)
+    return bool(output)
+
+
+def get_remote_head_sha(owner_repo: str) -> Optional[str]:
+    """Get the SHA of the default branch (HEAD) of a remote repository."""
+    output = _git_ls_remote(owner_repo, "HEAD")
+    if not output:
+        return None
+    # Output format: "<sha>\tHEAD"
+    return output.strip().split()[0]
+
+
+def _get_git_work_dir() -> pathlib.Path:
+    """Get a persistent git working directory in the cache."""
+    git_dir = CACHE_DIR / "git"
+    git_dir.mkdir(parents=True, exist_ok=True)
+    return git_dir
+
+
+def create_remote_branch(owner_repo: str, branch: str) -> bool:
+    """Create a new branch on a remote GitHub repository.
+
+    Creates the branch pointing to the current HEAD (default branch).
+    Requires push access to the repository and configured SSH keys.
+    """
+    # Use SSH URL - requires configured SSH keys
+    ssh_url = f"git@github.com:{owner_repo}.git"
+
+    try:
+        # Use persistent cache directory for git operations
+        git_dir = _get_git_work_dir()
+
+        # Initialize git repo if not already done
+        git_init_marker = git_dir / ".git"
+        if not git_init_marker.exists():
+            init_result = subprocess.run(
+                ["git", "init"],
+                cwd=git_dir,
+                capture_output=True,
+                text=True,
+                check=False,
+            )
+            if init_result.returncode != 0:
+                logging.error(f"Failed to init git repo: {init_result.stderr.strip()}")
+                return False
+
+        # Fetch the default branch HEAD from remote via SSH
+        fetch_result = subprocess.run(
+            ["git", "fetch", "--depth=1", ssh_url, "HEAD"],
+            cwd=git_dir,
+            capture_output=True,
+            text=True,
+            check=False,
+            timeout=30,
+        )
+        if fetch_result.returncode != 0:
+            stderr = fetch_result.stderr.strip()
+            if "permission denied" in stderr.lower() or "host key verification" in stderr.lower():
+                logging.error(
+                    f"SSH authentication failed for {owner_repo}.\n"
+                    f"Please create the branch manually on GitHub, or configure SSH keys."
+                )
+            else:
+                logging.error(f"Failed to fetch from {owner_repo}: {stderr}")
+            return False
+
+        # Push FETCH_HEAD to create the new branch
+        result = subprocess.run(
+            ["git", "push", ssh_url, f"FETCH_HEAD:refs/heads/{branch}"],
+            cwd=git_dir,
+            capture_output=True,
+            text=True,
+            check=False,
+        )
+        if result.returncode == 0:
+            logging.info(f"Created branch '{branch}' on {owner_repo}")
+            return True
+
+        stderr = result.stderr.strip()
+        if "permission denied" in stderr.lower() or "host key verification" in stderr.lower():
+            logging.error(
+                f"SSH authentication failed for {owner_repo}.\n"
+                f"Please create the branch manually on GitHub, or configure SSH keys."
+            )
+        else:
+            logging.error(f"Failed to create branch: {stderr}")
+        return False
+    except subprocess.TimeoutExpired:
+        logging.error(f"Timeout connecting to {owner_repo}")
+        return False
+    except (OSError, subprocess.SubprocessError) as e:
+        logging.error(f"Failed to create branch: {e}")
+        return False
+
+
+def ensure_remote_branch(owner_repo: str, branch: str) -> bool:
+    """Ensure a branch exists on the remote, creating it if necessary.
+
+    Returns True if branch exists or was created successfully.
+    """
+    if remote_branch_exists(owner_repo, branch):
+        return True
+
+    logging.info(f"Branch '{branch}' does not exist, creating it...")
+    return create_remote_branch(owner_repo, branch)
+
+
 def discover_repos_from_workspaces(workspaces: List[Workspace]) -> Dict[str, List[str]]:
     """Discover owner/repo from workspace git remotes.
 
@@ -450,10 +665,16 @@ def fuzzy_select_workspace() -> Optional[str]:
 
 
 def workspace_up(
-    workspace: str, ide: Optional[str] = None, recreate: bool = False, reset: bool = False
+    workspace: str,
+    ide: Optional[str] = None,
+    recreate: bool = False,
+    reset: bool = False,
+    workspace_id: Optional[str] = None,
 ):
     """Start or create a workspace."""
     args = ["up", workspace]
+    if workspace_id:
+        args.extend(["--id", workspace_id])
     if ide:
         args.extend(["--ide", ide])
     if recreate:
@@ -607,12 +828,22 @@ def main() -> int:
         return 1
 
     # Resolve workspace spec and ID
-    if raw_spec in existing_ids:
+    is_existing = raw_spec in existing_ids
+    if is_existing:
         workspace_spec = raw_spec
         workspace_id = raw_spec
+        custom_id = None  # Don't pass --id for existing workspaces
     else:
         workspace_spec = expand_workspace_spec(raw_spec)
         workspace_id = spec_to_workspace_id(raw_spec)
+        custom_id = workspace_id  # Pass --id to create with our desired ID
+
+    # For new git repos with a branch, ensure the branch exists (create if needed)
+    parsed = parse_owner_repo_branch(raw_spec)
+    if parsed and parsed[1]:  # Has owner/repo and branch
+        owner_repo, branch = parsed
+        if not ensure_remote_branch(owner_repo, branch):
+            return 1
 
     # Handle workspace subcommands
     if subcommand == "stop":
@@ -622,11 +853,11 @@ def main() -> int:
         return workspace_delete(workspace_id)
 
     if subcommand == "code":
-        result = workspace_up(workspace_spec, ide="vscode")
+        result = workspace_up(workspace_spec, ide="vscode", workspace_id=custom_id)
         return result.returncode
 
     if subcommand == "recreate":
-        result = workspace_up(workspace_spec, recreate=True)
+        result = workspace_up(workspace_spec, recreate=True, workspace_id=custom_id)
         if result.returncode != 0:
             return result.returncode
         return workspace_ssh(workspace_id)
@@ -636,14 +867,14 @@ def main() -> int:
         stop_ret = workspace_stop(workspace_id)
         if stop_ret != 0:
             return stop_ret
-        result = workspace_up(workspace_spec)
+        result = workspace_up(workspace_spec, workspace_id=custom_id)
         if result.returncode != 0:
             return result.returncode
         return workspace_ssh(workspace_id)
 
     if subcommand == "reset":
         # Clean slate - remove everything and recreate
-        result = workspace_up(workspace_spec, reset=True)
+        result = workspace_up(workspace_spec, reset=True, workspace_id=custom_id)
         if result.returncode != 0:
             return result.returncode
         return workspace_ssh(workspace_id)
@@ -660,7 +891,7 @@ def main() -> int:
         return 1
 
     # Default: start workspace and attach shell
-    result = workspace_up(workspace_spec)
+    result = workspace_up(workspace_spec, workspace_id=custom_id)
     if result.returncode != 0:
         return result.returncode
 

{devlaunch-0.0.2 → devlaunch-0.0.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "devlaunch"
-version = "0.0.2"
+version = "0.0.4"
 authors = [{ name = "Austin Gregg-Smith", email = "blooop@gmail.com" }]
 description = "DevLaunch - A streamlined CLI for devpod workspaces"
 readme = "README.md"