dev-bubble 0.7.8__tar.gz → 0.7.9__tar.gz

{dev_bubble-0.7.8/dev_bubble.egg-info → dev_bubble-0.7.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dev-bubble
-Version: 0.7.8
+Version: 0.7.9
 Summary: Containerized development environments powered by Incus
 Author-email: Kim Morrison <kim@tqft.net>
 License-Expression: Apache-2.0
@@ -43,7 +43,7 @@ We assume that you work using VSCode, emacs, or neovim, and that you collaborate
 
 ```bash
 # Install
-uv tool install dev-bubble
+uv tool install git+https://github.com/kim-em/bubble.git
 
 # Open a bubble for a GitHub PR — just paste the URL, and you get a containerized VSCode window!
 bubble https://github.com/leanprover-community/mathlib4/pull/35219
@@ -124,11 +124,9 @@ bubble pop mathlib4-pr-35219
 ## Development Install
 
 ```bash
-# Install from GitHub
-uv tool install git+https://github.com/kim-em/bubble.git
-
-# For development
-uv pip install -e '.[dev]'
+# Install from a local clone (editable — always uses latest code)
+git clone https://github.com/kim-em/bubble.git
+uv tool install --force --editable bubble
 ```
 
 ## How It Works
@@ -263,10 +261,10 @@ bubble mathlib4/issues/42
 
 Claude is instructed to read the issue, implement a fix on the `issue-<number>` branch, and open a PR. This turns `bubble 42` (for an issue) into an autonomous coding agent workflow.
 
-You can also provide a custom prompt for any bubble via the `BUBBLE_CLAUDE_PROMPT` environment variable:
+You can also provide a custom prompt for any bubble via the `BUBBLE_AI_PROMPT` environment variable:
 
 ```bash
-BUBBLE_CLAUDE_PROMPT="Refactor the parser module" bubble leanprover/lean4
+BUBBLE_AI_PROMPT="Refactor the parser module" bubble leanprover/lean4
 ```
 
 Requirements: Claude Code must be installed in the container (see tool settings above), the `gh` CLI must be available on the host (for fetching issue/PR metadata), and the default VS Code editor must be used. With `--shell` or `--no-interactive`, the prompt is not injected. If `gh` is unavailable or the API call fails, bubble proceeds without injecting a prompt.

{dev_bubble-0.7.8 → dev_bubble-0.7.9}/README.md

@@ -9,7 +9,7 @@ We assume that you work using VSCode, emacs, or neovim, and that you collaborate
 
 ```bash
 # Install
-uv tool install dev-bubble
+uv tool install git+https://github.com/kim-em/bubble.git
 
 # Open a bubble for a GitHub PR — just paste the URL, and you get a containerized VSCode window!
 bubble https://github.com/leanprover-community/mathlib4/pull/35219
@@ -90,11 +90,9 @@ bubble pop mathlib4-pr-35219
 ## Development Install
 
 ```bash
-# Install from GitHub
-uv tool install git+https://github.com/kim-em/bubble.git
-
-# For development
-uv pip install -e '.[dev]'
+# Install from a local clone (editable — always uses latest code)
+git clone https://github.com/kim-em/bubble.git
+uv tool install --force --editable bubble
 ```
 
 ## How It Works
@@ -229,10 +227,10 @@ bubble mathlib4/issues/42
 
 Claude is instructed to read the issue, implement a fix on the `issue-<number>` branch, and open a PR. This turns `bubble 42` (for an issue) into an autonomous coding agent workflow.
 
-You can also provide a custom prompt for any bubble via the `BUBBLE_CLAUDE_PROMPT` environment variable:
+You can also provide a custom prompt for any bubble via the `BUBBLE_AI_PROMPT` environment variable:
 
 ```bash
-BUBBLE_CLAUDE_PROMPT="Refactor the parser module" bubble leanprover/lean4
+BUBBLE_AI_PROMPT="Refactor the parser module" bubble leanprover/lean4
 ```
 
 Requirements: Claude Code must be installed in the container (see tool settings above), the `gh` CLI must be available on the host (for fetching issue/PR metadata), and the default VS Code editor must be used. With `--shell` or `--no-interactive`, the prompt is not injected. If `gh` is unavailable or the API call fails, bubble proceeds without injecting a prompt.

{dev_bubble-0.7.8 → dev_bubble-0.7.9}/SPEC.md

@@ -56,7 +56,7 @@ equivalent to `bubble open <url>`.
 | `-b`, `--new-branch` | string | | Create a new branch |
 | `--base` | string | | Base branch for `-b` |
 | `--mount` | string (repeatable) | | Mount host dir into container |
-| `--claude-config/--no-claude-config` | flag | enabled | Mount ~/.claude config read-only |
+| `--ai-config/--no-ai-config` | flag | enabled | Mount AI provider configs read-only |
 | `--claude-credentials/--no-claude-credentials` | flag | enabled | Mount Claude credentials |
 | `--codex-credentials/--no-codex-credentials` | flag | enabled | Mount Codex credentials |
 | `--ssh HOST` | string | | Run on remote host |
@@ -912,7 +912,7 @@ validation already confirmed the repo exists).
 
 ### 10.1 Claude Code config mounting
 
