refactor(assistant): split runtime concerns

internal/assistant/client_test.go

@@ -110,7 +110,6 @@ func TestParseSSEResultFailureCases(t *testing.T) {
 	}
 
 	for _, testCase := range tests {
-		testCase := testCase
 		t.Run(testCase.name, func(t *testing.T) {
 			t.Parallel()
 

internal/assistant/context_usage.go

@@ -1,13 +1,13 @@
 package assistant
 
+import "maps"
+
 func cloneIntMapForUsage(values map[string]int) map[string]int {
 	if len(values) == 0 {
 		return nil
 	}
 	cloned := make(map[string]int, len(values))
-	for key, value := range values {
-		cloned[key] = value
-	}
+	maps.Copy(cloned, values)
 
 	return cloned
 }

internal/assistant/lifecycle.go

@@ -3,6 +3,7 @@ package assistant
 import (
 	"context"
 	"log/slog"
+	"maps"
 
 	"github.com/omarluq/librecode/internal/database"
 	"github.com/omarluq/librecode/internal/extension"
@@ -319,9 +320,7 @@ func contextBuildLifecyclePayload(
 
 func cloneAnyMap(values map[string]any) map[string]any {
 	cloned := make(map[string]any, len(values))
-	for key, value := range values {
-		cloned[key] = value
-	}
+	maps.Copy(cloned, values)
 
 	return cloned
 }

internal/assistant/lifecycle_diagnostics.go

@@ -3,6 +3,7 @@ package assistant
 import (
 	"context"
 	"fmt"
+	"maps"
 	"sort"
 	"time"
 
@@ -29,9 +30,7 @@ func (runtime *Runtime) emitLifecycleDiagnostics(
 	if len(result.Errors) > 0 {
 		payload[lifecycleErrorsKey] = append([]string{}, result.Errors...)
 	}
-	for key, value := range extra {
-		payload[key] = value
-	}
+	maps.Copy(payload, extra)
 
 	runtime.emit(ctx, string(name)+"_diagnostic", payload)
 }

internal/assistant/provider_hooks.go

@@ -2,6 +2,7 @@ package assistant
 
 import (
 	"context"
+	"maps"
 	"strings"
 
 	"github.com/samber/oops"
@@ -138,9 +139,7 @@ func providerPayloadFromLifecycle(payload, fallback map[string]any) map[string]a
 
 func mergeProviderHeaders(headers, additions map[string]string) map[string]string {
 	merged := cloneStringMap(headers)
-	for key, value := range additions {
-		merged[key] = value
-	}
+	maps.Copy(merged, additions)
 
 	return merged
 }
@@ -176,9 +175,7 @@ func cloneStringMap(values map[string]string) map[string]string {
 		return map[string]string{}
 	}
 	cloned := make(map[string]string, len(values))
-	for key, value := range values {
-		cloned[key] = value
-	}
+	maps.Copy(cloned, values)
 
 	return cloned
 }

internal/assistant/retry.go

@@ -98,24 +98,37 @@ func ShouldRetryModelError(err error) bool {
 	if errors.Is(err, context.DeadlineExceeded) {
 		return retryableDeadlineExceeded(message)
 	}
-	if code, ok := providerErrorCode(err); ok {
-		if nonRetryableProviderCode(code) {
-			return false
-		}
-		if retryableProviderCode(code) {
-			return true
-		}
+	if retry, ok := retryDecisionFromProviderCode(err); ok {
+		return retry
 	}
 	if status, ok := providerErrorStatus(err); ok {
 		return retryableStatus(status)
 	}
-	var netErr net.Error
-	if errors.As(err, &netErr) {
+	if retryableNetworkError(err) {
 		return true
 	}
 	return retryableProviderMessage(message)
 }
 
+func retryDecisionFromProviderCode(err error) (retry, known bool) {
+	code, ok := providerErrorCode(err)
+	if !ok {
+		return false, false
+	}
+	if nonRetryableProviderCode(code) {
+		return false, true
+	}
+	if retryableProviderCode(code) {
+		return true, true
+	}
+	return false, false
+}
+
+func retryableNetworkError(err error) bool {
+	netErr, ok := errors.AsType[net.Error](err)
+	return ok && netErr != nil
+}
+
 func retryableDeadlineExceeded(message string) bool {
 	// Match provider/client timeout details, not wrapper call-site labels such as
 	// "request provider response", so caller-owned deadlines remain non-retryable.