Merge origin/main into fix/205-address-claude-startup-issues

Resolved conflict in internal/witness/manager.go:
- Kept session import (used by PR code)
- Kept PR's more accurate comment for PID check
- Removed duplicate sessionName method introduced by merge

internal/witness/manager.go

@@ -59,6 +59,11 @@ func (m *Manager) saveState(w *Witness) error {
 	return m.stateManager.Save(w)
 }
 
+// sessionName returns the tmux session name for this witness.
+func (m *Manager) sessionName() string {
+	return fmt.Sprintf("gt-%s-witness", m.rig.Name)
+}
+
 // Status returns the current witness status.
 // ZFC-compliant: trusts agent-reported state, no PID inference.
 // The daemon reads agent bead state for liveness checks.
@@ -74,11 +79,6 @@ func (m *Manager) Status() (*Witness, error) {
 	return w, nil
 }
 
-// sessionName returns the tmux session name for this witness.
-func (m *Manager) sessionName() string {
-	return fmt.Sprintf("gt-%s-witness", m.rig.Name)
-}
-
 // witnessDir returns the working directory for the witness.
 // Prefers witness/rig/, falls back to witness/, then rig root.
 func (m *Manager) witnessDir() string {