Merge branch 'main' into qualified_update

Author: JeffFaer

api/go.mod

@@ -9,4 +9,4 @@ require (
 	github.com/magefile/mage v1.15.0
 )
 
-require golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359 // indirect
+require golang.org/x/sys v0.1.0 // indirect

api/go.sum

@@ -13,8 +13,9 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359 h1:2B5p2L5IfGiD7+b9BOoRMC6DgObAVZV+Fsp050NqXik=
 golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
+golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

cmd/new.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"log/slog"
 
@@ -33,6 +34,7 @@ func newWorkUnit(ctx context.Context, workUnitName string, ctor workUnitCtor) er
 		return err
 	}
 	srv := tmux.MaybeCurrentServer()
+	hasCurrentServer := srv != nil
 	if srv == nil {
 		srv = tmux.DefaultServer()
 	}
@@ -56,10 +58,14 @@ func newWorkUnit(ctx context.Context, workUnitName string, ctor workUnitCtor) er
 	if err != nil {
 		return err
 	}
-	if err := srv.AttachOrSwitch(ctx, sesh); err != nil {
-		return fmt.Errorf("failed to attach to newly created session %q: %w", sesh.ID(), err)
+	if !hasCurrentServer {
+		// Attaching to a session hangs until the client is detached.
+		err = stopTrace()
 	}
-	return nil
+	if err1 := srv.AttachOrSwitch(ctx, sesh); err1 != nil {
+		err = errors.Join(err, fmt.Errorf("failed to attach to newly created session %q: %w", sesh.ID(), err))
+	}
+	return err
 }
 
 type sessionKey struct {

cmd/root.go

@@ -175,6 +175,8 @@ var stopTrace = sync.OnceValue(func() error {
 		if err := f.Close(); err != nil {
 			return fmt.Errorf("closing trace file: %w", err)
 		}
+	} else {
+		slog.Debug("Not recording trace.", "duration", dur)
 	}
 	return nil
 })

cmd/update.go

@@ -154,7 +154,7 @@ func update(ctx context.Context) error {
 		if err != nil {
 			return err
 		}
-		return updateTmux(ctx, state, curRepo, curWorkUnit)
+		return updateTmux(ctx, state, curRepo, curWorkUnit, true)
 	}
 
 	// Executed within tmux. Update the repo state.
@@ -174,7 +174,7 @@ func update(ctx context.Context) error {
 	return nil
 }
 
