b268ad5 fix(copy): harden search and release handling · vev

M internal/usecase/copy/mode.go +9 -1


@@ -234,6 +234,9 @@ func (m *Mode) ExtendWordSelection(p Pos) bool {
234	234		return true
235	235		}
236	236		func (m *Mode) Search(query string) bool {
	237	+	if m == nil {
	238	+	return false
	239	+	}
237	240		return m.SetSearchMatches(query, FindMatches(m.document, query), 0)
238	241		}
239	242		func (m *Mode) SetSearchMatches(query string, matches []SearchMatch, index int) bool {

@@ -267,7 +270,12 @@ func (m *Mode) moveToSearchMatch(match SearchMatch) {
267	270		if m == nil \|\| m.document == nil {
268	271		return
269	272		}
270		-	if m.navigator.Set(m.document, Pos{Row: match.Row, Col: match.Start}) && m.selection.Enabled {
	273	+	pos, ok := m.document.Normalize(Pos{Row: match.Row, Col: match.Start})
	274	+	if !ok {
	275	+	return
	276	+	}
	277	+	m.navigator.Set(m.document, pos)
	278	+	if m.selection.Enabled {
271	279		m.selection.Extend(m.navigator.Pos)
272	280		}
273	281		m.adjustViewport()

 	return true
 }
 func (m *Mode) Search(query string) bool {
+	if m == nil {
+		return false
+	}
 	return m.SetSearchMatches(query, FindMatches(m.document, query), 0)
 }
 func (m *Mode) SetSearchMatches(query string, matches []SearchMatch, index int) bool {
 	if m == nil || m.document == nil {
 		return
 	}
-	if m.navigator.Set(m.document, Pos{Row: match.Row, Col: match.Start}) && m.selection.Enabled {
+	pos, ok := m.document.Normalize(Pos{Row: match.Row, Col: match.Start})
+	if !ok {
+		return
+	}
+	m.navigator.Set(m.document, pos)
+	if m.selection.Enabled {
 		m.selection.Extend(m.navigator.Pos)
 	}
 	m.adjustViewport()

M internal/usecase/copy/mode_test.go +15 -0


@@ -92,6 +92,21 @@ func TestCopyModeSearchNavigationExtendsActiveSelection(t *testing.T) {
92	92		require.Equal(t, Selection{Anchor: Pos{Row: 0}, Active: Pos{Row: 2, Col: 2}, Granularity: Character, Enabled: true}, m.Selection())
93	93		}
94	94
	95	+	func TestCopyModeSearchExtendsSelectionWhenMatchIsAlreadyAtCursor(t *testing.T) {
	96	+	m := modeFor([]string{"zero", "one"}, 2)
	97	+	require.True(t, m.StartCharacterSelection(Pos{Row: 0}))
	98	+	require.True(t, m.ExtendCharacterSelection(Pos{Row: 1, Col: 1}))
	99	+	require.True(t, m.SetPosition(Pos{Row: 0}))
	100	+
	101	+	require.True(t, m.SetSearchMatches("zero", []SearchMatch{{Row: 0, Start: 0, End: 4}}, 0))
	102	+	require.Equal(t, Pos{Row: 0}, m.Selection().Active)
	103	+	}
	104	+
	105	+	func TestCopyModeSearchNilMode(t *testing.T) {
	106	+	var mode *Mode
	107	+	require.False(t, mode.Search("anything"))
	108	+	}
	109	+
95	110		func TestCopyModeRenderBoundsCursorToRenderedRow(t *testing.T) {
96	111		m := NewMode(NewDocument(NewSnapshotFromRows([][]renderer.Cell{row("alpha")}, 2, 1), ""))
97	112		require.True(t, m.SetPosition(Pos{Row: 0, Col: 4}), "cursor remains valid in the document despite a narrow render frame")


@@ -92,6 +92,21 @@ func TestCopyModeSearchNavigationExtendsActiveSelection(t *testing.T) {
92	require.Equal(t, Selection{Anchor: Pos{Row: 0}, Active: Pos{Row: 2, Col: 2}, Granularity: Character, Enabled: true}, m.Selection())	92		require.Equal(t, Selection{Anchor: Pos{Row: 0}, Active: Pos{Row: 2, Col: 2}, Granularity: Character, Enabled: true}, m.Selection())
93	}	93		}
94		94
		95	+	func TestCopyModeSearchExtendsSelectionWhenMatchIsAlreadyAtCursor(t *testing.T) {
		96	+	m := modeFor([]string{"zero", "one"}, 2)
		97	+	require.True(t, m.StartCharacterSelection(Pos{Row: 0}))
		98	+	require.True(t, m.ExtendCharacterSelection(Pos{Row: 1, Col: 1}))
		99	+	require.True(t, m.SetPosition(Pos{Row: 0}))
		100	+
		101	+	require.True(t, m.SetSearchMatches("zero", []SearchMatch{{Row: 0, Start: 0, End: 4}}, 0))
		102	+	require.Equal(t, Pos{Row: 0}, m.Selection().Active)
		103	+	}
		104	+
		105	+	func TestCopyModeSearchNilMode(t *testing.T) {
		106	+	var mode *Mode
		107	+	require.False(t, mode.Search("anything"))
		108	+	}
		109	+
95	func TestCopyModeRenderBoundsCursorToRenderedRow(t *testing.T) {	110		func TestCopyModeRenderBoundsCursorToRenderedRow(t *testing.T) {
96	m := NewMode(NewDocument(NewSnapshotFromRows([][]renderer.Cell{row("alpha")}, 2, 1), ""))	111		m := NewMode(NewDocument(NewSnapshotFromRows([][]renderer.Cell{row("alpha")}, 2, 1), ""))
97	require.True(t, m.SetPosition(Pos{Row: 0, Col: 4}), "cursor remains valid in the document despite a narrow render frame")	112		require.True(t, m.SetPosition(Pos{Row: 0, Col: 4}), "cursor remains valid in the document despite a narrow render frame")

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


@@ -23,9 +23,7 @@ func (d Daemon) handleCopyMouse(sess session, ac attachedClient, tb tab, ev
23	23		return true
24	24		}
25	25		if ev.Button == mouse.Left && ev.Type == mouse.Release {
26		-	rt.copyMu.Lock()
27		-	rt.invalidateCopyPointerLocked(false)
28		-	rt.copyMu.Unlock()
	26	+	d.handleActiveCopyMouse(sess, ac, tb, ev)
29	27		return true
30	28		}
31	29		switch ev.Button {

 		return true
 	}
 	if ev.Button == mouse.Left && ev.Type == mouse.Release {
-		rt.copyMu.Lock()
+		d.handleActiveCopyMouse(sess, ac, tb, ev)
-		rt.invalidateCopyPointerLocked(false)
-		rt.copyMu.Unlock()
 		return true
 	}
 	switch ev.Button {

M internal/usecase/daemon/copymode_lifecycle_test.go +36 -4


@@ -208,16 +208,32 @@ func TestCopyModeLifecyclePublicationEpochRejectsReleaseAndPaneClose(t *testing.
208	208		close(reached)
209	209		<-resume
210	210		}
	211	+	resumed := false
	212	+	defer func() {
	213	+	if !resumed {
	214	+	close(resume)
	215	+	}
	216	+	d.beforeCopyModeRevalidate = nil
	217	+	}()
211	218		done := make(chan struct{})
212	219		go func() {
213	220		d.handleInput(sess, ac, []byte("\x1b[<32;1;3M"))
214	221		close(done)
215	222		}()
216		-	<-reached
	223	+	select {
	224	+	case <-reached:
	225	+	case <-time.After(time.Second):
	226	+	t.Fatal("copy mode publication did not reach revalidation gate")
	227	+	}
217	228
218	229		tc.invalidate(t, d, sess, ac, tb, p)
219	230		close(resume)
220		-	<-done
	231	+	resumed = true
	232	+	select {
	233	+	case <-done:
	234	+	case <-time.After(time.Second):
	235	+	t.Fatal("copy mode publication did not finish after revalidation gate was released")
	236	+	}
221	237
222	238		ac.overlays.copyMu.Lock()
223	239		require.Nil(t, ac.overlays.copyMode, "stale publication must not resurrect copy mode")

@@ -257,15 +273,31 @@ func TestCopyModeLifecycleFloatingCloseDuringPublicationDoesNotResurrect(t *test
257	273		close(reached)
258	274		<-resume
259	275		}
	276	+	resumed := false
	277	+	defer func() {
	278	+	if !resumed {
	279	+	close(resume)
	280	+	}
	281	+	d.beforeCopyModeRevalidate = nil
	282	+	}()
260	283		done := make(chan struct{})
261	284		go func() {
262	285		d.handleInput(sess, ac, motion)
263	286		close(done)
264	287		}()
265		-	<-reached
	288	+	select {
	289	+	case <-reached:
	290	+	case <-time.After(time.Second):
	291	+	t.Fatal("copy mode publication did not reach revalidation gate")
	292	+	}
266	293		d.teardownFloating(tb, ac)
267	294		close(resume)
268		-	<-done
	295	+	resumed = true
	296	+	select {
	297	+	case <-done:
	298	+	case <-time.After(time.Second):
	299	+	t.Fatal("copy mode publication did not finish after revalidation gate was released")
	300	+	}
269	301
270	302		ac.overlays.copyMu.Lock()
271	303		require.Nil(t, ac.overlays.copyMode)


@@ -208,16 +208,32 @@ func TestCopyModeLifecyclePublicationEpochRejectsReleaseAndPaneClose(t *testing.
208		close(reached)	208		close(reached)
209		<-resume	209		<-resume
210		}	210		}
			211	+	resumed := false
			212	+	defer func() {
			213	+	if !resumed {
			214	+	close(resume)
			215	+	}
			216	+	d.beforeCopyModeRevalidate = nil
			217	+	}()
211		done := make(chan struct{})	218		done := make(chan struct{})
212		go func() {	219		go func() {
213		d.handleInput(sess, ac, []byte("\x1b[<32;1;3M"))	220		d.handleInput(sess, ac, []byte("\x1b[<32;1;3M"))
214		close(done)	221		close(done)
215		}()	222		}()
216	-	<-reached	223	+	select {
			224	+	case <-reached:
			225	+	case <-time.After(time.Second):
			226	+	t.Fatal("copy mode publication did not reach revalidation gate")
			227	+	}
217			228
218		tc.invalidate(t, d, sess, ac, tb, p)	229		tc.invalidate(t, d, sess, ac, tb, p)
219		close(resume)	230		close(resume)
220	-	<-done	231	+	resumed = true
			232	+	select {
			233	+	case <-done:
			234	+	case <-time.After(time.Second):
			235	+	t.Fatal("copy mode publication did not finish after revalidation gate was released")
			236	+	}
221			237
222		ac.overlays.copyMu.Lock()	238		ac.overlays.copyMu.Lock()
223		require.Nil(t, ac.overlays.copyMode, "stale publication must not resurrect copy mode")	239		require.Nil(t, ac.overlays.copyMode, "stale publication must not resurrect copy mode")

@@ -257,15 +273,31 @@ func TestCopyModeLifecycleFloatingCloseDuringPublicationDoesNotResurrect(t *test
257		close(reached)	273		close(reached)
258		<-resume	274		<-resume
259		}	275		}
			276	+	resumed := false
			277	+	defer func() {
			278	+	if !resumed {
			279	+	close(resume)
			280	+	}
			281	+	d.beforeCopyModeRevalidate = nil
			282	+	}()
260		done := make(chan struct{})	283		done := make(chan struct{})
261		go func() {	284		go func() {
262		d.handleInput(sess, ac, motion)	285		d.handleInput(sess, ac, motion)
263		close(done)	286		close(done)
264		}()	287		}()
265	-	<-reached	288	+	select {
			289	+	case <-reached:
			290	+	case <-time.After(time.Second):
			291	+	t.Fatal("copy mode publication did not reach revalidation gate")
			292	+	}
266		d.teardownFloating(tb, ac)	293		d.teardownFloating(tb, ac)
267		close(resume)	294		close(resume)
268	-	<-done	295	+	resumed = true
			296	+	select {
			297	+	case <-done:
			298	+	case <-time.After(time.Second):
			299	+	t.Fatal("copy mode publication did not finish after revalidation gate was released")
			300	+	}
269			301
270		ac.overlays.copyMu.Lock()	302		ac.overlays.copyMu.Lock()
271		require.Nil(t, ac.overlays.copyMode)	303		require.Nil(t, ac.overlays.copyMode)

M internal/usecase/daemon/input_test.go +25 -14


@@ -1140,31 +1140,24 @@ func TestCopyModeStatusRowPressClearsDragState(t *testing.T) {
1140	1140		require.Equal(t, 1, hi, "status-row press must invalidate the drag so the motion is a no-op")
1141	1141		}
1142	1142
1143		-	// TestMouseNormalScreenDragExtendsToCurrentScrollbackOffset covers a
1144		-	// regression where the first drag Motion extended the selection using the
1145		-	// scrollback length captured at Press time instead of the current
1146		-	// scrollback length, so if lines were evicted into scrollback between the
1147		-	// Press and the first Motion, the extend target landed on the wrong row.
1148		-	func TestMouseNormalScreenDragExtendsToCurrentScrollbackOffset(t *testing.T) {
	1143	+	// TestMouseNormalScreenDragUsesPressOwnedDocumentAfterOutputEviction verifies
	1144	+	// that output eviction after Press does not change endpoint mapping: the
	1145	+	// immutable press-owned Document keeps pointer rows 0→1 mapped to rows 0→1.
	1146	+	func TestMouseNormalScreenDragUsesPressOwnedDocumentAfterOutputEviction(t *testing.T) {
1149	1147		p, _ := newBlockingPTY(t)
1150	1148		d, sess, ac, _ := newManualSessionWithPTYs(t, p)
1151	1149		installTestHistory(sess.tabs[0].focusedPane(), vt.HistoryConfig{MaxRows: 50})
1152	1150		require.Equal(t, 23, sess.tabs[0].focusedPane().screen.Frame.Height, "fixture assumption: status row is wire row 24")
1153	1151
1154		-	// Press on a content row while scrollback is empty: the anchor is
1155		-	// content-stable at the first body row = document row 0.
	1152	+	// Press anchors document row 0 before output eviction.
1156	1153		d.handleInput(sess, ac, []byte("\x1b[<0;1;2M"))
1157	1154
1158		-	// Simulate 5 lines evicted into scrollback between the Press and the
1159		-	// first Motion (e.g. the child kept producing output).
	1155	+	// Output evicts five lines after Press; the Document remains immutable.
1160	1156		for range 5 {
1161	1157		sess.tabs[0].focusedPane().history.Append(testRow("evicted"))
1162	1158		}
1163	1159
1164		-	// Motion lands on wire row 3 (0-based row 2 of the current screen).
1165		-	// The extend target must track the pointer's current content row:
1166		-	// current scrollback length (5) + ev.Row (2) = 7 -- not the stale
1167		-	// pressTop(0)+ev.Row(2) = 2.
	1160	+	// Motion maps the next endpoint through the press-owned Document.
1168	1161		d.handleInput(sess, ac, []byte("\x1b[<32;1;3M"))
1169	1162
1170	1163		require.NotNil(t, ac.overlays.copyMode)

@@ -1511,6 +1504,24 @@ func TestActiveCopyPressOnOtherPaneFocusesAndExitsBeforeFutureInput(t *testing.T
1511	1504		require.Same(t, p2, pointer.pane)
1512	1505		}
1513	1506
	1507	+	func TestCopyModeReleaseMapsFinalEndpointAndInvalidatesPointer(t *testing.T) {
	1508	+	d, sess, ac, _ := mouseCopyHarness(t, "alpha bravo")
	1509	+
	1510	+	// Motion starts an active drag; Release then arrives farther away without
	1511	+	// another Motion and must still extend its final endpoint.
	1512	+	copyMouseInput(d, sess, ac, "\x1b[<0;1;2M\x1b[<32;5;2M")
	1513	+	copyMouseInput(d, sess, ac, "\x1b[<0;8;2m")
	1514	+
	1515	+	ac.overlays.copyMu.Lock()
	1516	+	selection := ac.overlays.copyMode.Selection()
	1517	+	pointerValid := ac.overlays.copyPointer.valid
	1518	+	ac.overlays.copyMu.Unlock()
	1519	+	require.True(t, selection.Enabled)
	1520	+	require.Equal(t, scopy.Pos{Row: 0, Col: 0}, selection.Anchor)
	1521	+	require.Equal(t, scopy.Pos{Row: 0, Col: 7}, selection.Active)
	1522	+	require.False(t, pointerValid)
	1523	+	}
	1524	+
1514	1525		func TestCopySearchReleaseMapsFinalEndpointAndInvalidatesPointer(t *testing.T) {
1515	1526		for _, tc := range []struct {
1516	1527		name string

 	require.Equal(t, 1, hi, "status-row press must invalidate the drag so the motion is a no-op")
 }
-// TestMouseNormalScreenDragExtendsToCurrentScrollbackOffset covers a
+// TestMouseNormalScreenDragUsesPressOwnedDocumentAfterOutputEviction verifies
-// regression where the first drag Motion extended the selection using the
+// that output eviction after Press does not change endpoint mapping: the
-// scrollback length captured at Press time instead of the current
+// immutable press-owned Document keeps pointer rows 0→1 mapped to rows 0→1.
-// scrollback length, so if lines were evicted into scrollback between the
+func TestMouseNormalScreenDragUsesPressOwnedDocumentAfterOutputEviction(t *testing.T) {
-// Press and the first Motion, the extend target landed on the wrong row.
-func TestMouseNormalScreenDragExtendsToCurrentScrollbackOffset(t *testing.T) {
 	p, _ := newBlockingPTY(t)
 	d, sess, ac, _ := newManualSessionWithPTYs(t, p)
 	installTestHistory(sess.tabs[0].focusedPane(), vt.HistoryConfig{MaxRows: 50})
 	require.Equal(t, 23, sess.tabs[0].focusedPane().screen.Frame.Height, "fixture assumption: status row is wire row 24")
-	// Press on a content row while scrollback is empty: the anchor is
+	// Press anchors document row 0 before output eviction.
-	// content-stable at the first body row = document row 0.
 	d.handleInput(sess, ac, []byte("\x1b[<0;1;2M"))
-	// Simulate 5 lines evicted into scrollback between the Press and the
+	// Output evicts five lines after Press; the Document remains immutable.
-	// first Motion (e.g. the child kept producing output).
 	for range 5 {
 		sess.tabs[0].focusedPane().history.Append(testRow("evicted"))
 	}
-	// Motion lands on wire row 3 (0-based row 2 of the *current* screen).
+	// Motion maps the next endpoint through the press-owned Document.
-	// The extend target must track the pointer's current content row:
-	// current scrollback length (5) + ev.Row (2) = 7 -- not the stale
-	// pressTop(0)+ev.Row(2) = 2.
 	d.handleInput(sess, ac, []byte("\x1b[<32;1;3M"))
 	require.NotNil(t, ac.overlays.copyMode)
 	require.Same(t, p2, pointer.pane)
 }
+func TestCopyModeReleaseMapsFinalEndpointAndInvalidatesPointer(t *testing.T) {
+	d, sess, ac, _ := mouseCopyHarness(t, "alpha bravo")
+	// Motion starts an active drag; Release then arrives farther away without
+	// another Motion and must still extend its final endpoint.
+	copyMouseInput(d, sess, ac, "\x1b[<0;1;2M\x1b[<32;5;2M")
+	copyMouseInput(d, sess, ac, "\x1b[<0;8;2m")
+	ac.overlays.copyMu.Lock()
+	selection := ac.overlays.copyMode.Selection()
+	pointerValid := ac.overlays.copyPointer.valid
+	ac.overlays.copyMu.Unlock()
+	require.True(t, selection.Enabled)
+	require.Equal(t, scopy.Pos{Row: 0, Col: 0}, selection.Anchor)
+	require.Equal(t, scopy.Pos{Row: 0, Col: 7}, selection.Active)
+	require.False(t, pointerValid)
+}
 func TestCopySearchReleaseMapsFinalEndpointAndInvalidatesPointer(t *testing.T) {
 	for _, tc := range []struct {
 		name    string