fix(tui): keep enter-during-cancel from re-queueing drafts

submit() while status is cancelling leaves the restored draft in the
textarea so sendQueued cannot fire it into the cancelled session.

Co-authored-by: admin <admin@21no.de>

Author: cursoragent

internal/tui/input.go

@@ -237,6 +237,13 @@ func (m *Model) submit() tea.Cmd {
 		return m.noticeSweep()
 	}
 	if m.busy {
+		if m.status == "cancelling" {
+			// cancelRun handed the queue back to the input so it would
+			// not fire into the cancelled session. Re-queueing here
+			// would sendQueued it on the trailing done anyway.
+			m.refresh()
+			return m.transientNoteCmd("cancelling — draft stays in the input")
+		}
 		// Queue mid-turn prompts instead of dropping them; the queue drains
 		// automatically when the running turn ends. Acknowledge the hold —
 		// the input clearing silently reads as a lost message (same

internal/tui/promptflow_test.go

@@ -381,6 +381,37 @@ func TestCancelRestoresQueue(t *testing.T) {
 	}
 }
 
+// Enter while cancelling must not re-queue the restored draft — that
+// would sendQueued it into the session the cancel just pulled it out of.
+func TestCancelEnterDoesNotRequeue(t *testing.T) {
+	m := newTestModel()
+	busyTurn(m)
+	m.sessionID = "s1"
+	m.queue = []string{"one", "two"}
+
+	m.Update(key("esc"))
+	m.Update(key("y"))
+	if m.status != "cancelling" {
+		t.Fatalf("precondition: status = %q, want cancelling", m.status)
+	}
+	if got := m.ta.Value(); got != "one\ntwo" {
+		t.Fatalf("precondition: input = %q", got)
+	}
+
+	m.Update(key("enter"))
+	if len(m.queue) != 0 {
+		t.Fatalf("enter while cancelling re-queued: %v", m.queue)
+	}
+	if got := m.ta.Value(); got != "one\ntwo" {
+		t.Errorf("draft must stay in the input, got %q", got)
+	}
+
+	m.handleEvent(client.Event{Type: "done", Latency: 1})
+	if len(m.msgs) != 2 {
+		t.Error("no turn should start after enter-during-cancel")
+	}
+}
+
 // TestSendFailureFinalizesTurn verifies a failed send closes out the phantom
 // assistant turn sendPrompt opened, with the error inline in the transcript.
 func TestSendFailureFinalizesTurn(t *testing.T) {