merge: resolve conflicts with origin/main (PR #205 overlap)

PR #205 merged the same autoresearch content. Keep our branch versions
for files with additional review-round fixes. Apply our two INDEX.json
edits (deprecation wording, pairs_with simplification) on top of main's
formatting.

Author: notque

agents/INDEX.json

@@ -112,23 +112,6 @@
       "complexity": "Medium",
       "category": "meta"
     },
-    "golang-general-engineer-compact": {
-      "file": "golang-general-engineer-compact.md",
-      "short_description": "Use this agent for focused Go development with tight context budgets",
-      "triggers": [
-        "go",
-        "golang",
-        "tight context",
-        "compact",
-        "focused go"
-      ],
-      "pairs_with": [
-        "go-pr-quality-gate",
-        "go-testing"
-      ],
-      "complexity": "Medium-Complex",
-      "category": "language"
-    },
     "golang-general-engineer": {
       "file": "golang-general-engineer.md",
       "short_description": "Use this agent when you need expert assistance with Go development, including implementing features,\ndebugging issues, reviewing code quality, optimizing performance, or answering technical questions\nabout Go codebases",
@@ -148,6 +131,23 @@
       "complexity": "Medium-Complex",
       "category": "language"
     },
+    "golang-general-engineer-compact": {
+      "file": "golang-general-engineer-compact.md",
+      "short_description": "Use this agent for focused Go development with tight context budgets",
+      "triggers": [
+        "go",
+        "golang",
+        "tight context",
+        "compact",
+        "focused go"
+      ],
+      "pairs_with": [
+        "go-pr-quality-gate",
+        "go-testing"
+      ],
+      "complexity": "Medium-Complex",
+      "category": "language"
+    },
     "hook-development-engineer": {
       "file": "hook-development-engineer.md",
       "short_description": "Use this agent when developing Python hooks for Claude Code's event-driven system",
@@ -170,7 +170,7 @@
     },
     "kotlin-general-engineer": {
       "file": "kotlin-general-engineer.md",
-      "short_description": "Use this agent when you need expert assistance with Kotlin development, including implementing\nfeatures, debugging issues, reviewing code quality, optimizing coroutine usage, or answering\ntechnical questions about Kotlin codebases",
+      "short_description": "Use this agent when you need expert assistance with Kotlin development, including implementing features, debugging issues, reviewing code quality, optimizing coroutine usage, or answering technical questions about Kotlin codebases",
       "triggers": [
         "kotlin",
         "ktor",
@@ -381,7 +381,7 @@
     },
     "php-general-engineer": {
       "file": "php-general-engineer.md",
-      "short_description": "Use this agent when you need expert assistance with PHP development, including implementing features,\ndebugging issues, reviewing code quality, enforcing security posture, or answering technical questions\nabout PHP codebases",
+      "short_description": "Use this agent when you need expert assistance with PHP development, including implementing features, debugging issues, reviewing code quality, enforcing security posture, or answering technical questions about PHP codebases",
       "triggers": [
         "php",
         "laravel",
@@ -1142,7 +1142,7 @@
     },
     "swift-general-engineer": {
       "file": "swift-general-engineer.md",
-      "short_description": "Use this agent when you need expert assistance with Swift development, including implementing features\nfor iOS, macOS, watchOS, tvOS, visionOS, or server-side Swift (Vapor/Hummingbird), debugging issues,\nreviewing code quality, or answering technical questions about Swift codebases",
+      "short_description": "Use this agent when you need expert assistance with Swift development, including implementing features for iOS, macOS, watchOS, tvOS, visionOS, or server-side Swift, debugging issues, reviewing code quality, or answering technical questions about Swift codebases",
       "triggers": [
         "swift",
         "ios",
@@ -1244,8 +1244,7 @@
         "visual regression"
       ],
       "pairs_with": [
-        "test-driven-development",
-        "e2e-testing"
+        "test-driven-development"
       ],
       "complexity": "Medium-Complex",
       "category": "testing"