fix(hooks): discover crew-level and polecats-level settings
The `gt hooks` command was not discovering settings at: - <rig>/crew/.claude/settings.json (crew-level, inherited by all members) - <rig>/polecats/.claude/settings.json (polecats-level) This caused confusion when debugging hooks since Claude Code inherits from parent directories, so hooks were executing but not shown by `gt hooks`. Also fixed: skip .claude directories when iterating crew members. Fixes: gh-735 Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
committed by
beads/crew/emma
parent
232fc79cd5
commit
493507ad4e
@@ -135,8 +135,14 @@ func discoverHooks(townRoot string) ([]HookInfo, error) {
|
|||||||
agent string
|
agent string
|
||||||
}{filepath.Join(rigPath, ".claude", "settings.json"), fmt.Sprintf("%s/rig", rigName)})
|
}{filepath.Join(rigPath, ".claude", "settings.json"), fmt.Sprintf("%s/rig", rigName)})
|
||||||
|
|
||||||
// Polecats
|
// Polecats-level hooks (inherited by all polecats)
|
||||||
polecatsDir := filepath.Join(rigPath, "polecats")
|
polecatsDir := filepath.Join(rigPath, "polecats")
|
||||||
|
locations = append(locations, struct {
|
||||||
|
path string
|
||||||
|
agent string
|
||||||
|
}{filepath.Join(polecatsDir, ".claude", "settings.json"), fmt.Sprintf("%s/polecats", rigName)})
|
||||||
|
|
||||||
|
// Individual polecat hooks
|
||||||
if polecats, err := os.ReadDir(polecatsDir); err == nil {
|
if polecats, err := os.ReadDir(polecatsDir); err == nil {
|
||||||
for _, p := range polecats {
|
for _, p := range polecats {
|
||||||
if p.IsDir() && !strings.HasPrefix(p.Name(), ".") {
|
if p.IsDir() && !strings.HasPrefix(p.Name(), ".") {
|
||||||
@@ -148,11 +154,17 @@ func discoverHooks(townRoot string) ([]HookInfo, error) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Crew members
|
// Crew-level hooks (inherited by all crew members)
|
||||||
crewDir := filepath.Join(rigPath, "crew")
|
crewDir := filepath.Join(rigPath, "crew")
|
||||||
|
locations = append(locations, struct {
|
||||||
|
path string
|
||||||
|
agent string
|
||||||
|
}{filepath.Join(crewDir, ".claude", "settings.json"), fmt.Sprintf("%s/crew", rigName)})
|
||||||
|
|
||||||
|
// Individual crew member hooks
|
||||||
if crew, err := os.ReadDir(crewDir); err == nil {
|
if crew, err := os.ReadDir(crewDir); err == nil {
|
||||||
for _, c := range crew {
|
for _, c := range crew {
|
||||||
if c.IsDir() {
|
if c.IsDir() && !strings.HasPrefix(c.Name(), ".") {
|
||||||
locations = append(locations, struct {
|
locations = append(locations, struct {
|
||||||
path string
|
path string
|
||||||
agent string
|
agent string
|
||||||
|
|||||||
@@ -133,3 +133,82 @@ func TestParseHooksFileEmptyHooks(t *testing.T) {
|
|||||||
t.Errorf("expected 0 hooks, got %d", len(hooks))
|
t.Errorf("expected 0 hooks, got %d", len(hooks))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestDiscoverHooksCrewLevel(t *testing.T) {
|
||||||
|
// Create a temp directory structure simulating a Gas Town workspace
|
||||||
|
tmpDir := t.TempDir()
|
||||||
|
|
||||||
|
// Create rig structure with crew-level and polecats-level settings
|
||||||
|
rigName := "testrig"
|
||||||
|
rigDir := filepath.Join(tmpDir, rigName)
|
||||||
|
|
||||||
|
// Create crew-level settings (inherited by all crew members)
|
||||||
|
crewClaudeDir := filepath.Join(rigDir, "crew", ".claude")
|
||||||
|
if err := os.MkdirAll(crewClaudeDir, 0755); err != nil {
|
||||||
|
t.Fatalf("failed to create crew/.claude dir: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
crewSettings := ClaudeSettings{
|
||||||
|
Hooks: map[string][]ClaudeHookMatcher{
|
||||||
|
"SessionStart": {
|
||||||
|
{
|
||||||
|
Matcher: "",
|
||||||
|
Hooks: []ClaudeHook{
|
||||||
|
{Type: "command", Command: "crew-level-hook"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
crewData, _ := json.Marshal(crewSettings)
|
||||||
|
if err := os.WriteFile(filepath.Join(crewClaudeDir, "settings.json"), crewData, 0644); err != nil {
|
||||||
|
t.Fatalf("failed to write crew settings: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create polecats-level settings (inherited by all polecats)
|
||||||
|
polecatsClaudeDir := filepath.Join(rigDir, "polecats", ".claude")
|
||||||
|
if err := os.MkdirAll(polecatsClaudeDir, 0755); err != nil {
|
||||||
|
t.Fatalf("failed to create polecats/.claude dir: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
polecatsSettings := ClaudeSettings{
|
||||||
|
Hooks: map[string][]ClaudeHookMatcher{
|
||||||
|
"PreToolUse": {
|
||||||
|
{
|
||||||
|
Matcher: "",
|
||||||
|
Hooks: []ClaudeHook{
|
||||||
|
{Type: "command", Command: "polecats-level-hook"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
polecatsData, _ := json.Marshal(polecatsSettings)
|
||||||
|
if err := os.WriteFile(filepath.Join(polecatsClaudeDir, "settings.json"), polecatsData, 0644); err != nil {
|
||||||
|
t.Fatalf("failed to write polecats settings: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Discover hooks
|
||||||
|
hooks, err := discoverHooks(tmpDir)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("discoverHooks failed: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Verify crew-level hook was discovered
|
||||||
|
var foundCrewLevel, foundPolecatsLevel bool
|
||||||
|
for _, h := range hooks {
|
||||||
|
if h.Agent == "testrig/crew" && len(h.Commands) > 0 && h.Commands[0] == "crew-level-hook" {
|
||||||
|
foundCrewLevel = true
|
||||||
|
}
|
||||||
|
if h.Agent == "testrig/polecats" && len(h.Commands) > 0 && h.Commands[0] == "polecats-level-hook" {
|
||||||
|
foundPolecatsLevel = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if !foundCrewLevel {
|
||||||
|
t.Error("expected crew-level hook to be discovered (testrig/crew)")
|
||||||
|
}
|
||||||
|
if !foundPolecatsLevel {
|
||||||
|
t.Error("expected polecats-level hook to be discovered (testrig/polecats)")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user