diff --git a/CLAUDE.md b/CLAUDE.md
index 6d41a010..e9b244e6 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -109,13 +109,17 @@ Issue prefix: `gt-`
 
 ```
 [ ] git status              (check for uncommitted changes)
-[ ] git push                (push any commits)
+[ ] git add && git commit   (commit any changes)
 [ ] bd sync                 (sync beads changes)
-[ ] Check inbox             (any messages needing response?)
-[ ] HANDOFF if incomplete:
-    gt mail send gastown/crew/joe -s "🤝 HANDOFF: ..." -m "..."
+[ ] git push                (push to remote - CRITICAL)
+[ ] gt handoff              (hand off to fresh session)
+    # Or with context: gt handoff -s "Brief" -m "Details"
 ```
 
+**Why `gt handoff`?** This is the canonical way to end your session. It handles
+everything: sends handoff mail, respawns with fresh context, and your work
+continues from where you left off via your pinned molecule.
+
 Crew member: joe
 Rig: gastown
 Working directory: /Users/stevey/gt/gastown/crew/joe
diff --git a/internal/cmd/handoff.go b/internal/cmd/handoff.go
index 26b4149b..558b352c 100644
--- a/internal/cmd/handoff.go
+++ b/internal/cmd/handoff.go
@@ -17,19 +17,22 @@ var handoffCmd = &cobra.Command{
 	Short: "Hand off to a fresh session, work continues from hook",
 	Long: `End watch. Hand off to a fresh agent session.
 
-This command uses tmux respawn-pane to end the current session and restart it
-with a fresh Claude instance, running the full startup/priming sequence.
+This is the canonical way to end any agent session. It handles all roles:
+
+  - Mayor, Crew, Witness, Refinery, Deacon: Respawns with fresh Claude instance
+  - Polecats: Calls 'gt done --exit DEFERRED' (Witness handles lifecycle)
 
 When run without arguments, hands off the current session.
 When given a role name, hands off that role's session (and switches to it).
 
 Examples:
-  gt handoff           # Hand off current session
-  gt handoff crew      # Hand off crew session (auto-detect name)
-  gt handoff mayor     # Hand off mayor session
-  gt handoff witness   # Hand off witness session for current rig
+  gt handoff                          # Hand off current session
+  gt handoff -s "Context" -m "Notes"  # Hand off with custom message
+  gt handoff crew                     # Hand off crew session
+  gt handoff mayor                    # Hand off mayor session
 
-Any molecule on the hook will be auto-continued by the new session.`,
+Any molecule on the hook will be auto-continued by the new session.
+The SessionStart hook runs 'gt prime' to restore context.`,
 	RunE: runHandoff,
 }
 
@@ -49,6 +52,19 @@ func init() {
 }
 
 func runHandoff(cmd *cobra.Command, args []string) error {
+	// Check if we're a polecat - polecats use gt done instead
+	// GT_POLECAT is set by the session manager when starting polecat sessions
+	if polecatName := os.Getenv("GT_POLECAT"); polecatName != "" {
+		fmt.Printf("%s Polecat detected (%s) - using gt done for handoff\n",
+			style.Bold.Render("🐾"), polecatName)
+		// Polecats don't respawn themselves - Witness handles lifecycle
+		// Call gt done with DEFERRED exit type to preserve work state
+		doneCmd := exec.Command("gt", "done", "--exit", "DEFERRED")
+		doneCmd.Stdout = os.Stdout
+		doneCmd.Stderr = os.Stderr
+		return doneCmd.Run()
+	}
+
 	t := tmux.NewTmux()
 
 	// Verify we're in tmux