fix: cli command output consistency

[peyton-alt]

• Consistent output across clean, reset, rewind, resume, trail, doctor,
  and status — cancellation messages, success prefixes (✓), branch name
  formatting, indentation, and full session ID display

  • Moved Note: advisory in trail from stderr to stdout to match rewind
  • Consolidated three redundant form cancellation helpers
    (handleResetConfirmationError, handleResetDecline,
    handleTrailInteractionError) into a single handleFormCancellation in utils.go
  • Extracted printSessionCommand helper to replace duplicate 6-case and 4-case
    switches in rewind.go and resume.go

  Test plan

  • Unit tests updated for all output string changes
  • Integration tests updated for resume session header rename (Session: →
    Restored session)
  • TestHandleFormCancellation table test covers all cancellation paths
  • TestPrintMultiSessionResumeCommands_SingleSessionHasCheckmark covers new
    rewind ✓ header

[cursor]

PR Summary

Medium Risk
Touches multiple CLI commands and strategy APIs, changing stdout/stderr routing and adding an interactive deletion prompt; behavioral changes could impact scripting and user expectations around destructive operations.

Overview
Improves CLI output consistency by routing messages through Cobra’s OutOrStdout/ErrOrStderr and standardizing success messaging with ✓ across resume, rewind, doctor, reset, and trail.

Changes clean from a pure dry-run-by-default flow to preview + interactive confirmation before deletion (with --force skipping prompts), and refines deletion reporting (singular/plural grammar via itemWord, updated formatting).

Updates strategy method signatures (Reset, ResetSession, Rewind, RestoreLogsOnly, and PromptOverwriteNewerLogs) to accept output writers, and adjusts/extends tests to avoid TTY prompts and validate the new output text.

^{Written by Cursor Bugbot for commit c375949. Configure here.}

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Autofix Details

Bugbot Autofix prepared a fix for the issue found in the latest run.

• ✅ Fixed: Stale "Run with --force" message before interactive prompt
  • Removed the stale 'Run with --force to delete these items.' message from the preview path in runCleanWithItems, since the interactive confirmation prompt now handles user consent.

Or push these changes by commenting:

@cursor push 25546e5f38

Preview (25546e5f38)

diff --git a/cmd/entire/cli/clean.go b/cmd/entire/cli/clean.go
--- a/cmd/entire/cli/clean.go
+++ b/cmd/entire/cli/clean.go
@@ -246,7 +246,6 @@
 			fmt.Fprintln(w)
 		}
 
-		fmt.Fprintln(w, "Run with --force to delete these items.")
 		return nil
 	}
 

diff --git a/cmd/entire/cli/clean_test.go b/cmd/entire/cli/clean_test.go
--- a/cmd/entire/cli/clean_test.go
+++ b/cmd/entire/cli/clean_test.go
@@ -143,9 +143,9 @@
 		t.Errorf("Should not list '%s', got: %s", paths.MetadataBranchName, output)
 	}
 
-	// Should prompt to use --force
-	if !strings.Contains(output, "--force") {
-		t.Errorf("Expected '--force' prompt in output, got: %s", output)
+	// Should NOT contain stale --force message (interactive prompt handles confirmation)
+	if strings.Contains(output, "--force") {
+		t.Errorf("Should not contain '--force' message in interactive mode, got: %s", output)
 	}
 
 	// Branches should still exist (preview mode doesn't delete)

_{This Bugbot Autofix run was free. To enable autofix for future PRs, go to the Cursor dashboard.}

[Copilot]

Pull request overview

This PR adjusts the entire clean command’s user-facing output formatting (including pluralization and success markers) and updates tests accordingly, while also changing the default command flow to preview + interactive confirmation before deletion.

Changes:

• Update clean output formatting (✓ prefix, indentation tweaks, singular/plural “item(s)”).
• Change clean default behavior to show preview and then prompt for confirmation (with --force skipping the prompt).
• Refactor tests to call runClean with a cobra.Command (captured stdout) and to validate updated messages.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 6 comments.

File	Description
cmd/entire/cli/clean.go	Adds confirmation flow, revises preview/deletion output strings and pluralization logic.
cmd/entire/cli/clean_test.go	Updates tests to match new output format and to invoke runClean via a test cobra command.

[peyton-alt]

@BugBot review

[cursor]

✅ Bugbot reviewed your changes and found no new issues!

Comment @cursor review or bugbot run to trigger another review on this PR