-When `--claude-config` is enabled (default), mount specific items from
+When `--ai-config` is enabled (default), mount specific items from
 `~/.claude/` into `/home/user/.claude/` read-only:
 - `CLAUDE.md`, `settings.json`, `skills/`, `keybindings.json`, `commands/`
 
@@ -1087,11 +1087,10 @@ Configuration is managed through dedicated subcommands rather than a generic
 get/set interface:
 
 - `bubble tools set TOOL yes|no|auto` — configure tool installation
-- `bubble claude credentials on|off` — toggle Claude credential mounting
-- `bubble codex credentials on|off` — toggle Codex credential mounting
+- `bubble ai credentials on|off [--provider claude|codex]` — toggle AI credential mounting
 - `bubble security set NAME on|off|auto` — configure security settings
 - `bubble config set KEY VALUE` — set security settings (alias)
-- `bubble config symlink-claude-projects` — symlink Claude projects directory
+- `bubble config symlink-ai-projects` — symlink AI projects directory
 
 ---
 

{dev_bubble-0.7.8 → dev_bubble-0.7.9}/bubble/__init__.py

@@ -1,3 +1,3 @@
 """bubble: Containerized development environments."""
 
-__version__ = "0.7.8"
+__version__ = "0.7.9"

dev_bubble-0.7.8/bubble/claude.py → dev_bubble-0.7.9/bubble/ai.py

@@ -1,20 +1,52 @@
-"""Claude Code integration for bubble containers."""
+"""AI provider integration for bubble containers.
+
+Handles prompt generation and task injection for the configured preferred
+AI provider (default: Claude Code). Provider-neutral where possible;
+provider-specific details (binary names, env vars, prompt file paths)
+are dispatched via the ``[ai] preferred`` config key.
+"""
 
 import json
 import re
 import shlex
 import subprocess
+from pathlib import Path
 
 from .config import DATA_DIR
 from .runtime.base import ContainerRuntime
 
-# Claude task command: reads prompt from file, runs Claude with skip-permissions,
-# then deletes the prompt file so reopening is clean.
-CLAUDE_TASK_COMMAND = (
-    "test -f .vscode/claude-prompt.txt && ANTHROPIC_API_KEY= CLAUDECODE="
-    ' claude --dangerously-skip-permissions "$(cat .vscode/claude-prompt.txt)"'
-    " && rm -f .vscode/claude-prompt.txt"
-)
+# Provider-specific task commands.
+# Each reads the prompt from .vscode/ai-prompt.txt, runs the AI tool
+# with autonomous permissions, then deletes the prompt file.
+_TASK_COMMANDS = {
+    "claude": (
+        "test -f .vscode/ai-prompt.txt && ANTHROPIC_API_KEY= CLAUDECODE="
+        ' claude --dangerously-skip-permissions "$(cat .vscode/ai-prompt.txt)"'
+        " && rm -f .vscode/ai-prompt.txt"
+    ),
+    "codex": (
+        "test -f .vscode/ai-prompt.txt &&"
+        ' codex --approval-mode full-auto "$(cat .vscode/ai-prompt.txt)"'
+        " && rm -f .vscode/ai-prompt.txt"
+    ),
+}
+
+SUPPORTED_PROVIDERS = frozenset(_TASK_COMMANDS)
+
+
+def _task_command_for(provider: str) -> str:
+    """Return the VS Code task shell command for the given AI provider.
+
+    Raises ``ValueError`` for unknown providers so typos are caught early.
+    """
+    try:
+        return _TASK_COMMANDS[provider]
+    except KeyError:
+        supported = ", ".join(sorted(SUPPORTED_PROVIDERS))
+        raise ValueError(f"Unknown AI provider {provider!r} (supported: {supported})") from None
+
+
+AI_TASK_COMMAND = _TASK_COMMANDS["claude"]
 
 TEMPLATES_DIR = DATA_DIR / "templates"
 
