Fix release recovery instructions showing placeholder branch names (#5)

* Fix release recovery instructions showing placeholder branch names

When a release fails during the push_branch step, recovery
instructions showed 'git push origin <branch>:<branch>' instead of
the actual branch name. Extract branch resolution logic into a new
get_push_branch_info() function that returns push info without
executing, allowing the step tracker to display accurate commands.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

* Add changelog entry for branch name display fix

Resolves: #5

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

* Format utils.py with ruff

---------

Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>

Author: mavam

changelog/unreleased/release-recovery-instructions-show-actual-branch-name.md

@@ -0,0 +1,25 @@
+---
+title: Release recovery instructions show actual branch name
+type: bugfix
+authors:
+  - mavam
+  - claude
+pr: 5
+created: 2026-01-22T19:01:49.721973Z
+---
+
+When a release fails during the branch push step, the recovery instructions now
+display the actual branch name instead of a placeholder:
+
+```
+╭──────────────────── Release Progress (2/5) ────────────────────╮
+│ ✔ git commit -m "Release v1.2.0"                               │
+│ ✔ git tag -a v1.2.0 -m "Release v1.2.0"                        │
+│ ✘ git push origin main:main                                    │
+│ ○ git push origin v1.2.0                                       │
+│ ○ gh release create v1.2.0 --repo tenzir/ship ...              │
+╰────────────────────────────────────────────────────────────────╯
+```
+
+Previously, the failed step showed `git push origin <branch>:<branch>` instead
+of the actual branch name.

src/tenzir_ship/cli/_release.py

@@ -34,6 +34,7 @@
     create_git_commit,
     emit_output,
     format_bold,
+    get_push_branch_info,
     has_staged_changes,
     log_info,
     log_success,
@@ -573,10 +574,22 @@ def publish_release(
     tracker = StepTracker()
     if create_commit:
         tracker.add("commit", f'git commit -m "{final_commit_message}"')
+
+    # Get branch info early for accurate step tracking display
+    push_remote: str | None = None
+    push_remote_ref: str | None = None
+    push_branch: str | None = None
     if create_tag:
+        try:
+            push_remote, push_remote_ref, push_branch = get_push_branch_info(
+                project_root, config.repository
+            )
+        except RuntimeError as exc:
+            raise click.ClickException(str(exc)) from exc
+
         tracker.add("tag", f'git tag -a {manifest.version} -m "Release {manifest.version}"')
-        tracker.add("push_branch", "git push origin <branch>:<branch>")
-        tracker.add("push_tag", f"git push origin {manifest.version}")
+        tracker.add("push_branch", f"git push {push_remote} {push_branch}:{push_remote_ref}")
+        tracker.add("push_tag", f"git push {push_remote} {manifest.version}")
     tracker.add("publish", f"gh release create {manifest.version} --repo {config.repository} ...")
 
     def _fail_step_and_raise(step_name: str, exc: Exception) -> NoReturn:
@@ -609,13 +622,11 @@ def _fail_step_and_raise(step_name: str, exc: Exception) -> NoReturn:
             log_warning(f"git tag {manifest.version} already exists; skipping creation.")
 
         try:
-            branch_remote, branch_remote_ref, branch_name = push_current_branch(
-                project_root, config.repository
-            )
+            push_current_branch(project_root, config.repository)
         except RuntimeError as exc:
             _fail_step_and_raise("push_branch", exc)
         tracker.complete("push_branch")
-        log_success(f"pushed branch {branch_name} to remote {branch_remote}/{branch_remote_ref}.")
+        log_success(f"pushed branch {push_branch} to remote {push_remote}/{push_remote_ref}.")
 
         try:
             remote_name = push_git_tag(project_root, manifest.version, config.repository)

src/tenzir_ship/utils.py

@@ -548,6 +548,25 @@ def _upstream_branch(project_root: Path) -> Optional[tuple[str, str]]:
     return remote_name, branch_name
 
 
+def get_push_branch_info(project_root: Path, repository: str | None = None) -> tuple[str, str, str]:
+    """Return push branch info (remote, remote_ref, branch) without executing.
+
+    Raises RuntimeError if HEAD is detached.
+    """
+    branch = _current_branch(project_root)
+    if not branch:
+        raise RuntimeError("cannot determine current branch because HEAD is detached.")
+
+    upstream = _upstream_branch(project_root)
+    if upstream:
+        remote_name, remote_branch = upstream
+    else:
+        remote_name = _select_remote_name(project_root, repository)
+        remote_branch = branch
+
+    return remote_name, remote_branch, branch
+
+
 def push_current_branch(project_root: Path, repository: str | None = None) -> tuple[str, str, str]:
     """Push the current branch to its upstream (or configured) remote."""
     branch = _current_branch(project_root)