7f0463c fix(daemon): republish synchronized completion · vev-vt

M internal/usecase/daemon/render.go +5 -3


@@ -186,9 +186,11 @@ func (d Daemon) ptyReader(sess session, tb tab, p pane) {
186	186		rc.invalidate(renderInvalidation{class: invalidateOutput, producer: "render.go"})
187	187		}
188	188		} else if syncEnded && renderable {
189		-	// State removal happened under pane.mu; only the external wake is
190		-	// deferred until after unlock to preserve lock order.
191		-	rc.fireCurrent(false)
	189	+	// State removal happened under pane.mu. Publish a new urgent
	190	+	// completion after unlock: detach/replace may have cleared the
	191	+	// pending batch work, so fireCurrent alone could not wake a
	192	+	// headless picker preview or replacement attachment.
	193	+	rc.invalidate(renderInvalidation{class: invalidateUrgent, producer: "render.go"})
192	194		}
193	195		}
194	196		if completeSyncRead && renderable {

 							rc.invalidate(renderInvalidation{class: invalidateOutput, producer: "render.go"})
 						}
 					} else if syncEnded && renderable {
-						// State removal happened under pane.mu; only the external wake is
+						// State removal happened under pane.mu. Publish a new urgent
-						// deferred until after unlock to preserve lock order.
+						// completion after unlock: detach/replace may have cleared the
-						rc.fireCurrent(false)
+						// pending batch work, so fireCurrent alone could not wake a
+						// headless picker preview or replacement attachment.
+						rc.invalidate(renderInvalidation{class: invalidateUrgent, producer: "render.go"})
 					}
 				}
 				if completeSyncRead && renderable {

M internal/usecase/daemon/render_coordinator.go +4 -1


@@ -272,7 +272,10 @@ func (c renderCoordinator) invalidateForAttachment(source attachedClient, inv
272	272		c.pendingUrgent = c.pendingUrgent \|\| inv.class == invalidateUrgent
273	273		c.pendingPreview = c.pendingPreview \|\| c.previewWake != nil \|\| len(c.previewWakes) != 0
274	274		c.coalesced++
275		-	arm := !wasPending \|\| (!wasUrgent && c.pendingUrgent) \|\| (!wasPreviewPending && c.pendingPreview)
	275	+	// A deadline may have expired while synchronized output still gated the
	276	+	// pending work. Completion republishes urgently and must reserve a fresh
	277	+	// deadline rather than leaving that already-fired timer as the only arm.
	278	+	arm := !wasPending \|\| (!wasUrgent && c.pendingUrgent) \|\| (!wasPreviewPending && c.pendingPreview) \|\| c.deadlineDue
276	279		var old ports.Timer
277	280		if arm {
278	281		c.generation++

 	c.pendingUrgent = c.pendingUrgent || inv.class == invalidateUrgent
 	c.pendingPreview = c.pendingPreview || c.previewWake != nil || len(c.previewWakes) != 0
 	c.coalesced++
-	arm := !wasPending || (!wasUrgent && c.pendingUrgent) || (!wasPreviewPending && c.pendingPreview)
+	// A deadline may have expired while synchronized output still gated the
+	// pending work. Completion republishes urgently and must reserve a fresh
+	// deadline rather than leaving that already-fired timer as the only arm.
+	arm := !wasPending || (!wasUrgent && c.pendingUrgent) || (!wasPreviewPending && c.pendingPreview) || c.deadlineDue
 	var old ports.Timer
 	if arm {
 		c.generation++

M internal/usecase/daemon/render_coordinator_test.go +18 -3


@@ -657,9 +657,14 @@ func TestRenderCoordinatorSynchronizedOutput(t *testing.T) {
657	657		require.Equal(t, maxSyncUpdateDuration, watchdogs[len(watchdogs)-1].duration)
658	658
659	659		h.rc.invalidate(renderInvalidation{class: invalidateOutput, reset: true})
660		-	for _, timer := range h.armedTimers(t) {
661		-	timer.ch <- time.Time{}
662		-	}
	660	+	timers := h.armedTimers(t)
	661	+	require.Len(t, timers, 1)
	662	+	h.rc.mu.Lock()
	663	+	normalWorkerDone := h.rc.normalWorkerDone
	664	+	h.rc.mu.Unlock()
	665	+	require.NotNil(t, normalWorkerDone)
	666	+	timers[0].ch <- time.Time{}
	667	+	requireWorkerExit(t, normalWorkerDone)
663	668		requireNoWake(t, h.wakes)
664	669
665	670		h.syncActive.Store(false)

@@ -1354,7 +1359,12 @@ func TestRenderCoordinatorSyncBatchSurvivesAttachmentLifecycle(t *testing.T) {
1354	1359		h.rc.invalidate(renderInvalidation{class: invalidateOutput, producer: "complete preview"})
1355	1360		timers := h.armedTimers(t)
1356	1361		require.Len(t, timers, 1)
	1362	+	h.rc.mu.Lock()
	1363	+	normalWorkerDone := h.rc.normalWorkerDone
	1364	+	h.rc.mu.Unlock()
	1365	+	require.NotNil(t, normalWorkerDone)
1357	1366		timers[0].ch <- time.Time{}
	1367	+	requireWorkerExit(t, normalWorkerDone)
1358	1368		requireNoWake(t, h.previews)
1359	1369
1360	1370		h.rc.mu.Lock()

@@ -1386,7 +1396,12 @@ func TestRenderCoordinatorSyncBatchSurvivesAttachmentLifecycle(t *testing.T) {
1386	1396		h.rc.invalidateForAttachment(replacement, renderInvalidation{class: invalidateUrgent, reset: true, producer: "replacement first paint"})
1387	1397		timers := h.armedTimers(t)
1388	1398		require.Len(t, timers, 1)
	1399	+	h.rc.mu.Lock()
	1400	+	normalWorkerDone := h.rc.normalWorkerDone
	1401	+	h.rc.mu.Unlock()
	1402	+	require.NotNil(t, normalWorkerDone)
1389	1403		timers[0].ch <- time.Time{}
	1404	+	requireWorkerExit(t, normalWorkerDone)
1390	1405		requireNoWake(t, h.wakes)
1391	1406
1392	1407		h.rc.mu.Lock()

 		require.Equal(t, maxSyncUpdateDuration, watchdogs[len(watchdogs)-1].duration)
 		h.rc.invalidate(renderInvalidation{class: invalidateOutput, reset: true})
-		for _, timer := range h.armedTimers(t) {
+		timers := h.armedTimers(t)
-			timer.ch <- time.Time{}
+		require.Len(t, timers, 1)
-		}
+		h.rc.mu.Lock()
+		normalWorkerDone := h.rc.normalWorkerDone
+		h.rc.mu.Unlock()
+		require.NotNil(t, normalWorkerDone)
+		timers[0].ch <- time.Time{}
+		requireWorkerExit(t, normalWorkerDone)
 		requireNoWake(t, h.wakes)
 		h.syncActive.Store(false)
 				h.rc.invalidate(renderInvalidation{class: invalidateOutput, producer: "complete preview"})
 				timers := h.armedTimers(t)
 				require.Len(t, timers, 1)
+				h.rc.mu.Lock()
+				normalWorkerDone := h.rc.normalWorkerDone
+				h.rc.mu.Unlock()
+				require.NotNil(t, normalWorkerDone)
 				timers[0].ch <- time.Time{}
+				requireWorkerExit(t, normalWorkerDone)
 				requireNoWake(t, h.previews)
 				h.rc.mu.Lock()
 		h.rc.invalidateForAttachment(replacement, renderInvalidation{class: invalidateUrgent, reset: true, producer: "replacement first paint"})
 		timers := h.armedTimers(t)
 		require.Len(t, timers, 1)
+		h.rc.mu.Lock()
+		normalWorkerDone := h.rc.normalWorkerDone
+		h.rc.mu.Unlock()
+		require.NotNil(t, normalWorkerDone)
 		timers[0].ch <- time.Time{}
+		requireWorkerExit(t, normalWorkerDone)
 		requireNoWake(t, h.wakes)
 		h.rc.mu.Lock()

M internal/usecase/daemon/render_test.go +3 -2


@@ -194,6 +194,7 @@ func TestPTYReaderSyncVisibilityTransitions(t *testing.T) {
194	194
195	195		inactiveSteps <- channelPTYStep{data: []byte(" complete\x1b[?2026l")}
196	196		awaitPTYReadProcessed(t, inactiveProcessed)
	197	+	fireCoordinatorTimer(t, drainCoordinatorTimers(clock), urgentRenderDeadline)
197	198		frame := awaitOutputFrameWithoutSleep(t, sends)
198	199		output, err := ports.UnmarshalOutput(frame.Payload)
199	200		require.NoError(t, err)

@@ -277,7 +278,7 @@ func TestPTYReaderRepublishesSynchronizedCompletionAfterAttachmentLifecycle(t *t
277	278		fireCoordinatorTimer(t, drainCoordinatorTimers(clock), urgentRenderDeadline)
278	279		wake := <-previews
279	280		require.True(t, wake.urgent)
280		-	require.Equal(t, 1, wake.coalesced)
	281	+	require.Equal(t, 2, wake.coalesced, "completion retains coordinator coalescing across the cleared attachment work")
281	282		select {
282	283		case duplicate := <-previews:
283	284		t.Fatalf("sync completion must publish exactly one preview wake: %#v", duplicate)

@@ -320,7 +321,7 @@ func TestPTYReaderRepublishesSynchronizedCompletionAfterAttachmentLifecycle(t *t
320	321		wake := <-wakes
321	322		require.True(t, wake.urgent)
322	323		require.True(t, wake.reset, "the replacement's cleared batch must repaint a complete frame")
323		-	require.Equal(t, 2, wake.coalesced, "completion must coalesce with the replacement reset")
	324	+	require.Equal(t, 3, wake.coalesced, "completion must retain the replacement reset and coordinator coalescing")
324	325		require.Same(t, replacement, wake.attachment)
325	326		select {
326	327		case duplicate := <-wakes:

 		inactiveSteps <- channelPTYStep{data: []byte(" complete\x1b[?2026l")}
 		awaitPTYReadProcessed(t, inactiveProcessed)
+		fireCoordinatorTimer(t, drainCoordinatorTimers(clock), urgentRenderDeadline)
 		frame := awaitOutputFrameWithoutSleep(t, sends)
 		output, err := ports.UnmarshalOutput(frame.Payload)
 		require.NoError(t, err)
 		fireCoordinatorTimer(t, drainCoordinatorTimers(clock), urgentRenderDeadline)
 		wake := <-previews
 		require.True(t, wake.urgent)
-		require.Equal(t, 1, wake.coalesced)
+		require.Equal(t, 2, wake.coalesced, "completion retains coordinator coalescing across the cleared attachment work")
 		select {
 		case duplicate := <-previews:
 			t.Fatalf("sync completion must publish exactly one preview wake: %#v", duplicate)
 		wake := <-wakes
 		require.True(t, wake.urgent)
 		require.True(t, wake.reset, "the replacement's cleared batch must repaint a complete frame")
-		require.Equal(t, 2, wake.coalesced, "completion must coalesce with the replacement reset")
+		require.Equal(t, 3, wake.coalesced, "completion must retain the replacement reset and coordinator coalescing")
 		require.Same(t, replacement, wake.attachment)
 		select {
 		case duplicate := <-wakes: