diff --git a/internal/actions/rename.go b/internal/actions/rename.go
index 5e28f7d8..b62bca66 100644
--- a/internal/actions/rename.go
+++ b/internal/actions/rename.go
@@ -6,7 +6,6 @@ import (
 	"github.com/getstackit/stackit/internal/actions/validation"
 	"github.com/getstackit/stackit/internal/app"
 	"github.com/getstackit/stackit/internal/output"
-	"github.com/getstackit/stackit/internal/tui"
 	"github.com/getstackit/stackit/internal/utils"
 )
 
@@ -16,8 +15,18 @@ type RenameOptions struct {
 	Force bool
 }
 
+// RenameHandler supplies a new branch name interactively when one is not given
+// on the command line. The CLI adapter implements it; the action layer does not
+// import the TUI.
+type RenameHandler interface {
+	// PromptNewName asks the user for a new branch name, given the current one.
+	// Implementations should return an error when prompting is not possible
+	// (e.g. non-interactive mode).
+	PromptNewName(currentName string) (string, error)
+}
+
 // RenameAction renames the current branch and updates metadata
-func RenameAction(ctx *app.Context, opts RenameOptions) error {
+func RenameAction(ctx *app.Context, opts RenameOptions, handler RenameHandler) error {
 	eng := ctx.Engine
 	out := ctx.Output
 
@@ -29,12 +38,8 @@ func RenameAction(ctx *app.Context, opts RenameOptions) error {
 
 	newName := opts.NewName
 	if newName == "" {
-		if !utils.IsInteractive() {
-			return fmt.Errorf("branch name is required in non-interactive mode")
-		}
-
 		var err error
-		newName, err = tui.PromptTextInput("Enter new branch name:", currentBranch)
+		newName, err = handler.PromptNewName(currentBranch)
 		if err != nil {
 			return err
 		}
diff --git a/internal/actions/restack.go b/internal/actions/restack.go
index 0e30fb52..f9e85bbb 100644
--- a/internal/actions/restack.go
+++ b/internal/actions/restack.go
@@ -11,7 +11,6 @@ import (
 	"github.com/getstackit/stackit/internal/engine"
 	"github.com/getstackit/stackit/internal/handlers"
 	"github.com/getstackit/stackit/internal/rerere"
-	"github.com/getstackit/stackit/internal/tui"
 	"github.com/getstackit/stackit/internal/utils"
 )
 
@@ -154,7 +153,7 @@ func RestackAction(ctx *app.Context, plan *RestackPlan, handler handlers.Restack
 		handler = &handlers.NullRestackHandler{}
 	}
 
-	interactiveRererePrompt := ctx.Interactive && !ctx.Quiet && tui.IsTTY()
+	interactiveRererePrompt := ctx.Interactive && !ctx.Quiet && utils.IsTTY()
 	if _, jsonOutput := handler.(*handlers.JSONRestackHandler); jsonOutput {
 		interactiveRererePrompt = false
 	}
diff --git a/internal/cli/branch/rename.go b/internal/cli/branch/rename.go
index 7b86beac..db9f9d49 100644
--- a/internal/cli/branch/rename.go
+++ b/internal/cli/branch/rename.go
@@ -1,13 +1,29 @@
 package branch
 
 import (
+	"fmt"
+
 	"github.com/spf13/cobra"
 
 	"github.com/getstackit/stackit/internal/actions"
 	"github.com/getstackit/stackit/internal/app"
 	"github.com/getstackit/stackit/internal/cli/common"
+	"github.com/getstackit/stackit/internal/tui"
+	"github.com/getstackit/stackit/internal/utils"
 )
 
+// renameHandler prompts for a new branch name via the TUI when running
+// interactively, and reports that a name is required otherwise. It keeps the
+// TUI dependency in the CLI adapter, out of the action layer.
+type renameHandler struct{}
+
+func (renameHandler) PromptNewName(currentName string) (string, error) {
+	if !utils.IsInteractive() {
+		return "", fmt.Errorf("branch name is required in non-interactive mode")
+	}
+	return tui.PromptTextInput("Enter new branch name:", currentName)
+}
+
 // NewRenameCmd creates the rename command
 func NewRenameCmd() *cobra.Command {
 	var (
@@ -35,7 +51,7 @@ Note that this removes any association to a pull request, as GitHub pull request
 					Force: force,
 				}
 
-				return actions.RenameAction(ctx, opts)
+				return actions.RenameAction(ctx, opts, renameHandler{})
 			})
 		},
 	}
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://patch-diff.githubusercontent.com/raw/getstackit/stackit/pull/1164.diff">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://patch-diff.githubusercontent.com/raw/getstackit/stackit/pull/1164.diff" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>