diff --git a/latest/OrchestratorMode.md b/latest/OrchestratorMode.md
index 17f9525..fa7c42b 100644
--- a/latest/OrchestratorMode.md
+++ b/latest/OrchestratorMode.md
@@ -181,6 +181,7 @@ flowchart TD
 **Objective**: Decompose the complex task and create a detailed execution plan.
 
 **STRICT Mode Delegation Rules**:
+- **Go tasks** → MUST delegate to "Go Architect" mode
 - **Haskell tasks** → MUST delegate to "Haskell Planner" mode
 - **Frontend architecture** → MUST delegate to "Frontend Engineer" mode for planning
 - **All other tasks** → MUST delegate to "Enhanced Planning" mode
@@ -211,7 +212,9 @@ flowchart TD
 
 **STRICT Mode Selection**:
 ```
-IF task_type == "Haskell" THEN
+IF task_type == "Go" THEN
+    delegate_to("Go Developer")
+ELIF task_type == "Haskell" THEN
     delegate_to("Haskell God")
 ELIF task_type == "ReScript" THEN
     delegate_to("ReScript Master")
@@ -282,10 +285,12 @@ END
 ```mermaid
 graph TD
     A[User Provides Complex Task] --> B{Select Planning Mode};
+    B -- Go Task --> BP_Go[Go Architect Mode];
     B -- Haskell Task --> BP_HS[Haskell Planner Mode];
     B -- Frontend Task --> BP_FE[Frontend Engineer Mode<br/>for Planning];
     B -- Other Task --> BP_EP[Enhanced Planning Mode];
-    BP_HS --> C[Generate Plan];
+    BP_Go --> C[Generate Plan];
+    BP_HS --> C;
     BP_FE --> C;
     BP_EP --> C;
     C --> D{Delegate to Code Reviewer Mode<br/>for MANDATORY Plan Review};
@@ -518,6 +523,7 @@ Orchestrator Analysis & Mode Selection:
 - Complexity: [Simple/Complex/Architectural]
 
 ### MANDATORY Mode Selection
+- If Go → Go Architect/Developer Mode
 - If Haskell → Haskell Planner/God Mode
 - If ReScript → ReScript Master Mode
 - If Frontend → Frontend Engineer Mode