-func updateTmux(ctx context.Context, st *state.State, repo api.Repository, workUnit string) error {
+func updateTmux(ctx context.Context, st *state.State, repo api.Repository, workUnit string, endTrace bool) error {
 	sesh := st.Session(repo, workUnit)
 	if sesh == nil {
 		var err error
@@ -183,7 +183,12 @@ func updateTmux(ctx context.Context, st *state.State, repo api.Repository, workU
 			return err
 		}
 	}
-	return sesh.Server().AttachOrSwitch(ctx, sesh)
+	var err error
+	if endTrace {
+		// Attaching to a session hangs until the client is detached.
+		err = stopTrace()
+	}
+	return errors.Join(sesh.Server().AttachOrSwitch(ctx, sesh), err)
 }
 
 func updateTo(ctx context.Context, sessionName state.WorkUnitName) error {
@@ -229,7 +234,7 @@ func updateTo(ctx context.Context, sessionName state.WorkUnitName) error {
 		needsSwitch = true
 	}
 	if needsSwitch {
-		if err := updateTmux(ctx, st, repo, sessionName.WorkUnit); err != nil {
+		if err := updateTmux(ctx, st, repo, workUnitName, !hasCurrentServer); err != nil {
 			return err
 		}
 		update = true

tmux/state/state.go

@@ -22,7 +22,7 @@ type State struct {
 	sessions tmux.Sessions
 
 	// tmux sessions in srv with their associated repositories.
-	sessionsByName map[WorkUnitName]tmux.Session
+	sessionsByName map[WorkUnitName]session
 	sessionsByID   map[string]workUnit
 	// An index of unqualified repo names that exist in sessions.
 	unqualifiedRepos map[string]int
@@ -43,7 +43,7 @@ func New(ctx context.Context, srv tmux.Server, vcs api.VersionControlSystems) (*
 	st := &State{
 		srv:              srv,
 		sessions:         sessions,
-		sessionsByName:   make(map[WorkUnitName]tmux.Session),
+		sessionsByName:   make(map[WorkUnitName]session),
 		sessionsByID:     make(map[string]workUnit),
 		unqualifiedRepos: make(map[string]int),
 		repos:            make(map[RepoName]api.Repository),
@@ -103,7 +103,7 @@ func New(ctx context.Context, srv tmux.Server, vcs api.VersionControlSystems) (*
 			}
 
 			parsed := ParseSessionName(repo, name)
-			st.sessionsByName[parsed] = sesh
+			st.sessionsByName[parsed] = session{sesh, name}
 			st.sessionsByID[sesh.ID()] = workUnit{repo, parsed.WorkUnit}
 			st.unqualifiedRepos[parsed.Repo]++
 			logger.Info("Found work unit in tmux session.", "name", parsed)
@@ -123,7 +123,11 @@ func (st *State) SessionName(n WorkUnitName) string {
 
 // Sessions returns all tmux sessions keyed by their work unit.
 func (st *State) Sessions() map[WorkUnitName]tmux.Session {
-	return maps.Clone(st.sessionsByName)
+	ret := make(map[WorkUnitName]tmux.Session, len(st.sessionsByName))
+	for k, v := range st.sessionsByName {
+		ret[k] = v.sesh
+	}
+	return ret
 }
 
 // UnknownSessions returns all tmux sessions that didn't appear to have a work
@@ -153,11 +157,11 @@ func (st *State) Repositories() map[RepoName]api.Repository {
 // Session determines if a tmux session for the given work unit exists.
 func (st *State) Session(repo api.Repository, workUnitName string) tmux.Session {
 	n := NewWorkUnitName(repo, workUnitName)
-	ret := st.sessionsByName[n]
-	if ret != nil {
-		slog.Info("Found existing tmux session for work unit.", "id", ret.ID(), "name", n)
+	ret, ok := st.sessionsByName[n]
+	if ok {
+		slog.Info("Found existing tmux session for work unit.", "id", ret.sesh.ID(), "name", n)
 	}
-	return ret
+	return ret.sesh
 }
 
 // NewSession creates a tmux session for the given work unit.
@@ -177,7 +181,7 @@ func (st *State) NewSession(ctx context.Context, repo api.Repository, workUnitNa
 		return nil, fmt.Errorf("failed to create tmux session %q: %w", n, err)
 	}
 
-	st.sessionsByName[name] = sesh
+	st.sessionsByName[name] = session{sesh, n}
 	st.sessionsByID[sesh.ID()] = workUnit{repo, name.WorkUnit}
 	st.unqualifiedRepos[name.Repo]++
 	st.repos[name.RepoName] = repo
@@ -204,13 +208,13 @@ func (st *State) RenameSession(ctx context.Context, repo api.Repository, old, ne
 		return fmt.Errorf("tmux session %q already exists", st.SessionName(newName))
 	}
 
-	if err := sesh.Rename(ctx, st.SessionName(newName)); err != nil {
+	if err := sesh.sesh.Rename(ctx, st.SessionName(newName)); err != nil {
 		return err
 	}
 
 	delete(st.sessionsByName, oldName)
 	st.sessionsByName[newName] = sesh
-	st.sessionsByID[sesh.ID()] = workUnit{repo, newName.WorkUnit}
+	st.sessionsByID[sesh.sesh.ID()] = workUnit{repo, newName.WorkUnit}
 
 	if err := st.updateSessionNames(ctx); err != nil {
 		slog.Warn("Failed to update tmux session names.", "error", err)
@@ -276,14 +280,10 @@ func (st *State) PruneSessions(ctx context.Context) error {
 func (st *State) updateSessionNames(ctx context.Context) error {
 	defer trace.StartRegion(ctx, "State.updateSessionNames()").End()
 
-	names, err := st.sessions.Property(ctx, tmux.SessionName)
-	if err != nil {
-		return fmt.Errorf("could not resolve session names: %w", err)
-	}
 	var errs []error
 	for k, sesh := range st.sessionsByName {
-		if got, want := names[sesh], st.SessionName(k); got != want {
-			if err := sesh.Rename(ctx, want); err != nil {
+		if got, want := sesh.name, st.SessionName(k); got != want {
+			if err := sesh.sesh.Rename(ctx, want); err != nil {
 				errs = append(errs, err)
 				continue
 			}
@@ -422,3 +422,8 @@ type workUnit struct {
 func (wu workUnit) name() WorkUnitName {
 	return NewWorkUnitName(wu.repo, wu.workUnitName)
 }
+
+type session struct {
+	sesh tmux.Session
+	name string
+}

tmux/state/state_test.go

@@ -551,8 +551,8 @@ func simplifyState(t *testing.T, st *State) simplifiedState {
 	for n, sesh := range st.sessionsByName {
 		ret.WorkUnits = append(ret.WorkUnits, n)
 
-		if wu, ok := st.sessionsByID[sesh.ID()]; !ok || wu.name() != n {
-			t.Errorf("sessionsByID[%q] = %q, %t, expected %q", sesh.ID(), wu.name(), ok, n)
+		if wu, ok := st.sessionsByID[sesh.sesh.ID()]; !ok || wu.name() != n {
+			t.Errorf("sessionsByID[%q] = %q, %t, expected %q", sesh.sesh.ID(), wu.name(), ok, n)
 		}
 	}
 	for id, wu := range st.sessionsByID {