diff --git a/pkg/agent/loop.go b/pkg/agent/loop.go
index 0edb4fd24..015e1a149 100644
--- a/pkg/agent/loop.go
+++ b/pkg/agent/loop.go
@@ -1176,7 +1176,8 @@ func (al *AgentLoop) runAgentLoop(ctx context.Context, agent *AgentInstance, opt
 
 		// 5a. Auto-advance plan phases after LLM iteration
 		postStatus := agent.ContextBuilder.GetPlanStatus()
-		if !agent.ContextBuilder.HasActivePlan() || !(postStatus == "executing" || postStatus == "review" || postStatus == "completed") {
+		if !agent.ContextBuilder.HasActivePlan() ||
+			!(postStatus == "executing" || postStatus == "review" || postStatus == "completed") {
 			break
 		}
 
@@ -2739,7 +2740,7 @@ func (al *AgentLoop) runLLMIteration(
 			if reminder, ok := buildOrchReminder(iteration); ok {
 				messages = append(messages, reminder)
 				logger.DebugCF("agent", "Injected orchestration nudge",
-					map[string]interface{}{
+					map[string]any{
 						"agent_id":  agent.ID,
 						"iteration": iteration,
 					})
diff --git a/pkg/tools/spawn.go b/pkg/tools/spawn.go
index fe1bb5259..e83157616 100644
--- a/pkg/tools/spawn.go
+++ b/pkg/tools/spawn.go
@@ -94,7 +94,10 @@ func (t *SpawnTool) Execute(ctx context.Context, args map[string]any) *ToolResul
 
 	// Validate preset name if provided
 	if preset != "" && !IsValidPreset(Preset(preset)) {
-		return ErrorResult(fmt.Sprintf("preset %q is not valid. Available presets: scout, analyst, coder, worker, coordinator", preset))
+		return ErrorResult(fmt.Sprintf(
+			"preset %q is not valid. Available presets: scout, analyst, coder, worker, coordinator",
+			preset,
+		))
 	}
 
 	if t.manager == nil {