wade-cli 0.35.0__tar.gz → 0.35.3__tar.gz

{wade_cli-0.35.0 → wade_cli-0.35.3}/CHANGELOG.md

@@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Conventional Commits](https://conventionalcommits.org/).
 
+## [v0.35.3] — 2026-07-25
+
+### Chores
+
+- bump crossby to v0.11.0 and adopt newer models (Opus 5) (#345) (d9ac8a5)
+
+## [v0.35.1] — 2026-07-24
+
+### Bug Fixes
+
+- PR merge fails with 'could not determine current branch' when repo_root HEAD is detached (#334) (7c79e88)
+
 ## [v0.35.0] — 2026-07-24
 
 ### Features

{wade_cli-0.35.0 → wade_cli-0.35.3}/KNOWLEDGE.md

@@ -231,3 +231,9 @@ wade never branches on crossby's AIToolType/tool_type (only re-exported in wade.
 To unit-test a crossby GUI adapter launch command (Antigravity IDE, VS Code), patch `crossby.ai_tools.<module>.run_with_transcript` (e.g. crossby.ai_tools.antigravity.run_with_transcript) and read call_args[0][0] — GUI adapters build the cmd and call crossby's run_with_transcript directly, so patching wade.utils.process/subprocess never fires. The Antigravity IDE cmd is exactly ["antigravity", str(working_dir)] (explicit dir, not ".").
 
 ---
+
+## ae5df2be | 2026-07-24 | plan | tags: crossby, ai-tools, model-registry, dependencies
+
+To add or refresh supported AI models in wade (e.g. a new Opus), bump the crossby dependency — there is no wade-side model list to edit. The model registry (crossby.data.MODELS / get_models_for_tool), the complexity-tier defaults used by `wade init` (crossby.config.defaults.get_defaults), and EffortLevel all live in crossby; wade's _resolve_models and _suggest_model_for_tool (init_service/config_io.py, prompts_ai.py), ai_resolution.py, and cli/autocomplete.py are thin pass-throughs. Because the pyproject pin uses an exclusive upper bound (e.g. crossby<0.11.0), each new crossby minor needs an explicit pin bump plus a verification pass across those four import sites.
+
+---

{wade_cli-0.35.0 → wade_cli-0.35.3}/KNOWLEDGE.ratings.yml

@@ -36,7 +36,7 @@
   up: 4
 54326c98:
   down: 1
-  stale: 0
+  stale: 1
   up: 0
 6e38b3aa:
   down: 0
@@ -68,6 +68,10 @@ b6a3a637:
   down: 0
   stale: 0
   up: 1
+b6ca74e5:
+  down: 0
+  stale: 0
+  up: 1
 cae0f47a:
   down: 0
   stale: 0

{wade_cli-0.35.0 → wade_cli-0.35.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wade-cli
-Version: 0.35.0
+Version: 0.35.3
 Summary: WADE — Workflow for AI-Driven Engineering
 Project-URL: Homepage, https://github.com/ivanviragine/wade
 Project-URL: Repository, https://github.com/ivanviragine/wade
@@ -16,7 +16,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Version Control :: Git
 Requires-Python: >=3.11
-Requires-Dist: crossby<0.11.0,>=0.10.2
+Requires-Dist: crossby<0.12.0,>=0.11.0
 Requires-Dist: httpx<1.0,>=0.27
 Requires-Dist: pydantic-settings>=2.0
 Requires-Dist: pydantic>=2.0

{wade_cli-0.35.0 → wade_cli-0.35.3}/docs/dev/architecture.md

@@ -127,7 +127,7 @@ src/wade/
 
 ## AI Tool Layer (external: crossby)
 
-AI tool adapters, model/effort resolution primitives, the model registry, and per-tool config (allowlists, hooks, defaults) are **not** part of this repo. They live in the external [`crossby`](https://github.com/ivanviragine/crossby) package, pinned in `pyproject.toml` (`crossby>=0.10.2,<0.11.0`). This replaced wade's formerly-internal `ai_tools/` and parts of `config/` and `data/` (see `feat: replace internal AI tool layer with the crossby dependency (#215)`).
+AI tool adapters, model/effort resolution primitives, the model registry, and per-tool config (allowlists, hooks, defaults) are **not** part of this repo. They live in the external [`crossby`](https://github.com/ivanviragine/crossby) package, pinned in `pyproject.toml` (`crossby>=0.11.0,<0.12.0`). This replaced wade's formerly-internal `ai_tools/` and parts of `config/` and `data/` (see `feat: replace internal AI tool layer with the crossby dependency (#215)`).
 
 | What | Lives in crossby | Used from wade via |
 |------|-------------------|---------------------|

{wade_cli-0.35.0 → wade_cli-0.35.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "wade-cli"
-version = "0.35.0"
+version = "0.35.3"
 description = "WADE — Workflow for AI-Driven Engineering"
 readme = "README.md"
 license = "MIT"
@@ -24,7 +24,7 @@ classifiers = [
     "Topic :: Software Development :: Version Control :: Git",
 ]
 dependencies = [
-    "crossby>=0.10.2,<0.11.0",
+    "crossby>=0.11.0,<0.12.0",
     "typer>=0.12,<0.26",
     "pydantic>=2.0",
     "pydantic-settings>=2.0",

{wade_cli-0.35.0 → wade_cli-0.35.3}/scripts/changelog.py

@@ -66,7 +66,8 @@ def get_tags() -> list[str]:
 def get_commits(commit_range: str) -> list[tuple[str, str]]:
     """Get commits in a range as (subject, hash) pairs.
 
-    Filters out version-bump noise.
+    Filters out version-bump and branch-scaffold noise — both are
+    wade-generated commits that carry no user-facing release content.
     """
     raw = git("log", commit_range, "--pretty=format:%s|%h", "--no-merges")
     if not raw:
@@ -76,7 +77,7 @@ def get_commits(commit_range: str) -> list[tuple[str, str]]:
         if "|" not in line:
             continue
         subject, sha = line.rsplit("|", 1)
-        if subject.startswith("chore: bump version"):
+        if subject.startswith(("chore: bump version", "chore: scaffold branch")):
             continue
         commits.append((subject.strip(), sha.strip()))
     return commits

{wade_cli-0.35.0 → wade_cli-0.35.3}/src/wade/__init__.py

@@ -1,3 +1,3 @@
 """WADE (Workflow for AI-Driven Engineering) — AI-agent-driven git workflow management CLI."""
 
-__version__ = "0.35.0"
+__version__ = "0.35.3"

{wade_cli-0.35.0 → wade_cli-0.35.3}/src/wade/git/repo.py

@@ -186,6 +186,22 @@ def get_current_branch(path: Path) -> str:
     return branch
 
 
+def is_head_attached(path: Path) -> bool:
+    """Check whether HEAD is attached to a branch (i.e. not detached).
+
+    Uses ``git symbolic-ref -q HEAD``: returncode 0 means HEAD points at a
+    branch ref (attached); non-zero means a detached HEAD (or not a repo).
+
+    Args:
+        path: Any directory inside the repo.
+
+    Returns:
+        True if HEAD is on a branch, False if detached or on failure.
+    """
+    result = _run_git("symbolic-ref", "-q", "HEAD", cwd=path, check=False)
+    return result.returncode == 0
+
+
 def detect_main_branch(path: Path) -> str:
     """Detect the main branch name — checks for 'main' then 'master'.
 

{wade_cli-0.35.0 → wade_cli-0.35.3}/src/wade/services/implementation_service/lifecycle.py

@@ -258,6 +258,34 @@ def _merge_pr(
         if not prompts.confirm("Proceed anyway? Uncommitted work will be lost.", default=False):
             return MergeStatus.NOT_MERGED
 
+    # Guard repo_root's HEAD state BEFORE the irreversible merge. `gh pr merge
+    # --delete-branch` runs with cwd=repo_root (the main checkout, a *different*
+    # directory from the worktree) and resolves repo_root's current branch during
+    # its post-merge --delete-branch bookkeeping. If repo_root has a detached HEAD
+    # — e.g. from unrelated manual git activity — gh aborts with "could not
+    # determine current branch", but only AFTER it has already squash-merged the
+    # PR on GitHub, leaving a "merged-on-GitHub-but-reported-failed" state.
+    # Re-attaching to the default branch here (mirroring the post-merge
+    # `git pull` that already targets it) lets us fail fast if we cannot proceed
+    # safely, before any GitHub-side merge happens.
+    if not git_repo.is_head_attached(repo_root):
+        try:
+            default_branch = git_repo.detect_main_branch(repo_root)
+            git_repo.checkout(repo_root, default_branch)
+        except GitError as e:
+            logger.error("repo_root.reattach_failed", error=str(e))
+            console.error(
+                f"Cannot merge: '{repo_root.name}' has a detached HEAD and could "
+                f"not be re-attached to a branch ({e})."
+            )
+            console.hint(
+                f"Check out a branch in {repo_root} "
+                f"(e.g. `git -C {repo_root} checkout main`), then retry the merge."
+            )
+            return MergeStatus.MERGE_FAILED
+        console.step(f"Re-attached {repo_root.name} to '{default_branch}' (was detached).")
+        logger.info("repo_root.reattached", branch=default_branch)
+
     # Detach HEAD in the worktree so git no longer considers the branch
     # "checked out", which unblocks `gh pr merge --delete-branch`.
     if worktree_path and worktree_path.is_dir():

{wade_cli-0.35.0 → wade_cli-0.35.3}/tests/unit/test_git/test_repo.py

@@ -12,6 +12,7 @@ from wade.git.repo import (
     _run_git_with_retry,
     diff_between,
     get_main_worktree_path,
+    is_head_attached,
     stash,
     stash_pop,
 )
@@ -155,3 +156,32 @@ class TestGetMainWorktreePath:
             mock_run.return_value.stdout = "HEAD abc123\nbranch refs/heads/main\n"
             result = get_main_worktree_path(tmp_path)
             assert result is None
+
+
+class TestIsHeadAttached:
+    """Tests for is_head_attached against real temp repos."""
+
+    def test_returns_true_on_attached_branch(self, tmp_git_repo: Path) -> None:
+        # tmp_git_repo has an initial commit and HEAD on a branch.
+        assert is_head_attached(tmp_git_repo) is True
+
+    def test_returns_false_on_detached_head(self, tmp_git_repo: Path) -> None:
+        import subprocess
+
+        subprocess.run(
+            ["git", "checkout", "--detach", "HEAD"],
+            cwd=tmp_git_repo,
+            capture_output=True,
+            check=True,
+        )
+        assert is_head_attached(tmp_git_repo) is False
+
+    def test_returns_false_outside_git_repo(self, tmp_path: Path) -> None:
+        # A real directory with no repo (git symbolic-ref exits non-zero) and a
+        # non-existent path (git invocation raises FileNotFoundError, which
+        # _run_git turns into a synthetic non-zero result) both resolve to
+        # "not attached" rather than raising.
+        non_git = tmp_path / "plain"
+        non_git.mkdir()
+        assert is_head_attached(non_git) is False
+        assert is_head_attached(tmp_path / "does-not-exist") is False

{wade_cli-0.35.0 → wade_cli-0.35.3}/tests/unit/test_services/test_post_implementation_lifecycle.py

@@ -4,14 +4,17 @@ import subprocess
 from pathlib import Path
 from unittest.mock import MagicMock, patch
 
+from wade.git.repo import GitError
 from wade.models.config import AIConfig, ProjectConfig, ProjectSettings
-from wade.models.session import MergeStrategy
+from wade.models.session import MergeStatus, MergeStrategy
 from wade.models.task import Task
 from wade.services.implementation_service import _post_implementation_lifecycle, start
 
 _PULL_FF = "wade.services.implementation_service.lifecycle.git_repo.pull_ff_only"
 _CHECKOUT = "wade.services.implementation_service.lifecycle.git_repo.checkout"
 _CHECKOUT_DETACH = "wade.services.implementation_service.lifecycle.git_repo.checkout_detach"
+_IS_HEAD_ATTACHED = "wade.services.implementation_service.lifecycle.git_repo.is_head_attached"
+_DETECT_MAIN = "wade.services.implementation_service.lifecycle.git_repo.detect_main_branch"
 _MERGE_SQUASH = "wade.services.implementation_service.lifecycle.git_repo.merge_squash"
 _COMMIT_NO_EDIT = "wade.services.implementation_service.lifecycle.git_repo.commit_no_edit"
 _PUSH = "wade.services.implementation_service.lifecycle.git_repo.push"
@@ -24,6 +27,7 @@ def _config(strategy: MergeStrategy) -> ProjectConfig:
     )
 
 
+@patch(_IS_HEAD_ATTACHED, return_value=True)
 @patch(_PULL_FF)
 @patch(_CHECKOUT_DETACH)
 @patch("wade.services.implementation_service.lifecycle.git_worktree.prune_worktrees")
@@ -48,6 +52,7 @@ def test_pr_strategy_prompts_merge_on_existing_pr(
     _mock_prune: MagicMock,
     _mock_checkout_detach: MagicMock,
     mock_pull_ff: MagicMock,
+    _mock_is_head_attached: MagicMock,
     tmp_path: Path,
 ) -> None:
     mock_pull_ff.return_value = MagicMock(returncode=0)
@@ -130,6 +135,7 @@ def test_pr_strategy_user_declines_merge(
     mock_poll.assert_called_once()
 
 
+@patch(_IS_HEAD_ATTACHED, return_value=True)
 @patch(_CHECKOUT)
 @patch("wade.services.implementation_service.lifecycle.git_pr.merge_pr")
 @patch("wade.services.implementation_service.lifecycle.prompts.select", return_value=0)
@@ -146,6 +152,7 @@ def test_pr_strategy_merge_failure_preserves_branch(
     _mock_select: MagicMock,
     mock_merge_pr: MagicMock,
     _mock_checkout: MagicMock,
+    _mock_is_head_attached: MagicMock,
     tmp_path: Path,
 ) -> None:
     provider = MagicMock()
@@ -165,6 +172,7 @@ def test_pr_strategy_merge_failure_preserves_branch(
     mock_merge_pr.assert_called_once()
 
 
+@patch(_IS_HEAD_ATTACHED, return_value=True)
 @patch(_CHECKOUT)
 @patch(_CHECKOUT_DETACH)
 @patch("wade.services.implementation_service.lifecycle.git_pr.merge_pr")
@@ -185,6 +193,7 @@ def test_pr_strategy_merge_failure_restores_branch(
     mock_merge_pr: MagicMock,
     _mock_checkout_detach: MagicMock,
     mock_checkout: MagicMock,
+    _mock_is_head_attached: MagicMock,
     tmp_path: Path,
 ) -> None:
     """On merge failure, HEAD should be restored from detached state to the branch."""
@@ -207,6 +216,7 @@ def test_pr_strategy_merge_failure_restores_branch(
     mock_checkout.assert_called_once_with(wt_path, "feat/42-test")
 
 
+@patch(_IS_HEAD_ATTACHED, return_value=True)
 @patch(_PULL_FF)
 @patch(_CHECKOUT_DETACH)
 @patch("wade.services.implementation_service.lifecycle.git_worktree.prune_worktrees")
@@ -231,6 +241,7 @@ def test_pr_strategy_cleanup_and_pull_after_merge(
     _mock_prune: MagicMock,
     _mock_checkout_detach: MagicMock,
     mock_pull_ff: MagicMock,
+    _mock_is_head_attached: MagicMock,
     tmp_path: Path,
 ) -> None:
     mock_pull_ff.return_value = MagicMock(returncode=0)
@@ -249,6 +260,202 @@ def test_pr_strategy_cleanup_and_pull_after_merge(
     mock_pull_ff.assert_called_once_with(repo_root)
 
 
+@patch(_PULL_FF)
+@patch(_CHECKOUT_DETACH)
+@patch(_CHECKOUT)
+@patch(_DETECT_MAIN, return_value="main")
+@patch(_IS_HEAD_ATTACHED, return_value=False)
+@patch("wade.services.implementation_service.lifecycle.git_worktree.prune_worktrees")
+@patch("wade.services.implementation_service.lifecycle.git_worktree.remove_worktree")
+@patch("wade.services.implementation_service.lifecycle.git_pr.merge_pr")
+@patch("wade.services.implementation_service.lifecycle.git_repo.is_clean", return_value=True)
+@patch("wade.services.implementation_service.lifecycle.prompts.select", return_value=0)
+@patch("wade.services.implementation_service.lifecycle.prompts.confirm", return_value=True)
+@patch("wade.services.implementation_service.lifecycle.webbrowser.open")
+@patch(
+    "wade.services.implementation_service.lifecycle.git_pr.get_pr_for_branch",
+    return_value={"number": 99, "url": "https://example/pr/99"},
+)
+def test_pr_strategy_detached_repo_root_reattaches_then_merges(
+    _mock_get_pr: MagicMock,
+    _mock_webbrowser_open: MagicMock,
+    _mock_confirm: MagicMock,
+    _mock_select: MagicMock,
+    _mock_is_clean: MagicMock,
+    mock_merge_pr: MagicMock,
+    mock_remove_worktree: MagicMock,
+    _mock_prune: MagicMock,
+    _mock_is_head_attached: MagicMock,
+    mock_detect_main: MagicMock,
+    mock_checkout: MagicMock,
+    _mock_checkout_detach: MagicMock,
+    mock_pull_ff: MagicMock,
+    tmp_path: Path,
+) -> None:
+    """Detached repo_root HEAD is re-attached before the merge, then merge proceeds."""
+    mock_pull_ff.return_value = MagicMock(returncode=0)
+    provider = MagicMock()
+    repo_root = tmp_path / "repo"
+    wt_path = tmp_path / "wt"
+    wt_path.mkdir()
+
+    with patch("wade.services.implementation_service.lifecycle.prompts.is_tty", return_value=True):
+        status = _post_implementation_lifecycle(
+            repo_root, "feat/42-test", 42, wt_path, _config(MergeStrategy.PR), provider
+        )
+
+    # Re-attached repo_root to the detected default branch BEFORE merging.
+    mock_detect_main.assert_called_once_with(repo_root)
+    mock_checkout.assert_called_once_with(repo_root, "main")
+    # Merge and normal cleanup still ran.
+    mock_merge_pr.assert_called_once_with(repo_root=repo_root, pr_number=99, strategy="squash")
+    mock_remove_worktree.assert_called_once_with(repo_root, wt_path)
+    mock_pull_ff.assert_called_once_with(repo_root)
+    assert status == MergeStatus.MERGED
+
+
+@patch(_CHECKOUT_DETACH)
+@patch(_CHECKOUT)
+@patch(_DETECT_MAIN, side_effect=GitError("Neither 'main' nor 'master' branch found"))
+@patch(_IS_HEAD_ATTACHED, return_value=False)
+@patch("wade.services.implementation_service.lifecycle.git_pr.merge_pr")
+@patch("wade.services.implementation_service.lifecycle.git_repo.is_clean", return_value=True)
+@patch("wade.services.implementation_service.lifecycle.prompts.select", return_value=0)
+@patch("wade.services.implementation_service.lifecycle.prompts.confirm", return_value=True)
+@patch("wade.services.implementation_service.lifecycle.webbrowser.open")
+@patch(
+    "wade.services.implementation_service.lifecycle.git_pr.get_pr_for_branch",
+    return_value={"number": 99, "url": "https://example/pr/99"},
+)
+def test_pr_strategy_detached_repo_root_detect_fails_no_merge(
+    _mock_get_pr: MagicMock,
+    _mock_webbrowser_open: MagicMock,
+    _mock_confirm: MagicMock,
+    _mock_select: MagicMock,
+    _mock_is_clean: MagicMock,
+    mock_merge_pr: MagicMock,
+    _mock_is_head_attached: MagicMock,
+    _mock_detect_main: MagicMock,
+    mock_checkout: MagicMock,
+    mock_checkout_detach: MagicMock,
+    tmp_path: Path,
+) -> None:
+    """When re-attach detection fails (no main/master), fail fast without merging."""
+    provider = MagicMock()
+    repo_root = tmp_path / "repo"
+    wt_path = tmp_path / "wt"
+    wt_path.mkdir()
+
+    with patch("wade.services.implementation_service.lifecycle.prompts.is_tty", return_value=True):
+        status = _post_implementation_lifecycle(
+            repo_root, "feat/42-test", 42, wt_path, _config(MergeStrategy.PR), provider
+        )
+
+    # No GitHub-side merge and the worktree is left untouched (never detached).
+    mock_merge_pr.assert_not_called()
+    mock_checkout.assert_not_called()
+    mock_checkout_detach.assert_not_called()
+    provider.close_task.assert_not_called()
+    assert status == MergeStatus.MERGE_FAILED
+
+
+@patch(_CHECKOUT_DETACH)
+@patch(_DETECT_MAIN, return_value="main")
+@patch(_IS_HEAD_ATTACHED, return_value=False)
+@patch("wade.services.implementation_service.lifecycle.git_pr.merge_pr")
+@patch("wade.services.implementation_service.lifecycle.git_repo.is_clean", return_value=True)
+@patch("wade.services.implementation_service.lifecycle.prompts.select", return_value=0)
+@patch("wade.services.implementation_service.lifecycle.prompts.confirm", return_value=True)
+@patch("wade.services.implementation_service.lifecycle.webbrowser.open")
+@patch(
+    "wade.services.implementation_service.lifecycle.git_pr.get_pr_for_branch",
+    return_value={"number": 99, "url": "https://example/pr/99"},
+)
+def test_pr_strategy_detached_repo_root_checkout_fails_no_merge(
+    _mock_get_pr: MagicMock,
+    _mock_webbrowser_open: MagicMock,
+    _mock_confirm: MagicMock,
+    _mock_select: MagicMock,
+    _mock_is_clean: MagicMock,
+    mock_merge_pr: MagicMock,
+    _mock_is_head_attached: MagicMock,
+    _mock_detect_main: MagicMock,
+    mock_checkout_detach: MagicMock,
+    tmp_path: Path,
+) -> None:
+    """When re-attach checkout is refused (e.g. conflicting changes), fail fast."""
+    provider = MagicMock()
+    repo_root = tmp_path / "repo"
+    wt_path = tmp_path / "wt"
+    wt_path.mkdir()
+
+    checkout_target = "wade.services.implementation_service.lifecycle.git_repo.checkout"
+    with (
+        patch(checkout_target, side_effect=GitError("checkout refused: local changes")),
+        patch("wade.services.implementation_service.lifecycle.prompts.is_tty", return_value=True),
+    ):
+        status = _post_implementation_lifecycle(
+            repo_root, "feat/42-test", 42, wt_path, _config(MergeStrategy.PR), provider
+        )
+
+    # Re-attach checkout raised → no merge, worktree never detached.
+    mock_merge_pr.assert_not_called()
+    mock_checkout_detach.assert_not_called()
+    provider.close_task.assert_not_called()
+    assert status == MergeStatus.MERGE_FAILED
+
+
+@patch(_PULL_FF)
+@patch(_CHECKOUT_DETACH)
+@patch(_CHECKOUT)
+@patch(_DETECT_MAIN)
+@patch(_IS_HEAD_ATTACHED, return_value=True)
+@patch("wade.services.implementation_service.lifecycle.git_worktree.prune_worktrees")
+@patch("wade.services.implementation_service.lifecycle.git_worktree.remove_worktree")
+@patch("wade.services.implementation_service.lifecycle.git_pr.merge_pr")
+@patch("wade.services.implementation_service.lifecycle.git_repo.is_clean", return_value=True)
+@patch("wade.services.implementation_service.lifecycle.prompts.select", return_value=0)
+@patch("wade.services.implementation_service.lifecycle.prompts.confirm", return_value=True)
+@patch("wade.services.implementation_service.lifecycle.webbrowser.open")
+@patch(
+    "wade.services.implementation_service.lifecycle.git_pr.get_pr_for_branch",
+    return_value={"number": 99, "url": "https://example/pr/99"},
+)
+def test_pr_strategy_attached_repo_root_skips_reattach(
+    _mock_get_pr: MagicMock,
+    _mock_webbrowser_open: MagicMock,
+    _mock_confirm: MagicMock,
+    _mock_select: MagicMock,
+    _mock_is_clean: MagicMock,
+    mock_merge_pr: MagicMock,
+    _mock_remove_worktree: MagicMock,
+    _mock_prune: MagicMock,
+    _mock_is_head_attached: MagicMock,
+    mock_detect_main: MagicMock,
+    mock_checkout: MagicMock,
+    _mock_checkout_detach: MagicMock,
+    mock_pull_ff: MagicMock,
+    tmp_path: Path,
+) -> None:
+    """Attached repo_root HEAD: no detection, no re-attach checkout — happy path intact."""
+    mock_pull_ff.return_value = MagicMock(returncode=0)
+    provider = MagicMock()
+    repo_root = tmp_path / "repo"
+    wt_path = tmp_path / "wt"
+    wt_path.mkdir()
+
+    with patch("wade.services.implementation_service.lifecycle.prompts.is_tty", return_value=True):
+        status = _post_implementation_lifecycle(
+            repo_root, "feat/42-test", 42, wt_path, _config(MergeStrategy.PR), provider
+        )
+
+    # Attached: never detected the default branch, never re-attached via checkout.
+    mock_detect_main.assert_not_called()
+    mock_checkout.assert_not_called()
+    mock_merge_pr.assert_called_once_with(repo_root=repo_root, pr_number=99, strategy="squash")
+    assert status == MergeStatus.MERGED
+
+
 @patch("wade.services.implementation_service.lifecycle.prompts.confirm", return_value=False)
 @patch("wade.services.implementation_service.lifecycle.git_branch.commits_ahead", return_value=0)
 def test_direct_strategy_zero_ahead_offers_delete(