@@ -173,7 +205,7 @@ def generate_issue_prompt(
     second_opinion: str = "auto",
     config: dict | None = None,
 ) -> str | None:
-    """Fetch GitHub issue details and generate a Claude prompt.
+    """Fetch GitHub issue details and generate an AI prompt.
 
     Returns the prompt string, or None if the issue can't be fetched.
     Uses a custom template from ~/.bubble/templates/issue.txt if present,
@@ -235,7 +267,7 @@ def generate_issue_prompt(
 
 
 def generate_pr_prompt(owner: str, repo: str, pr_num: str, branch: str) -> str | None:
-    """Fetch GitHub PR details and generate a Claude prompt.
+    """Fetch GitHub PR details and generate an AI prompt.
 
     Returns the prompt string, or None if the PR can't be fetched.
     Uses a custom template from ~/.bubble/templates/pr.txt if present,
@@ -260,17 +292,92 @@ def generate_pr_prompt(owner: str, repo: str, pr_num: str, branch: str) -> str |
     )
 
 
-def inject_claude_task(
-    runtime: ContainerRuntime, container: str, project_dir: str, prompt: str, quiet: bool = False
+# Known-safe keys to copy from the host's ~/.claude.json.
+# Only cosmetic/UX settings — no credentials, MCP config, or host-specific paths.
+_CLAUDE_JSON_SAFE_KEYS = frozenset(
+    {
+        "theme",
+        "hasCompletedOnboarding",
+        "numStartups",
+        "preferredNotifChannel",
+        "autoUpdaterStatus",
+    }
+)
+
+
+def setup_claude_settings(
+    runtime: ContainerRuntime,
+    container: str,
+    project_dir: str,
+):
+    """Pre-populate ~/.claude.json in the container to skip the first-run wizard.
+
+    Copies allowlisted settings (theme, onboarding state, etc.) from the host's
+    ~/.claude.json if it exists. Always ensures hasCompletedOnboarding=True
+    and pre-trusts the project directory. This runs for ALL bubbles, not just
+    those with AI task injection.
+
+    Best-effort: failures are logged but do not abort bubble creation.
+    """
+    host_claude_json = Path.home() / ".claude.json"
+
+    # Extract only allowlisted keys from host settings
+    settings: dict = {}
+    if host_claude_json.is_file():
+        try:
+            host_data = json.loads(host_claude_json.read_text())
+            if isinstance(host_data, dict):
+                settings = {k: v for k, v in host_data.items() if k in _CLAUDE_JSON_SAFE_KEYS}
+        except (OSError, json.JSONDecodeError):
+            pass
+
+    # Ensure onboarding is marked complete
+    settings["hasCompletedOnboarding"] = True
+    n = settings.get("numStartups", 0)
+    settings["numStartups"] = (n if isinstance(n, int) else 0) + 1
+
+    # Pre-trust the project directory
+    settings["projects"] = {
+        project_dir: {"hasTrustDialogAccepted": True, "allowedTools": []},
+    }
+
+    # Write to container (best-effort — don't abort bubble creation on failure)
+    settings_json = shlex.quote(json.dumps(settings, indent=2))
+    try:
+        runtime.exec(
+            container,
+            ["su", "-", "user", "-c", f"printf '%s' {settings_json} > ~/.claude.json"],
+        )
+    except Exception:
+        from .output import detail
+
+        detail("Warning: could not pre-populate Claude Code settings.", err=True)
+
+
+def inject_ai_task(
+    runtime: ContainerRuntime,
+    container: str,
+    project_dir: str,
+    prompt: str,
+    config: dict | None = None,
+    quiet: bool = False,
 ):
-    """Inject Claude auto-start task into a container's VS Code configuration.
+    """Inject AI auto-start task into a container's VS Code configuration.
+
+    Dispatches to the configured preferred AI provider (default: Claude).
 
-    - Writes prompt to .vscode/claude-prompt.txt
-    - Creates/updates .vscode/tasks.json with Claude task (runOn: folderOpen)
+    - Writes prompt to .vscode/ai-prompt.txt
+    - Creates/updates .vscode/tasks.json with AI task (runOn: folderOpen)
     - Configures .vscode/settings.json for automatic tasks
     - Adds generated files to git exclude
-    - Pre-trusts the project directory in .claude.json
+    - Pre-trusts the project directory in the preferred provider's config
     """
+    provider = "claude"
+    if config:
+        provider = config.get("ai", {}).get("preferred", "claude")
+
+    task_command = _task_command_for(provider)
+
     q_dir = shlex.quote(project_dir)
     q_prompt = shlex.quote(prompt)
 
@@ -280,20 +387,21 @@ def inject_claude_task(
     # Write prompt to file
     runtime.exec(
         container,
-        ["su", "-", "user", "-c", f"printf '%s' {q_prompt} > {q_dir}/.vscode/claude-prompt.txt"],
+        ["su", "-", "user", "-c", f"printf '%s' {q_prompt} > {q_dir}/.vscode/ai-prompt.txt"],
     )
 
-    # Create or update tasks.json with Claude task
-    claude_task = {
-        "label": "Claude",
+    # Create or update tasks.json with AI task
+    ai_task = {
+        "label": "AI",
         "type": "shell",
-        "command": CLAUDE_TASK_COMMAND,
+        "command": task_command,
         "runOptions": {"runOn": "folderOpen"},
         "presentation": {"reveal": "always", "panel": "dedicated"},
     }
-    tasks_json_str = shlex.quote(json.dumps(claude_task))
+    tasks_json_str = shlex.quote(json.dumps(ai_task))
 
-    # Script: if tasks.json exists, add Claude task; otherwise create new file
+    # Script: if tasks.json exists, add AI task (removing old Claude and AI labels);
+    # otherwise create new file
     script = (
         f"cd {q_dir} && "
         f"if [ -f .vscode/tasks.json ]; then "
@@ -301,7 +409,7 @@ def inject_claude_task(
         f"import json,sys; "
         f"t=json.load(open('.vscode/tasks.json')); "
         f"t['tasks']=[x for x in t.get('tasks',[])"
-        f" if x.get('label')!='Claude']+[json.loads(sys.argv[1])]; "
+        f" if x.get('label') not in ('Claude','AI')]+[json.loads(sys.argv[1])]; "
         f"json.dump(t,open('.vscode/tasks.json','w'),indent=2)"
         f'" {tasks_json_str}; '
         f"else "
@@ -332,31 +440,16 @@ def inject_claude_task(
         f"cd {q_dir} && "
         f"GIT_DIR=$(git rev-parse --git-dir) && "
         f"mkdir -p $GIT_DIR/info && "
-        f"for f in .vscode/claude-prompt.txt .vscode/settings.json .vscode/tasks.json; do "
+        f"for f in .vscode/ai-prompt.txt .vscode/claude-prompt.txt"
+        f" .vscode/settings.json .vscode/tasks.json; do "
         f'  grep -qxF "$f" $GIT_DIR/info/exclude 2>/dev/null'
         f' || echo "$f" >> $GIT_DIR/info/exclude; '
         f"done"
     )
     runtime.exec(container, ["su", "-", "user", "-c", exclude_script])
 
-    # Pre-trust the project directory and skip onboarding in .claude.json
-    trust_script = (
-        f'python3 -c "'
-        f"import json,os; "
-        f"p=os.path.expanduser('~/.claude.json'); "
-        f"d=json.load(open(p)) if os.path.exists(p) else {{}}; "
-        f"d['hasCompletedOnboarding']=True; "
-        f"n=d.get('numStartups',0); d['numStartups']=(n if isinstance(n,int) else 0)+1; "
-        f"d.setdefault('projects',{{}}); "
-        f"proj=d['projects'].setdefault({shlex.quote(project_dir)!r},{{}}); "  # noqa: E501
-        f"proj['hasTrustDialogAccepted']=True; "
-        f"proj.setdefault('allowedTools',[]); "
-        f"json.dump(d,open(p,'w'),indent=2)"
-        f'"'
-    )
-    runtime.exec(container, ["su", "-", "user", "-c", trust_script])
-
     if not quiet:
         from .output import detail
 
-        detail("Claude Code task injected (will start on VS Code folder open).")
+        label = provider.capitalize()
+        detail(f"{label} task injected (will start on VS Code folder open).")

{dev_bubble-0.7.8 → dev_bubble-0.7.9}/bubble/auth_proxy.py

@@ -326,19 +326,21 @@ def validate_api_path(
 # ---------------------------------------------------------------------------
 
 
-def _skip_braced_block(text: str, start: int) -> int:
-    """Skip a balanced { ... } block starting at position start.
+def _skip_braced_tokens(tokens: list, start: int) -> int:
+    """Skip a balanced { ... } block in a token list starting at *start*.
 
-    Returns the position after the closing brace, or -1 on error.
+    tokens[start] must be a '{' punct token.
+    Returns the index after the closing '}', or -1 on error.
     """
-    if start >= len(text) or text[start] != "{":
+    if start >= len(tokens) or tokens[start].value != "{":
         return -1
     depth = 1
     i = start + 1
-    while i < len(text) and depth > 0:
-        if text[i] == "{":
+    while i < len(tokens) and depth > 0:
+        v = tokens[i].value
+        if v == "{":
             depth += 1
-        elif text[i] == "}":
+        elif v == "}":
             depth -= 1
         i += 1
     return i if depth == 0 else -1
@@ -350,64 +352,62 @@ def _collect_graphql_op_types(query: str) -> list[str]:
     Returns a list of operation types found (e.g. ['query', 'mutation']).
     Handles line comments, fragment definitions, and anonymous queries.
     Multiple operations in a single document are all reported.
+
+    Uses the string-aware tokenizer from graphql_validator so that braces
+    inside string literals are not miscounted.
     """
-    # Strip line comments
-    lines = []
-    for line in query.split("\n"):
-        idx = line.find("#")
-        if idx >= 0:
-            line = line[:idx]
-        lines.append(line)
-    cleaned = " ".join(lines).strip()
-
-    if not cleaned:
+    from .graphql_validator import _tokenize
+
+    tokens = _tokenize(query)
+    if not tokens:
         return []
 
-    ops = []
-    pos = 0
+    ops: list[str] = []
+    i = 0
 
-    while pos < len(cleaned):
-        # Skip whitespace
-        while pos < len(cleaned) and cleaned[pos] in " \t\r\n":
-            pos += 1
-        if pos >= len(cleaned):
-            break
+    while i < len(tokens):
+        tok = tokens[i]
 
         # Anonymous query starts with {
-        if cleaned[pos] == "{":
+        if tok.kind == "punct" and tok.value == "{":
             ops.append("query")
-            end = _skip_braced_block(cleaned, pos)
+            end = _skip_braced_tokens(tokens, i)
             if end == -1:
                 break
-            pos = end
+            i = end
             continue
 
-        # Skip fragment definitions: fragment Name on Type { ... }
-        if cleaned[pos:].startswith("fragment"):
-            brace_start = cleaned.find("{", pos)
-            if brace_start == -1:
-                break
-            end = _skip_braced_block(cleaned, brace_start)
-            if end == -1:
-                break
-            pos = end
-            continue
+        if tok.kind == "ident":
+            # Skip fragment definitions: fragment Name on Type { ... }
+            if tok.value == "fragment":
+                # Scan forward to the opening brace
+                j = i + 1
+                while j < len(tokens) and tokens[j].value != "{":
+                    j += 1
+                if j >= len(tokens):
+                    break
+                end = _skip_braced_tokens(tokens, j)
+                if end == -1:
+                    break
+                i = end
+                continue
 
-        # Check for operation keyword
-        match = re.match(r"(query|mutation|subscription)\b", cleaned[pos:], re.IGNORECASE)
-        if match:
-            ops.append(match.group(1).lower())
-            # Skip past the operation body
-            brace_start = cleaned.find("{", pos)
-            if brace_start == -1:
-                break
-            end = _skip_braced_block(cleaned, brace_start)
-            if end == -1:
-                break
-            pos = end
-            continue
+            # Check for operation keyword
+            if tok.value.lower() in ("query", "mutation", "subscription"):
+                ops.append(tok.value.lower())
+                # Scan forward to the opening brace
+                j = i + 1
+                while j < len(tokens) and tokens[j].value != "{":
+                    j += 1
+                if j >= len(tokens):
+                    break
+                end = _skip_braced_tokens(tokens, j)
+                if end == -1:
+                    break
+                i = end
+                continue
 
-        # Unrecognized content — stop parsing
+        # Unrecognized token — stop parsing
         break
 
     return ops