refactor: improve code readability and consistency across multiple files

pkg/agent/subturn.go

@@ -138,11 +138,11 @@ type SubTurnConfig struct {
 	//   - Critical=false: SubTurn exits gracefully without error
 	//
 	// When parent finishes with hard abort (Finish(true)):
-	//   - All SubTurns are cancelled regardless of Critical flag
+	//   - All SubTurns are canceled regardless of Critical flag
 	Critical bool
 
 	// Timeout is the maximum duration for this SubTurn.
-	// If the SubTurn runs longer than this, it will be cancelled.
+	// If the SubTurn runs longer than this, it will be canceled.
 	// Default is 5 minutes (defaultSubTurnTimeout) if not specified.
 	Timeout time.Duration
 
@@ -177,6 +177,8 @@ type SubTurnConfig struct {
 }
 
 // ====================== Sub-turn Events (Aligned with EventBus) ======================
+
+// SubTurnSpawnEvent is emitted when a child sub-turn is started.
 type SubTurnSpawnEvent struct {
 	ParentID string
 	ChildID  string
@@ -232,10 +234,15 @@ type AgentLoopSpawner struct {
 }
 
 // SpawnSubTurn implements tools.SubTurnSpawner interface.
-func (s *AgentLoopSpawner) SpawnSubTurn(ctx context.Context, cfg tools.SubTurnConfig) (*tools.ToolResult, error) {
+func (s *AgentLoopSpawner) SpawnSubTurn(
+	ctx context.Context,
+	cfg tools.SubTurnConfig,
+) (*tools.ToolResult, error) {
 	parentTS := turnStateFromContext(ctx)
 	if parentTS == nil {
-		return nil, errors.New("parent turnState not found in context - cannot spawn sub-turn outside of a turn")
+		return nil, errors.New(
+			"parent turnState not found in context - cannot spawn sub-turn outside of a turn",
+		)
 	}
 
 	// Convert tools.SubTurnConfig to agent.SubTurnConfig
@@ -266,18 +273,27 @@ func NewSubTurnSpawner(al *AgentLoop) *AgentLoopSpawner {
 func SpawnSubTurn(ctx context.Context, cfg SubTurnConfig) (*tools.ToolResult, error) {
 	al := AgentLoopFromContext(ctx)
 	if al == nil {
-		return nil, errors.New("AgentLoop not found in context - ensure context is properly initialized")
+		return nil, errors.New(
+			"AgentLoop not found in context - ensure context is properly initialized",
+		)
 	}
 
 	parentTS := turnStateFromContext(ctx)
 	if parentTS == nil {
-		return nil, errors.New("parent turnState not found in context - cannot spawn sub-turn outside of a turn")
+		return nil, errors.New(
+			"parent turnState not found in context - cannot spawn sub-turn outside of a turn",
+		)
 	}
 
 	return spawnSubTurn(ctx, al, parentTS, cfg)
 }
 
-func spawnSubTurn(ctx context.Context, al *AgentLoop, parentTS *turnState, cfg SubTurnConfig) (result *tools.ToolResult, err error) {
+func spawnSubTurn(
+	ctx context.Context,
+	al *AgentLoop,
+	parentTS *turnState,
+	cfg SubTurnConfig,
+) (result *tools.ToolResult, err error) {
 	// Get effective SubTurn configuration
 	rtCfg := al.getSubTurnConfig()
 
@@ -512,7 +528,12 @@ func deliverSubTurnResult(parentTS *turnState, childID string, result *tools.Too
 //   - Injects recovery prompt asking for shorter response
 //   - Retries up to 2 times
 //   - Handles cases where max_tokens is hit
-func runTurn(ctx context.Context, al *AgentLoop, ts *turnState, cfg SubTurnConfig) (*tools.ToolResult, error) {
+func runTurn(
+	ctx context.Context,
+	al *AgentLoop,
+	ts *turnState,
+	cfg SubTurnConfig,
+) (*tools.ToolResult, error) {
 	// Derive candidates from the requested model using the parent loop's provider.
 	defaultProvider := al.GetConfig().Agents.Defaults.Provider
 	candidates := providers.ResolveCandidates(
@@ -639,7 +660,11 @@ func runTurn(ctx context.Context, al *AgentLoop, ts *turnState, cfg SubTurnConfi
 						"retries":     contextRetryCount,
 						"max_retries": maxContextRetries,
 					})
-				return nil, fmt.Errorf("context limit exceeded after %d retries: %w", maxContextRetries, err)
+				return nil, fmt.Errorf(
+					"context limit exceeded after %d retries: %w",
+					maxContextRetries,
+					err,
+				)
 			}
 
 			logger.WarnCF("subturn", "Context length exceeded, compressing and retrying",

pkg/agent/subturn_test.go

@@ -434,15 +434,9 @@ func TestHardAbortCascading(t *testing.T) {
 	childCtx, childCancel := context.WithCancel(rootTS.ctx)
 	defer childCancel()
 	childTS := &turnState{
-		ctx:            childCtx,
-		cancelFunc:     childCancel,
-		turnID:         "child-1",
-		parentTurnID:   sessionKey,
-		depth:          1,
-		session:        &ephemeralSessionStore{},
-		pendingResults: make(chan *tools.ToolResult, 16),
-		concurrencySem: make(chan struct{}, 5),
+		ctx: childCtx,
 	}
+	_ = childCancel
 
 	// Attach cancelFunc to rootTS so Finish() can trigger it
 	rootTS.cancelFunc = parentCancel
@@ -1556,29 +1550,17 @@ func TestGrandchildAbort_CascadingCancellation(t *testing.T) {
 	parentCtx, parentCancel := context.WithCancel(grandparentTS.ctx)
 	defer parentCancel()
 	parentTS := &turnState{
-		ctx:            parentCtx,
-		turnID:         "parent",
-		parentTurnID:   "grandparent",
-		depth:          1,
-		session:        newEphemeralSession(nil),
-		pendingResults: make(chan *tools.ToolResult, 16),
-		concurrencySem: make(chan struct{}, testMaxConcurrentSubTurns),
+		ctx: parentCtx,
 	}
-	parentTS.cancelFunc = parentCancel
+	_ = parentCancel
 
 	// Create grandchild turn (depth 2) as child of parent
 	childCtx, childCancel := context.WithCancel(parentTS.ctx)
 	defer childCancel()
 	childTS := &turnState{
-		ctx:            childCtx,
-		turnID:         "grandchild",
-		parentTurnID:   "parent",
-		depth:          2,
-		session:        newEphemeralSession(nil),
-		pendingResults: make(chan *tools.ToolResult, 16),
-		concurrencySem: make(chan struct{}, testMaxConcurrentSubTurns),
+		ctx: childCtx,
 	}
-	childTS.cancelFunc = childCancel
+	_ = childCancel
 
 	// Verify all contexts are active
 	select {

pkg/agent/turn_state.go

@@ -165,7 +165,16 @@ func (al *AgentLoop) FormatTree(turnInfo *TurnInfo, prefix string, isLast bool)
 		orphanMarker = " (Orphaned)"
 	}
 
-	fmt.Fprintf(&sb, "%s%s[%s] Depth:%d (%s)%s\n", prefix, marker, turnInfo.TurnID, turnInfo.Depth, status, orphanMarker)
+	fmt.Fprintf(
+		&sb,
+		"%s%s[%s] Depth:%d (%s)%s\n",
+		prefix,
+		marker,
+		turnInfo.TurnID,
+		turnInfo.Depth,
+		status,
+		orphanMarker,
+	)
 
 	// Prepare prefix for children
 	childPrefix := prefix