feat: per-phase timeouts — each phase has its own tuned timeout

plan=8m, implement=40m, pr=3m, review=10m, merge=12m, communicate=10m.
Previously all phases shared a single 30m timeout which was too long for
fast phases (PR/plan) and too short for slow ones (implement with parallel tasks).

Author: Patel230

internal/evolution/git.go

@@ -252,12 +252,37 @@ func (e *Engine) runTests(ctx context.Context) (string, error) {
 	return e.toolMap["run_tests"].Execute(ctx, nil)
 }
 
-// defaultPhaseTimeout is the maximum duration for any evolution phase.
-const defaultPhaseTimeout = 30 * time.Minute
+// Per-phase timeouts tuned to each phase's actual workload.
+const (
+	timeoutPlan      = 8 * time.Minute  // read + plan only, no code changes
+	timeoutImplement = 40 * time.Minute // one timeout covers all parallel tasks
+	timeoutPR        = 3 * time.Minute  // git + gh CLI only
+	timeoutReview    = 10 * time.Minute // diff read + agent review
+	timeoutMerge     = 12 * time.Minute // merge + CI poll (short, CI poll has its own 10m timer)
+	timeoutCommunicate = 10 * time.Minute // journal + issue comments + learnings
+)
 
-// withTimeout wraps a context with the default phase timeout.
+// withTimeout wraps a context with the default phase timeout (kept for legacy callers).
 func withTimeout(ctx context.Context) (context.Context, context.CancelFunc) {
-	return context.WithTimeout(ctx, defaultPhaseTimeout)
+	return context.WithTimeout(ctx, timeoutImplement)
+}
+
+// withPhaseTimeout wraps a context with the timeout for a specific named phase.
+func withPhaseTimeout(ctx context.Context, phase string) (context.Context, context.CancelFunc) {
+	d := timeoutImplement
+	switch phase {
+	case "plan":
+		d = timeoutPlan
+	case "pr":
+		d = timeoutPR
+	case "review":
+		d = timeoutReview
+	case "merge":
+		d = timeoutMerge
+	case "communicate":
+		d = timeoutCommunicate
+	}
+	return context.WithTimeout(ctx, d)
 }
 
 func (e *Engine) revert(ctx context.Context) error {

internal/evolution/phases.go

@@ -17,7 +17,7 @@ const maxParallelTasks = 3
 
 // RunPlanPhase runs the planning phase. Creates SESSION_PLAN.md via agent or fallback.
 func (e *Engine) RunPlanPhase(ctx context.Context, p iteragent.Provider, issues string) error {
-	ctx, cancel := withTimeout(ctx)
+	ctx, cancel := withPhaseTimeout(ctx, "plan")
 	defer cancel()
 
 	identity, journal, day := readPlanContext(e.repoPath)
@@ -149,7 +149,7 @@ func appendPlanContext(sb *strings.Builder, learnings []byte, journal string, is
 
 // RunImplementPhase reads SESSION_PLAN.md and executes tasks.
 func (e *Engine) RunImplementPhase(ctx context.Context, p iteragent.Provider) error {
-	ctx, cancel := withTimeout(ctx)
+	ctx, cancel := withPhaseTimeout(ctx, "implement")
 	defer cancel()
 
 	planBytes, err := os.ReadFile(filepath.Join(e.repoPath, "SESSION_PLAN.md"))

internal/evolution/phases_communicate.go

@@ -17,7 +17,7 @@ import (
 
 // RunCommunicatePhase writes journal, posts issue comments, records learnings.
 func (e *Engine) RunCommunicatePhase(ctx context.Context, p iteragent.Provider) error {
-	ctx, cancel := withTimeout(ctx)
+	ctx, cancel := withPhaseTimeout(ctx, "communicate")
 	defer cancel()
 
 	planBytes, err := os.ReadFile(filepath.Join(e.repoPath, "SESSION_PLAN.md"))

internal/evolution/phases_pr.go

@@ -14,7 +14,7 @@ import (
 // RunPRPhase creates a feature branch from the current HEAD, pushes it, and opens a PR.
 // It is designed to run after RunImplementPhase has already committed changes to main.
 func (e *Engine) RunPRPhase(ctx context.Context) error {
-	ctx, cancel := withTimeout(ctx)
+	ctx, cancel := withPhaseTimeout(ctx, "pr")
 	defer cancel()
 
 	day := e.readDayCount()
@@ -85,7 +85,7 @@ func (e *Engine) RunPRPhase(ctx context.Context) error {
 
 // RunReviewPhase runs an AI self-review of the open PR.
 func (e *Engine) RunReviewPhase(ctx context.Context, p iteragent.Provider) error {
-	ctx, cancel := withTimeout(ctx)
+	ctx, cancel := withPhaseTimeout(ctx, "review")
 	defer cancel()
 
 	if e.prNumber == 0 {
@@ -107,7 +107,7 @@ func (e *Engine) RunReviewPhase(ctx context.Context, p iteragent.Provider) error
 
 // RunMergePhase merges the open PR, clears state, and returns to main.
 func (e *Engine) RunMergePhase(ctx context.Context) error {
-	ctx, cancel := withTimeout(ctx)
+	ctx, cancel := withPhaseTimeout(ctx, "merge")
 	defer cancel()
 
 	if e.prNumber == 0 {