Merge remote-tracking branch 'origin/main' into kai/review/pr-50-kiro

# Conflicts:
#	internal/runtime/executor/kiro_executor.go

Author: kaitranntt

.github/workflows/upstream-sync.yml

@@ -372,6 +372,7 @@ jobs:
               --repo "${{ github.repository }}" \
               --title "${ISSUE_TITLE}" \
               --label "${TRACKING_ISSUE_LABEL}" \
+              --assignee "${{ github.repository_owner }}" \
               --body "${ISSUE_BODY}" || exit 1
           fi
           set -e

internal/runtime/executor/kiro_executor.go

@@ -1706,20 +1706,20 @@ func (e *KiroExecutor) mapModelToKiro(model string) string {
 		"claude-sonnet-4-20250514":   "claude-sonnet-4",
 		"auto":                       "auto",
 		// Agentic variants (same backend model IDs, but with special system prompt)
-		"claude-opus-4.7-agentic":            "claude-opus-4.7",
-		"claude-opus-4.6-agentic":            "claude-opus-4.6",
-		"claude-sonnet-4.6-agentic":          "claude-sonnet-4.6",
-		"claude-opus-4.5-agentic":            "claude-opus-4.5",
-		"claude-sonnet-4.5-agentic":          "claude-sonnet-4.5",
-		"claude-sonnet-4-agentic":            "claude-sonnet-4",
-		"claude-haiku-4.5-agentic":           "claude-haiku-4.5",
-		"kiro-claude-opus-4-7-agentic":       "claude-opus-4.7",
-		"kiro-claude-opus-4-6-agentic":       "claude-opus-4.6",
-		"kiro-claude-sonnet-4-6-agentic":     "claude-sonnet-4.6",
-		"kiro-claude-opus-4-5-agentic":       "claude-opus-4.5",
-		"kiro-claude-sonnet-4-5-agentic":     "claude-sonnet-4.5",
-		"kiro-claude-sonnet-4-agentic":       "claude-sonnet-4",
-		"kiro-claude-haiku-4-5-agentic":      "claude-haiku-4.5",
+		"claude-opus-4.7-agentic":        "claude-opus-4.7",
+		"claude-opus-4.6-agentic":        "claude-opus-4.6",
+		"claude-sonnet-4.6-agentic":      "claude-sonnet-4.6",
+		"claude-opus-4.5-agentic":        "claude-opus-4.5",
+		"claude-sonnet-4.5-agentic":      "claude-sonnet-4.5",
+		"claude-sonnet-4-agentic":        "claude-sonnet-4",
+		"claude-haiku-4.5-agentic":       "claude-haiku-4.5",
+		"kiro-claude-opus-4-7-agentic":   "claude-opus-4.7",
+		"kiro-claude-opus-4-6-agentic":   "claude-opus-4.6",
+		"kiro-claude-sonnet-4-6-agentic": "claude-sonnet-4.6",
+		"kiro-claude-opus-4-5-agentic":   "claude-opus-4.5",
+		"kiro-claude-sonnet-4-5-agentic": "claude-sonnet-4.5",
+		"kiro-claude-sonnet-4-agentic":   "claude-sonnet-4",
+		"kiro-claude-haiku-4-5-agentic":  "claude-haiku-4.5",
 	}
 	if kiroID, ok := modelMap[model]; ok {
 		return kiroID