fix(session): repaint switched session after CNS

commit: 488efa266beebd093bdde9b797019d3300130bd1
author: brice · 3mo ago · 2026-07-03 16:23 UTC
parent: b60ef98
signature: GPG VerifiedCD88F9E564E0102646FB6077A1A07C7C7C3E349D · arch-gpg Verified for the committer email

2 files · +11 -4

M internal/usecase/daemon/palette_test.go +8 -3


@@ -61,8 +61,12 @@ func TestPaletteCNSPromptsForSessionNameThenCreatesAndSwitches(t *testing.T) {
61	61		require.Contains(t, string(promptOutput.Data), "Create session")
62	62
63	63		d.handleInput(sess, ac, []byte("scratch\r"))
64		-	repaint := awaitFrame(t, sends, ports.MsgOutput)
65		-	repaintOutput, err := ports.UnmarshalOutput(repaint.Payload)
	64	+	// The submit first paints the newly attached session while the prompt is
	65	+	// still open, then handlePromptInput closes the prompt and repaints the
	66	+	// client's current session. The final frame must be for the new session.
	67	+	awaitFrame(t, sends, ports.MsgOutput)
	68	+	finalRepaint := awaitFrame(t, sends, ports.MsgOutput)
	69	+	finalOutput, err := ports.UnmarshalOutput(finalRepaint.Payload)
66	70		require.NoError(t, err)
67	71		require.False(t, ac.promptActive())
68	72		require.Equal(t, 2, sessionCount(d))

@@ -73,7 +77,8 @@ func TestPaletteCNSPromptsForSessionNameThenCreatesAndSwitches(t *testing.T) {
73	77		require.Equal(t, "scratch", newSess.name)
74	78		require.False(t, newSess.ephemeral)
75	79		require.Same(t, ac, newSess.client)
76		-	require.Contains(t, string(repaintOutput.Data), "scratch")
	80	+	require.Contains(t, string(finalOutput.Data), "scratch")
	81	+	require.NotContains(t, string(finalOutput.Data), "Create session")
77	82		}
78	83
79	84		func TestPaletteCommandNoopRepaintsAfterClose(t *testing.T) {

 	require.Contains(t, string(promptOutput.Data), "Create session")
 	d.handleInput(sess, ac, []byte("scratch\r"))
-	repaint := awaitFrame(t, sends, ports.MsgOutput)
+	// The submit first paints the newly attached session while the prompt is
-	repaintOutput, err := ports.UnmarshalOutput(repaint.Payload)
+	// still open, then handlePromptInput closes the prompt and repaints the
+	// client's current session. The final frame must be for the new session.
+	awaitFrame(t, sends, ports.MsgOutput)
+	finalRepaint := awaitFrame(t, sends, ports.MsgOutput)
+	finalOutput, err := ports.UnmarshalOutput(finalRepaint.Payload)
 	require.NoError(t, err)
 	require.False(t, ac.promptActive())
 	require.Equal(t, 2, sessionCount(d))
 	require.Equal(t, "scratch", newSess.name)
 	require.False(t, newSess.ephemeral)
 	require.Same(t, ac, newSess.client)
-	require.Contains(t, string(repaintOutput.Data), "scratch")
+	require.Contains(t, string(finalOutput.Data), "scratch")
+	require.NotContains(t, string(finalOutput.Data), "Create session")
 }
 func TestPaletteCommandNoopRepaintsAfterClose(t *testing.T) {

M internal/usecase/daemon/prompt.go +3 -1


@@ -79,7 +79,9 @@ func (d Daemon) handlePromptInput(ac attachedClient, data []byte) {
79	79		return
80	80		}
81	81		d.closePrompt(ac)
82		-	d.paint(sess, ac, true)
	82	+	if current := ac.currentSession(); current != nil {
	83	+	d.paint(current, ac, true)
	84	+	}
83	85		return
84	86		}
85	87		if exit {

 			return
 		}
 		d.closePrompt(ac)
-		d.paint(sess, ac, true)
+		if current := ac.currentSession(); current != nil {
+			d.paint(current, ac, true)
+		}
 		return
 	}
 	if exit {