fix: Make Mayor/Deacon session names include town name
Session names `gt-mayor` and `gt-deacon` were hardcoded, causing tmux
session name collisions when running multiple towns simultaneously.
Changed to `gt-{town}-mayor` and `gt-{town}-deacon` format (e.g.,
`gt-ai-mayor`) to allow concurrent multi-town operation.
Key changes:
- session.MayorSessionName() and DeaconSessionName() now take townName param
- Added workspace.GetTownName() helper to load town name from config
- Updated all callers in cmd/, daemon/, doctor/, mail/, rig/, templates/
- Updated tests with new session name format
- Bead IDs remain unchanged (already scoped by .beads/ directory)
Fixes #60
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -52,13 +52,17 @@ func runStatusLine(cmd *cobra.Command, args []string) error {
|
||||
role = os.Getenv("GT_ROLE")
|
||||
}
|
||||
|
||||
// Get session names for comparison
|
||||
mayorSession, _ := getMayorSessionName()
|
||||
deaconSession, _ := getDeaconSessionName()
|
||||
|
||||
// Determine identity and output based on role
|
||||
if role == "mayor" || statusLineSession == "gt-mayor" {
|
||||
if role == "mayor" || statusLineSession == mayorSession {
|
||||
return runMayorStatusLine(t)
|
||||
}
|
||||
|
||||
// Deacon status line
|
||||
if role == "deacon" || statusLineSession == "gt-deacon" {
|
||||
if role == "deacon" || statusLineSession == deaconSession {
|
||||
return runDeaconStatusLine(t)
|
||||
}
|
||||
|
||||
@@ -160,7 +164,8 @@ func runMayorStatusLine(t *tmux.Tmux) error {
|
||||
|
||||
// Get town root from mayor pane's working directory
|
||||
var townRoot string
|
||||
paneDir, err := t.GetPaneWorkDir("gt-mayor")
|
||||
mayorSession, _ := getMayorSessionName()
|
||||
paneDir, err := t.GetPaneWorkDir(mayorSession)
|
||||
if err == nil && paneDir != "" {
|
||||
townRoot, _ = workspace.Find(paneDir)
|
||||
}
|
||||
@@ -236,7 +241,8 @@ func runDeaconStatusLine(t *tmux.Tmux) error {
|
||||
|
||||
// Get town root from deacon pane's working directory
|
||||
var townRoot string
|
||||
paneDir, err := t.GetPaneWorkDir("gt-deacon")
|
||||
deaconSession, _ := getDeaconSessionName()
|
||||
paneDir, err := t.GetPaneWorkDir(deaconSession)
|
||||
if err == nil && paneDir != "" {
|
||||
townRoot, _ = workspace.Find(paneDir)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user