dev-bubble 0.6.2__tar.gz → 0.6.3__tar.gz

{dev_bubble-0.6.2 → dev_bubble-0.6.3}/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.6.3 — 2026-03-12
+- Don't prompt interactively during `bubble open` (#88)
+  - `maybe_symlink_claude_projects()` now prints an informational message instead of blocking on a `[y/N]` prompt
+  - New `bubble config symlink-claude-projects` command to perform the symlink manually
+  - Suppress the hint with `claude_projects_symlink = "no"` in `~/.bubble/config.toml`
+
 ## 0.6.2 — 2026-03-12
 - SSH tunnel auth proxy for remote/cloud bubbles (#81)
   - Remote and cloud bubbles now use the same repo-scoped auth proxy as local bubbles

{dev_bubble-0.6.2/dev_bubble.egg-info → dev_bubble-0.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dev-bubble
-Version: 0.6.2
+Version: 0.6.3
 Summary: Containerized development environments powered by Incus
 Author-email: Kim Morrison <kim@tqft.net>
 License-Expression: Apache-2.0

{dev_bubble-0.6.2 → dev_bubble-0.6.3}/bubble/__init__.py

@@ -1,3 +1,3 @@
 """bubble: Containerized development environments."""
 
-__version__ = "0.6.2"
+__version__ = "0.6.3"

{dev_bubble-0.6.2 → dev_bubble-0.6.3}/bubble/cli.py

@@ -659,9 +659,9 @@ def open_cmd(
         # Suppress auto mounts that overlap with user mounts (exact or ancestry)
         user_targets = {Path(m.target) for m in mount_specs}
         cc_mounts = [m for m in cc_mounts if not mount_overlaps(Path(m.target), user_targets)]
-        # Offer to symlink ~/.bubble/claude-projects/ to ~/.claude/projects/
+        # Hint about symlinking ~/.bubble/claude-projects/ to ~/.claude/projects/
         if not machine_readable:
-            maybe_symlink_claude_projects()
+            maybe_symlink_claude_projects(config)
 
     # Editor config mounts (emacs/neovim only — suppress if user mounts overlap)
     ec_mounts = editor_config_mounts(editor)

{dev_bubble-0.6.2 → dev_bubble-0.6.3}/bubble/commands/settings.py

@@ -396,3 +396,19 @@ def register_settings_commands(main):
             click.echo(f"Accepted {len(changed)} risk(s). On-by-default warnings silenced.")
         else:
             click.echo("No auto-defaulting-to-on settings to accept.")
+
+    @config_group.command("symlink-claude-projects")
+    def config_symlink_claude_projects():
+        """Replace ~/.bubble/claude-projects/ with a symlink to ~/.claude/projects/.
+
+        If ~/.claude/projects/ is inside a git repo, this command merges any
+        existing session data from ~/.bubble/claude-projects/ into
+        ~/.claude/projects/ and replaces the directory with a symlink.
+
+        This lets bubble session state live inside the git-tracked directory
+        and get synced across machines automatically.
+        """
+        from ..config import do_symlink_claude_projects
+
+        if not do_symlink_claude_projects():
+            raise SystemExit(1)

{dev_bubble-0.6.2 → dev_bubble-0.6.3}/bubble/config.py

@@ -420,15 +420,18 @@ def _is_inside_git_repo(path: Path) -> bool:
         return False
 
 
-def maybe_symlink_claude_projects() -> None:
-    """Offer to replace ~/.bubble/claude-projects/ with a symlink to ~/.claude/projects/.
+def maybe_symlink_claude_projects(config: dict | None = None) -> None:
+    """Print an informational message if claude-projects could be symlinked.
 
     If ~/.claude/projects/ is inside a git repo and ~/.bubble/claude-projects/ is a real
-    directory (not already a symlink), prompt the user to replace it with a symlink.
-    This lets bubble session state live inside the git-tracked directory and get
-    synced across machines automatically.
+    directory (not already a symlink), print a one-time hint about the
+    ``bubble config symlink-claude-projects`` command. Never prompts interactively.
+
+    Suppressed when ``claude_projects_symlink = "no"`` is set in config.
     """
-    import sys
+    # Respect opt-out config
+    if config and config.get("claude_projects_symlink") == "no":
+        return
 
     claude_projects = CLAUDE_CONFIG_DIR / "projects"
     bubble_projects = CLAUDE_PROJECTS_DIR
@@ -447,29 +450,65 @@ def maybe_symlink_claude_projects() -> None:
         bubble_projects.symlink_to(claude_projects)
         return
 
-    # Don't prompt if stdin is not a TTY (scripted/CI usage)
-    if not sys.stdin.isatty():
-        return
+    # It's a real directory — print informational message (no prompt)
+    import click
+
+    click.echo(
+        "~/.claude/projects is git-tracked. Claude sessions within bubbles are stored\n"
+        "in ~/.bubble/claude-projects. To replace that directory with a symlink (so\n"
+        "session state is tracked in git), run:\n"
+        "\n"
+        "  bubble config symlink-claude-projects\n"
+        "\n"
+        'To suppress this message, set claude_projects_symlink = "no" in '
+        "~/.bubble/config.toml.",
+        err=True,
+    )
+
 
-    # It's a real directory — prompt the user
+def do_symlink_claude_projects() -> bool:
+    """Replace ~/.bubble/claude-projects/ with a symlink to ~/.claude/projects/.
+
+    Merges existing contents from bubble-projects into claude-projects before
+    replacing. Returns True if the symlink was created, False otherwise.
+    """
     import click
 
-    if not click.confirm(
-        f"{claude_projects} is git-tracked. Replace {bubble_projects}\n"
-        f"with a symlink to {claude_projects} so bubble session state is tracked too?",
-        default=False,
-    ):
-        return
+    claude_projects = CLAUDE_CONFIG_DIR / "projects"
+    bubble_projects = CLAUDE_PROJECTS_DIR
+
+    if not claude_projects.is_dir():
+        click.echo(f"{claude_projects} does not exist.", err=True)
+        return False
+
+    if not _is_inside_git_repo(claude_projects):
+        click.echo(f"{claude_projects} is not inside a git repository.", err=True)
+        return False
+
+    if bubble_projects.is_symlink():
+        target = bubble_projects.resolve()
+        if target == claude_projects.resolve():
+            click.echo(f"{bubble_projects} is already a symlink to {claude_projects}.")
+            return True
+        click.echo(f"{bubble_projects} is a symlink to {target}, not {claude_projects}.", err=True)
+        return False
+
+    if not bubble_projects.exists():
+        bubble_projects.parent.mkdir(parents=True, exist_ok=True)
+        bubble_projects.symlink_to(claude_projects)
+        click.echo(f"Created symlink: {bubble_projects} -> {claude_projects}")
+        return True
+
+    if not bubble_projects.is_dir():
+        click.echo(f"{bubble_projects} exists but is not a directory.", err=True)
+        return False
 
     # Merge existing contents into ~/.claude/projects/
-    # Move unique items; for conflicts, copy bubble-only files into the
-    # destination so nothing is silently lost.
     for child in bubble_projects.iterdir():
         dest = claude_projects / child.name
         if not dest.exists():
             shutil.move(str(child), str(dest))
         elif child.is_dir() and dest.is_dir():
-            # Recursively merge directory contents that only exist in bubble
             _merge_dir(child, dest)
         else:
             click.echo(f"  Skipping {child.name} (already exists in {claude_projects})")
@@ -477,6 +516,8 @@ def maybe_symlink_claude_projects() -> None:
     # Replace with symlink — use rmtree since conflicts may leave remnants
     shutil.rmtree(str(bubble_projects))
     bubble_projects.symlink_to(claude_projects)
+    click.echo(f"Created symlink: {bubble_projects} -> {claude_projects}")
+    return True
 
 
 def _merge_dir(src: Path, dest: Path) -> None:

{dev_bubble-0.6.2 → dev_bubble-0.6.3/dev_bubble.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dev-bubble
-Version: 0.6.2
+Version: 0.6.3
 Summary: Containerized development environments powered by Incus
 Author-email: Kim Morrison <kim@tqft.net>
 License-Expression: Apache-2.0

{dev_bubble-0.6.2 → dev_bubble-0.6.3}/tests/test_claude_projects_symlink.py

@@ -4,7 +4,7 @@ from unittest.mock import patch
 
 import pytest
 
-from bubble.config import maybe_symlink_claude_projects
+from bubble.config import do_symlink_claude_projects, maybe_symlink_claude_projects
 
 
 @pytest.fixture
@@ -82,8 +82,54 @@ class TestMaybeSymlinkClaudeProjects:
         assert bubble_projects.is_symlink()
         assert bubble_projects.resolve() == claude_projects.resolve()
 
-    def test_prompts_and_replaces_on_accept(self, setup_dirs):
-        """Prompts user and creates symlink when accepted."""
+    def test_prints_hint_when_real_dir_exists(self, setup_dirs, capsys):
+        """Prints informational message when ~/.bubble/claude-projects/ is a real dir."""
+        claude_projects, bubble_projects = setup_dirs
+        bubble_projects.mkdir()
+
+        with patch("bubble.config._is_inside_git_repo", return_value=True):
+            maybe_symlink_claude_projects()
+
+        # Directory is NOT replaced (no prompt, no auto-replace)
+        assert bubble_projects.is_dir()
+        assert not bubble_projects.is_symlink()
+
+        # Message was printed to stderr
+        captured = capsys.readouterr()
+        assert "symlink-claude-projects" in captured.err
+        assert "claude_projects_symlink" in captured.err
+
+    def test_suppressed_by_config(self, setup_dirs, capsys):
+        """No message when claude_projects_symlink = 'no' in config."""
+        claude_projects, bubble_projects = setup_dirs
+        bubble_projects.mkdir()
+
+        with patch("bubble.config._is_inside_git_repo", return_value=True):
+            maybe_symlink_claude_projects(config={"claude_projects_symlink": "no"})
+
+        assert bubble_projects.is_dir()
+        assert not bubble_projects.is_symlink()
+
+        captured = capsys.readouterr()
+        assert captured.err == ""
+
+    def test_handles_empty_bubble_projects_dir(self, setup_dirs, capsys):
+        """Prints hint when ~/.bubble/claude-projects/ exists but is empty."""
+        claude_projects, bubble_projects = setup_dirs
+        bubble_projects.mkdir()
+
+        with patch("bubble.config._is_inside_git_repo", return_value=True):
+            maybe_symlink_claude_projects()
+
+        # Not replaced — just a hint
+        assert bubble_projects.is_dir()
+        assert not bubble_projects.is_symlink()
+        assert "symlink-claude-projects" in capsys.readouterr().err
+
+
+class TestDoSymlinkClaudeProjects:
+    def test_replaces_dir_with_symlink(self, setup_dirs):
+        """Replaces ~/.bubble/claude-projects/ with a symlink and merges contents."""
         claude_projects, bubble_projects = setup_dirs
         bubble_projects.mkdir()
 
@@ -91,48 +137,46 @@ class TestMaybeSymlinkClaudeProjects:
         (bubble_projects / "session-a").mkdir()
         (bubble_projects / "session-a" / "data.jsonl").write_text("data")
 
-        with (
-            patch("bubble.config._is_inside_git_repo", return_value=True),
-            patch("sys.stdin", **{"isatty.return_value": True}),
-            patch("click.confirm", return_value=True),
-        ):
-            maybe_symlink_claude_projects()
+        with patch("bubble.config._is_inside_git_repo", return_value=True):
+            result = do_symlink_claude_projects()
 
+        assert result is True
         assert bubble_projects.is_symlink()
         assert bubble_projects.resolve() == claude_projects.resolve()
         # Content was moved
         assert (claude_projects / "session-a" / "data.jsonl").read_text() == "data"
 
-    def test_prompts_and_skips_on_deny(self, setup_dirs):
-        """No changes when user denies the prompt."""
+    def test_creates_symlink_when_bubble_dir_missing(self, setup_dirs):
+        """Creates symlink directly when ~/.bubble/claude-projects/ doesn't exist."""
         claude_projects, bubble_projects = setup_dirs
-        bubble_projects.mkdir()
-        (bubble_projects / "keep-me").write_text("data")
 
-        with (
-            patch("bubble.config._is_inside_git_repo", return_value=True),
-            patch("sys.stdin", **{"isatty.return_value": True}),
-            patch("click.confirm", return_value=False),
-        ):
-            maybe_symlink_claude_projects()
+        with patch("bubble.config._is_inside_git_repo", return_value=True):
+            result = do_symlink_claude_projects()
 
-        assert bubble_projects.is_dir()
-        assert not bubble_projects.is_symlink()
-        assert (bubble_projects / "keep-me").read_text() == "data"
+        assert result is True
+        assert bubble_projects.is_symlink()
+        assert bubble_projects.resolve() == claude_projects.resolve()
 
-    def test_noop_when_not_tty(self, setup_dirs):
-        """No prompt when stdin is not a TTY."""
+    def test_noop_when_already_symlink(self, setup_dirs):
+        """Returns True when already a symlink."""
+        claude_projects, bubble_projects = setup_dirs
+        bubble_projects.symlink_to(claude_projects)
+
+        with patch("bubble.config._is_inside_git_repo", return_value=True):
+            result = do_symlink_claude_projects()
+
+        assert result is True
+        assert bubble_projects.is_symlink()
+
+    def test_fails_when_not_git_tracked(self, setup_dirs):
+        """Returns False when ~/.claude/projects/ is not in a git repo."""
         claude_projects, bubble_projects = setup_dirs
         bubble_projects.mkdir()
-        (bubble_projects / "keep-me").write_text("data")
 
-        with (
-            patch("bubble.config._is_inside_git_repo", return_value=True),
-            patch("sys.stdin", **{"isatty.return_value": False}),
-        ):
-            maybe_symlink_claude_projects()
+        with patch("bubble.config._is_inside_git_repo", return_value=False):
+            result = do_symlink_claude_projects()
 
-        assert bubble_projects.is_dir()
+        assert result is False
         assert not bubble_projects.is_symlink()
 
     def test_merges_without_overwriting_conflicts(self, setup_dirs):
@@ -150,12 +194,8 @@ class TestMaybeSymlinkClaudeProjects:
         (bubble_projects / "unique").mkdir()
         (bubble_projects / "unique" / "data.txt").write_text("unique-data")
 
-        with (
-            patch("bubble.config._is_inside_git_repo", return_value=True),
-            patch("sys.stdin", **{"isatty.return_value": True}),
-            patch("click.confirm", return_value=True),
-        ):
-            maybe_symlink_claude_projects()
+        with patch("bubble.config._is_inside_git_repo", return_value=True):
+            do_symlink_claude_projects()
 
         assert bubble_projects.is_symlink()
         # Original was preserved (not overwritten)
@@ -165,20 +205,71 @@ class TestMaybeSymlinkClaudeProjects:
         # Unique content was moved
         assert (claude_projects / "unique" / "data.txt").read_text() == "unique-data"
 
-    def test_handles_empty_bubble_projects_dir(self, setup_dirs):
-        """Works when ~/.bubble/claude-projects/ exists but is empty."""
+    def test_fails_when_bubble_projects_is_file(self, setup_dirs):
+        """Returns False when ~/.bubble/claude-projects is a file, not a dir."""
+        claude_projects, bubble_projects = setup_dirs
+        bubble_projects.write_text("not a directory")
+
+        with patch("bubble.config._is_inside_git_repo", return_value=True):
+            result = do_symlink_claude_projects()
+
+        assert result is False
+        assert not bubble_projects.is_symlink()
+
+    def test_fails_when_symlink_points_elsewhere(self, setup_dirs):
+        """Returns False when existing symlink points to wrong target."""
+        claude_projects, bubble_projects = setup_dirs
+        other_dir = bubble_projects.parent / "other"
+        other_dir.mkdir()
+        bubble_projects.symlink_to(other_dir)
+
+        with patch("bubble.config._is_inside_git_repo", return_value=True):
+            result = do_symlink_claude_projects()
+
+        assert result is False
+
+    def test_succeeds_when_symlink_points_to_claude_projects(self, setup_dirs):
+        """Returns True when existing symlink already points to correct target."""
+        claude_projects, bubble_projects = setup_dirs
+        bubble_projects.symlink_to(claude_projects)
+
+        with patch("bubble.config._is_inside_git_repo", return_value=True):
+            result = do_symlink_claude_projects()
+
+        assert result is True
+
+
+class TestSymlinkClaudeProjectsCLI:
+    def test_exit_code_on_failure(self, setup_dirs):
+        """CLI command exits with code 1 on failure."""
+        from click.testing import CliRunner
+
+        from bubble.cli import main
+
         claude_projects, bubble_projects = setup_dirs
         bubble_projects.mkdir()
 
-        with (
-            patch("bubble.config._is_inside_git_repo", return_value=True),
-            patch("sys.stdin", **{"isatty.return_value": True}),
-            patch("click.confirm", return_value=True),
-        ):
-            maybe_symlink_claude_projects()
+        runner = CliRunner()
+        with patch("bubble.config._is_inside_git_repo", return_value=False):
+            result = runner.invoke(main, ["config", "symlink-claude-projects"])
+
+        assert result.exit_code != 0
+
+    def test_exit_code_on_success(self, setup_dirs):
+        """CLI command exits with code 0 on success."""
+        from click.testing import CliRunner
+
+        from bubble.cli import main
 
+        claude_projects, bubble_projects = setup_dirs
+        # Don't create bubble_projects — simplest success path
+
+        runner = CliRunner()
+        with patch("bubble.config._is_inside_git_repo", return_value=True):
+            result = runner.invoke(main, ["config", "symlink-claude-projects"])
+
+        assert result.exit_code == 0
         assert bubble_projects.is_symlink()
-        assert bubble_projects.resolve() == claude_projects.resolve()
 
 
 class TestIsInsideGitRepo: