Fix hooks sync template agent resolution

Author: seanwessmith

internal/cmd/hooks_sync.go

@@ -127,7 +127,7 @@ func runHooksSync(cmd *cobra.Command, args []string) error {
 			if loc.Rig != "" {
 				rigPath = filepath.Join(townRoot, loc.Rig)
 			}
-			rc := config.ResolveRoleAgentConfig(loc.Role, townRoot, rigPath)
+			rc := config.ResolveRoleConfiguredAgentConfig(loc.Role, townRoot, rigPath)
 			if rc == nil || rc.Hooks == nil || rc.Hooks.Provider == "" {
 				continue
 			}

internal/cmd/patrol_helpers_test.go

@@ -134,6 +134,8 @@ func TestBuildRefineryPatrolVars_FullConfig(t *testing.T) {
 		"run_tests":                           "true",
 		"target_branch":                       "main",
 		"delete_merged_branches":              "true",
+		"judgment_enabled":                    "false",
+		"review_depth":                        "standard",
 	}
 
 	varMap := make(map[string]string)
@@ -299,8 +301,8 @@ func TestBuildRefineryPatrolVars_BoolFormat(t *testing.T) {
 	trueVal := true
 	falseVal2 := false
 	mq := &config.MergeQueueConfig{
-		Enabled:                         true,
-		IntegrationBranchAutoLand:       &trueVal,
+		Enabled:                          true,
+		IntegrationBranchAutoLand:        &trueVal,
 		IntegrationBranchRefineryEnabled: &trueVal,
 		RunTests:                         &trueVal,
 		SetupCommand:                     "npm ci",

internal/config/loader.go

@@ -1698,6 +1698,73 @@ func ResolveRoleAgentName(role, townRoot, rigPath string) (agentName string, isR
 	return "claude", false
 }
 
+// ResolveRoleConfiguredAgentConfig returns the configured agent for a role
+// without requiring its binary to exist in PATH. This is for config-driven
+// flows like hooks sync and doctor checks that need the intended provider and
+// template even before the runtime is installed locally.
+func ResolveRoleConfiguredAgentConfig(role, townRoot, rigPath string) *RuntimeConfig {
+	var rigSettings *RigSettings
+	if rigPath != "" {
+		var err error
+		rigSettings, err = LoadRigSettings(RigSettingsPath(rigPath))
+		if err != nil {
+			rigSettings = nil
+		}
+	}
+
+	townSettings, err := LoadOrCreateTownSettings(TownSettingsPath(townRoot))
+	if err != nil {
+		townSettings = NewTownSettings()
+	}
+
+	_ = LoadAgentRegistry(DefaultAgentRegistryPath(townRoot))
+	if rigPath != "" {
+		_ = LoadRigAgentRegistry(RigAgentRegistryPath(rigPath))
+	}
+
+	resolveNamed := func(agentName string) *RuntimeConfig {
+		if agentName == "" {
+			return nil
+		}
+		rc := lookupAgentConfigIfExists(agentName, townSettings, rigSettings)
+		if rc == nil {
+			return nil
+		}
+		rc.ResolvedAgent = agentName
+		return rc
+	}
+
+	if rigSettings != nil && rigSettings.RoleAgents != nil {
+		if agentName, ok := rigSettings.RoleAgents[role]; ok && agentName != "" {
+			if rc := resolveNamed(agentName); rc != nil {
+				return rc
+			}
+		}
+	}
+
+	if townSettings.RoleAgents != nil {
+		if agentName, ok := townSettings.RoleAgents[role]; ok && agentName != "" {
+			if rc := resolveNamed(agentName); rc != nil {
+				return rc
+			}
+		}
+	}
+
+	if rigSettings != nil && rigSettings.Agent != "" {
+		if rc := resolveNamed(rigSettings.Agent); rc != nil {
+			return rc
+		}
+	}
+
+	if townSettings.DefaultAgent != "" {
+		if rc := resolveNamed(townSettings.DefaultAgent); rc != nil {
+			return rc
+		}
+	}
+
+	return DefaultRuntimeConfig()
+}
+
 // lookupAgentConfig looks up an agent by name.
 // Checks rig-level custom agents first, then town's custom agents, then built-in presets from agents.go.
 // Falls back to DefaultRuntimeConfig() if no match is found.

internal/doctor/hooks_sync_check.go

@@ -99,7 +99,7 @@ func (c *HooksSyncCheck) Run(ctx *CheckContext) *CheckResult {
 			if loc.Rig != "" {
 				rigPath = filepath.Join(ctx.TownRoot, loc.Rig)
 			}
-			rc := config.ResolveRoleAgentConfig(loc.Role, ctx.TownRoot, rigPath)
+			rc := config.ResolveRoleConfiguredAgentConfig(loc.Role, ctx.TownRoot, rigPath)
 			if rc == nil || rc.Hooks == nil || rc.Hooks.Provider == "" {
 				continue
 			}