b5b098c fix(persistence): resolve follow-up PR comments · vev

M internal/app/run.go +18 -8


@@ -565,19 +565,29 @@ func runKill(_ context.Context, name string, all, daemon bool) error {
565	565		} else if statErr != nil {
566	566		return fmt.Errorf("vev: reading stored sessions: %w", statErr)
567	567		}
568		-	store, openErr := kv.Open(storePath)
569		-	if openErr != nil {
570		-	return fmt.Errorf("vev: opening stored sessions: %w", openErr)
	568	+	records, loadErr := persist.LoadReadOnly(platform.StateDir())
	569	+	if loadErr != nil {
	570	+	return fmt.Errorf("vev: reading stored sessions: %w", loadErr)
	571	+	}
	572	+	found := false
	573	+	for _, record := range records {
	574	+	if record.Name == name {
	575	+	found = true
	576	+	break
	577	+	}
571	578		}
572		-	if _, ok := store.Get([]byte(name)); !ok {
573		-	_ = store.Close()
	579	+	if !found {
574	580		return fmt.Errorf("vev: no such session: %s", name)
575	581		}
576		-	if deleteErr := store.Delete([]byte(name)); deleteErr != nil {
577		-	_ = store.Close()
	582	+	p, openErr := persist.Open(platform.StateDir())
	583	+	if openErr != nil {
	584	+	return fmt.Errorf("vev: opening stored sessions: %w", openErr)
	585	+	}
	586	+	if deleteErr := p.Delete(name); deleteErr != nil {
	587	+	_ = p.Close()
578	588		return fmt.Errorf("vev: deleting stored session: %w", deleteErr)
579	589		}
580		-	if closeErr := store.Close(); closeErr != nil {
	590	+	if closeErr := p.Close(); closeErr != nil {
581	591		return fmt.Errorf("vev: closing stored sessions: %w", closeErr)
582	592		}
583	593		printKillSuccess(name, all, daemon)

 			} else if statErr != nil {
 				return fmt.Errorf("vev: reading stored sessions: %w", statErr)
 			}
-			store, openErr := kv.Open(storePath)
+			records, loadErr := persist.LoadReadOnly(platform.StateDir())
-			if openErr != nil {
+			if loadErr != nil {
-				return fmt.Errorf("vev: opening stored sessions: %w", openErr)
+				return fmt.Errorf("vev: reading stored sessions: %w", loadErr)
+			}
+			found := false
+			for _, record := range records {
+				if record.Name == name {
+					found = true
+					break
+				}
 			}
-			if _, ok := store.Get([]byte(name)); !ok {
+			if !found {
-				_ = store.Close()
 				return fmt.Errorf("vev: no such session: %s", name)
 			}
-			if deleteErr := store.Delete([]byte(name)); deleteErr != nil {
+			p, openErr := persist.Open(platform.StateDir())
-				_ = store.Close()
+			if openErr != nil {
+				return fmt.Errorf("vev: opening stored sessions: %w", openErr)
+			}
+			if deleteErr := p.Delete(name); deleteErr != nil {
+				_ = p.Close()
 				return fmt.Errorf("vev: deleting stored session: %w", deleteErr)
 			}
-			if closeErr := store.Close(); closeErr != nil {
+			if closeErr := p.Close(); closeErr != nil {
 				return fmt.Errorf("vev: closing stored sessions: %w", closeErr)
 			}
 			printKillSuccess(name, all, daemon)

M internal/app/run_test.go +8 -8


@@ -202,18 +202,18 @@ func captureStdout(t *testing.T, fn func()) string {
202	202		os.Stdout = w
203	203		defer func() { os.Stdout = old }()
204	204		defer func() { _ = r.Close() }()
205		-	closed := false
206		-	defer func() {
207		-	if !closed {
208		-	_ = w.Close()
209		-	}
	205	+	outCh := make(chan []byte, 1)
	206	+	errCh := make(chan error, 1)
	207	+	go func() {
	208	+	out, err := io.ReadAll(r)
	209	+	outCh <- out
	210	+	errCh <- err
210	211		}()
211	212
212	213		fn()
213	214		_ = w.Close()
214		-	closed = true
215		-	out, err := io.ReadAll(r)
216		-	if err != nil {
	215	+	out := <-outCh
	216	+	if err := <-errCh; err != nil {
217	217		t.Fatalf("ReadAll stdout error = %v", err)
218	218		}
219	219		return string(out)

 	os.Stdout = w
 	defer func() { os.Stdout = old }()
 	defer func() { _ = r.Close() }()
-	closed := false
+	outCh := make(chan []byte, 1)
-	defer func() {
+	errCh := make(chan error, 1)
-		if !closed {
+	go func() {
-			_ = w.Close()
+		out, err := io.ReadAll(r)
-		}
+		outCh <- out
+		errCh <- err
 	}()
 	fn()
 	_ = w.Close()
-	closed = true
+	out := <-outCh
-	out, err := io.ReadAll(r)
+	if err := <-errCh; err != nil {
-	if err != nil {
 		t.Fatalf("ReadAll stdout error = %v", err)
 	}
 	return string(out)

M internal/persist/record.go +7 -2


@@ -44,8 +44,13 @@ func decodeRecordValue(name string, value []byte) (Record, error) {
44	44		if len(value) < 4 {
45	45		return Record{}, errMalformedRecord
46	46		}
47		-	cwdLen := int(binary.BigEndian.Uint32(value[:4]))
48		-	if cwdLen > len(value)-4 \|\| len(value) != 4+cwdLen+8+8 {
	47	+	cwdLen32 := binary.BigEndian.Uint32(value[:4])
	48	+	remaining := len(value) - 4
	49	+	if uint64(cwdLen32) > uint64(remaining) {
	50	+	return Record{}, errMalformedRecord
	51	+	}
	52	+	cwdLen := int(cwdLen32)
	53	+	if len(value) != 4+cwdLen+8+8 {
49	54		return Record{}, errMalformedRecord
50	55		}
51	56		off := 4 + cwdLen

 	if len(value) < 4 {
 		return Record{}, errMalformedRecord
 	}
-	cwdLen := int(binary.BigEndian.Uint32(value[:4]))
+	cwdLen32 := binary.BigEndian.Uint32(value[:4])
-	if cwdLen > len(value)-4 || len(value) != 4+cwdLen+8+8 {
+	remaining := len(value) - 4
+	if uint64(cwdLen32) > uint64(remaining) {
+		return Record{}, errMalformedRecord
+	}
+	cwdLen := int(cwdLen32)
+	if len(value) != 4+cwdLen+8+8 {
 		return Record{}, errMalformedRecord
 	}
 	off := 4 + cwdLen

M internal/ports/ports.go +1 -0


@@ -50,6 +50,7 @@ type Store interface {
50	50		Get(key []byte) ([]byte, bool)
51	51		Set(key, val []byte) error
52	52		Delete(key []byte) error
	53	+	// Range iterates key/value pairs; fn returning false stops iteration early.
53	54		Range(fn func(k, v []byte) bool)
54	55		Sync() error
55	56		Close() error


@@ -50,6 +50,7 @@ type Store interface {
50	Get(key []byte) ([]byte, bool)	50		Get(key []byte) ([]byte, bool)
51	Set(key, val []byte) error	51		Set(key, val []byte) error
52	Delete(key []byte) error	52		Delete(key []byte) error
		53	+	// Range iterates key/value pairs; fn returning false stops iteration early.
53	Range(fn func(k, v []byte) bool)	54		Range(fn func(k, v []byte) bool)
54	Sync() error	55		Sync() error
55	Close() error	56		Close() error

M internal/usecase/daemon/picker.go +1 -1


@@ -91,7 +91,7 @@ func (d Daemon) pickerViews(cur session) ([]picker.SessionView, int) {
91	91		views = append(views, picker.SessionView{
92	92		ID: domain.SessionID("stopped:" + s.name),
93	93		Name: s.name,
94		-	Tabs: []string{"(stopped)"},
	94	+	Tabs: []string{""},
95	95		Stopped: true,
96	96		})
97	97		}


@@ -91,7 +91,7 @@ func (d Daemon) pickerViews(cur session) ([]picker.SessionView, int) {
91		views = append(views, picker.SessionView{	91		views = append(views, picker.SessionView{
92		ID: domain.SessionID("stopped:" + s.name),	92		ID: domain.SessionID("stopped:" + s.name),
93		Name: s.name,	93		Name: s.name,
94	-	Tabs: []string{"(stopped)"},	94	+	Tabs: []string{""},
95		Stopped: true,	95		Stopped: true,
96		})	96		})
97		}	97		}

M internal/usecase/picker/model_test.go +1 -1


@@ -102,7 +102,7 @@ func TestSelectedMapping(t *testing.T) {
102	102		}
103	103
104	104		func TestStoppedSessionSelectableAndRendered(t *testing.T) {
105		-	m := New([]SessionView{{ID: "stopped:work", Name: "work", Tabs: []string{"(stopped)"}, Stopped: true}}, "", 0)
	105	+	m := New([]SessionView{{ID: "stopped:work", Name: "work", Tabs: []string{""}, Stopped: true}}, "", 0)
106	106		got, ok := m.Selected()
107	107		require.True(t, ok)
108	108		require.Equal(t, Target{Session: "stopped:work", Name: "work", TabIndex: 0, Stopped: true}, got)


@@ -102,7 +102,7 @@ func TestSelectedMapping(t *testing.T) {
102		}	102		}
103			103
104		func TestStoppedSessionSelectableAndRendered(t *testing.T) {	104		func TestStoppedSessionSelectableAndRendered(t *testing.T) {
105	-	m := New([]SessionView{{ID: "stopped:work", Name: "work", Tabs: []string{"(stopped)"}, Stopped: true}}, "", 0)	105	+	m := New([]SessionView{{ID: "stopped:work", Name: "work", Tabs: []string{""}, Stopped: true}}, "", 0)
106		got, ok := m.Selected()	106		got, ok := m.Selected()
107		require.True(t, ok)	107		require.True(t, ok)
108		require.Equal(t, Target{Session: "stopped:work", Name: "work", TabIndex: 0, Stopped: true}, got)	108		require.Equal(t, Target{Session: "stopped:work", Name: "work", TabIndex: 0, Stopped: true}, got)

M pkg/kv/kv.go +13 -5


@@ -3,6 +3,7 @@ package kv
3	3		import (
4	4		"encoding/binary"
5	5		"errors"
	6	+	"fmt"
6	7		"hash/crc32"
7	8		"io"
8	9		"os"

@@ -203,12 +204,19 @@ func (s *Store) appendRecord(op byte, key, val []byte) error {
203	204		}
204	205		n, err := s.file.Write(buf)
205	206		if err != nil \|\| n != len(buf) {
206		-	_ = s.file.Truncate(pos)
207		-	_, _ = s.file.Seek(pos, io.SeekStart)
208		-	if err != nil {
209		-	return err
	207	+	writeErr := err
	208	+	if writeErr == nil {
	209	+	writeErr = io.ErrShortWrite
	210	+	}
	211	+	if tErr := s.file.Truncate(pos); tErr != nil {
	212	+	s.closed = true
	213	+	return fmt.Errorf("write failed (%v) and recovery truncate failed: %w", writeErr, tErr)
	214	+	}
	215	+	if _, sErr := s.file.Seek(pos, io.SeekStart); sErr != nil {
	216	+	s.closed = true
	217	+	return fmt.Errorf("write failed (%v) and recovery seek failed: %w", writeErr, sErr)
210	218		}
211		-	return io.ErrShortWrite
	219	+	return writeErr
212	220		}
213	221
214	222		k := string(key)

 import (
 	"encoding/binary"
 	"errors"
+	"fmt"
 	"hash/crc32"
 	"io"
 	"os"
 	}
 	n, err := s.file.Write(buf)
 	if err != nil || n != len(buf) {
-		_ = s.file.Truncate(pos)
+		writeErr := err
-		_, _ = s.file.Seek(pos, io.SeekStart)
+		if writeErr == nil {
-		if err != nil {
+			writeErr = io.ErrShortWrite
-			return err
+		}
+		if tErr := s.file.Truncate(pos); tErr != nil {
+			s.closed = true
+			return fmt.Errorf("write failed (%v) and recovery truncate failed: %w", writeErr, tErr)
+		}
+		if _, sErr := s.file.Seek(pos, io.SeekStart); sErr != nil {
+			s.closed = true
+			return fmt.Errorf("write failed (%v) and recovery seek failed: %w", writeErr, sErr)
 		}
-		return io.ErrShortWrite
+		return writeErr
 	}
 	k := string(key)