diff --git a/.opencode/state/state.json b/.opencode/state/state.json
index 9e26dfeeb..8de987a7e 100644
--- a/.opencode/state/state.json
+++ b/.opencode/state/state.json
@@ -1 +1,465 @@
-{}
\ No newline at end of file
+{
+  "coordination:main_coordinator": {
+    "strRayOrchestrator": {
+      "taskQueue": {},
+      "activeTasks": {},
+      "totalProcessed": 0,
+      "config": {
+        "maxConcurrentTasks": 3,
+        "taskTimeout": 10000,
+        "conflictResolutionStrategy": "majority_vote"
+      },
+      "kernel": {
+        "config": {
+          "enabled": true,
+          "confidenceThreshold": 0.75,
+          "maxPatternsPerAnalysis": 10,
+          "enableLearning": true,
+          "autoPrevention": true
+        },
+        "patterns": {},
+        "assumptions": {},
+        "cascades": {}
+      }
+    },
+    "enhancedOrchestrator": {
+      "state": {
+        "activeAgents": {},
+        "pendingSpawns": [],
+        "completedAgents": {},
+        "failedAgents": {},
+        "agentDependencies": {},
+        "monitoringEnabled": true,
+        "cleanupInterval": 30000,
+        "isMainOrchestrator": true
+      },
+      "stateManager": {
+        "store": {},
+        "persistencePath": "/Users/blaze/dev/stringray/.opencode/state/state.json",
+        "persistenceEnabled": true,
+        "writeQueue": {},
+        "initialized": true,
+        "earlyOperationsQueue": []
+      },
+      "complexityAnalyzer": {
+        "thresholds": {
+          "simple": 15,
+          "moderate": 25,
+          "complex": 50,
+          "enterprise": 75
+        },
+        "operationWeights": {
+          "create": 1,
+          "modify": 1.2,
+          "refactor": 1.8,
+          "analyze": 1.5,
+          "debug": 2,
+          "test": 1.3
+        },
+        "riskMultipliers": {
+          "low": 0.8,
+          "medium": 1,
+          "high": 1.3,
+          "critical": 1.6
+        },
+        "calibrationHistory": []
+      },
+      "agentDelegator": {
+        "complexityAnalyzer": {
+          "thresholds": {
+            "simple": 15,
+            "moderate": 25,
+            "complex": 50,
+            "enterprise": 75
+          },
+          "operationWeights": {
+            "create": 1,
+            "modify": 1.2,
+            "refactor": 1.8,
+            "analyze": 1.5,
+            "debug": 2,
+            "test": 1.3
+          },
+          "riskMultipliers": {
+            "low": 0.8,
+            "medium": 1,
+            "high": 1.3,
+            "critical": 1.6
+          },
+          "calibrationHistory": []
+        },
+        "stateManager": {
+          "store": {},
+          "persistencePath": "/Users/blaze/dev/stringray/.opencode/state/state.json",
+          "persistenceEnabled": true,
+          "writeQueue": {},
+          "initialized": true,
+          "earlyOperationsQueue": []
+        },
+        "configLoader": {
+          "configPath": "/Users/blaze/dev/stringray/.strray/config.json",
+          "cachedConfig": null,
+          "cacheExpiry": 30000,
+          "lastLoadTime": 0
+        },
+        "kernel": {
+          "config": {
+            "enabled": true,
+            "confidenceThreshold": 0.75,
+            "maxPatternsPerAnalysis": 10,
+            "enableLearning": true,
+            "autoPrevention": true
+          },
+          "patterns": {},
+          "assumptions": {},
+          "cascades": {}
+        },
+        "agentMetrics": {
+          "stateManager": {
+            "store": {},
+            "persistencePath": "/Users/blaze/dev/stringray/.opencode/state/state.json",
+            "persistenceEnabled": true,
+            "writeQueue": {},
+            "initialized": true,
+            "earlyOperationsQueue": []
+          },
+          "retentionConfig": {
+            "maxEntries": 10000,
+            "maxAgeMs": 2592000000,
+            "enableAutoCleanup": true,
+            "cleanupIntervalMs": 3600000
+          },
+          "initialized": false
+        }
+      },
+      "executionContext": {
+        "isExecutingAsSubagent": false,
+        "currentAgentId": null,
+        "spawnStack": []
+      },
+      "cleanupTimer": null
+    },
+    "agentDelegator": {
+      "complexityAnalyzer": {
+        "thresholds": {
+          "simple": 15,
+          "moderate": 25,
+          "complex": 50,
+          "enterprise": 75
+        },
+        "operationWeights": {
+          "create": 1,
+          "modify": 1.2,
+          "refactor": 1.8,
+          "analyze": 1.5,
+          "debug": 2,
+          "test": 1.3
+        },
+        "riskMultipliers": {
+          "low": 0.8,
+          "medium": 1,
+          "high": 1.3,
+          "critical": 1.6
+        },
+        "calibrationHistory": []
+      },
+      "stateManager": {
+        "store": {},
+        "persistencePath": "/Users/blaze/dev/stringray/.opencode/state/state.json",
+        "persistenceEnabled": true,
+        "writeQueue": {},
+        "initialized": true,
+        "earlyOperationsQueue": []
+      },
+      "configLoader": {
+        "configPath": "/Users/blaze/dev/stringray/.strray/config.json",
+        "cachedConfig": null,
+        "cacheExpiry": 30000,
+        "lastLoadTime": 0
+      },
+      "kernel": {
+        "config": {
+          "enabled": true,
+          "confidenceThreshold": 0.75,
+          "maxPatternsPerAnalysis": 10,
+          "enableLearning": true,
+          "autoPrevention": true
+        },
+        "patterns": {},
+        "assumptions": {},
+        "cascades": {}
+      },
+      "agentMetrics": {
+        "stateManager": {
+          "store": {},
+          "persistencePath": "/Users/blaze/dev/stringray/.opencode/state/state.json",
+          "persistenceEnabled": true,
+          "writeQueue": {},
+          "initialized": true,
+          "earlyOperationsQueue": []
+        },
+        "retentionConfig": {
+          "maxEntries": 10000,
+          "maxAgeMs": 2592000000,
+          "enableAutoCleanup": true,
+          "cleanupIntervalMs": 3600000
+        },
+        "initialized": false
+      }
+    },
+    "stateManager": {
+      "store": {},
+      "persistencePath": "/Users/blaze/dev/stringray/.opencode/state/state.json",
+      "persistenceEnabled": true,
+      "writeQueue": {},
+      "initialized": true,
+      "earlyOperationsQueue": []
+    },
+    "complexityAnalyzer": {
+      "thresholds": {
+        "simple": 15,
+        "moderate": 25,
+        "complex": 50,
+        "enterprise": 75
+      },
+      "operationWeights": {
+        "create": 1,
+        "modify": 1.2,
+        "refactor": 1.8,
+        "analyze": 1.5,
+        "debug": 2,
+        "test": 1.3
+      },
+      "riskMultipliers": {
+        "low": 0.8,
+        "medium": 1,
+        "high": 1.3,
+        "critical": 1.6
+      },
+      "calibrationHistory": []
+    },
+    "coordinationMetrics": {
+      "totalWorkflows": 0,
+      "successfulWorkflows": 0,
+      "failedWorkflows": 0,
+      "averageDuration": 0,
+      "agentUtilization": {},
+      "coordinationEfficiency": 0
+    }
+  },
+  "coordination:strray_orchestrator": {
+    "taskQueue": {},
+    "activeTasks": {},
+    "totalProcessed": 0,
+    "config": {
+      "maxConcurrentTasks": 3,
+      "taskTimeout": 10000,
+      "conflictResolutionStrategy": "majority_vote"
+    },
+    "kernel": {
+      "config": {
+        "enabled": true,
+        "confidenceThreshold": 0.75,
+        "maxPatternsPerAnalysis": 10,
+        "enableLearning": true,
+        "autoPrevention": true
+      },
+      "patterns": {},
+      "assumptions": {},
+      "cascades": {}
+    }
+  },
+  "coordination:enhanced_orchestrator": {
+    "state": {
+      "activeAgents": {},
+      "pendingSpawns": [],
+      "completedAgents": {},
+      "failedAgents": {},
+      "agentDependencies": {},
+      "monitoringEnabled": true,
+      "cleanupInterval": 30000,
+      "isMainOrchestrator": true
+    },
+    "stateManager": {
+      "store": {},
+      "persistencePath": "/Users/blaze/dev/stringray/.opencode/state/state.json",
+      "persistenceEnabled": true,
+      "writeQueue": {},
+      "initialized": true,
+      "earlyOperationsQueue": []
+    },
+    "complexityAnalyzer": {
+      "thresholds": {
+        "simple": 15,
+        "moderate": 25,
+        "complex": 50,
+        "enterprise": 75
+      },
+      "operationWeights": {
+        "create": 1,
+        "modify": 1.2,
+        "refactor": 1.8,
+        "analyze": 1.5,
+        "debug": 2,
+        "test": 1.3
+      },
+      "riskMultipliers": {
+        "low": 0.8,
+        "medium": 1,
+        "high": 1.3,
+        "critical": 1.6
+      },
+      "calibrationHistory": []
+    },
+    "agentDelegator": {
+      "complexityAnalyzer": {
+        "thresholds": {
+          "simple": 15,
+          "moderate": 25,
+          "complex": 50,
+          "enterprise": 75
+        },
+        "operationWeights": {
+          "create": 1,
+          "modify": 1.2,
+          "refactor": 1.8,
+          "analyze": 1.5,
+          "debug": 2,
+          "test": 1.3
+        },
+        "riskMultipliers": {
+          "low": 0.8,
+          "medium": 1,
+          "high": 1.3,
+          "critical": 1.6
+        },
+        "calibrationHistory": []
+      },
+      "stateManager": {
+        "store": {},
+        "persistencePath": "/Users/blaze/dev/stringray/.opencode/state/state.json",
+        "persistenceEnabled": true,
+        "writeQueue": {},
+        "initialized": true,
+        "earlyOperationsQueue": []
+      },
+      "configLoader": {
+        "configPath": "/Users/blaze/dev/stringray/.strray/config.json",
+        "cachedConfig": null,
+        "cacheExpiry": 30000,
+        "lastLoadTime": 0
+      },
+      "kernel": {
+        "config": {
+          "enabled": true,
+          "confidenceThreshold": 0.75,
+          "maxPatternsPerAnalysis": 10,
+          "enableLearning": true,
+          "autoPrevention": true
+        },
+        "patterns": {},
+        "assumptions": {},
+        "cascades": {}
+      },
+      "agentMetrics": {
+        "stateManager": {
+          "store": {},
+          "persistencePath": "/Users/blaze/dev/stringray/.opencode/state/state.json",
+          "persistenceEnabled": true,
+          "writeQueue": {},
+          "initialized": true,
+          "earlyOperationsQueue": []
+        },
+        "retentionConfig": {
+          "maxEntries": 10000,
+          "maxAgeMs": 2592000000,
+          "enableAutoCleanup": true,
+          "cleanupIntervalMs": 3600000
+        },
+        "initialized": false
+      }
+    },
+    "executionContext": {
+      "isExecutingAsSubagent": false,
+      "currentAgentId": null,
+      "spawnStack": []
+    },
+    "cleanupTimer": null
+  },
+  "coordination:agent_delegator": {
+    "complexityAnalyzer": {
+      "thresholds": {
+        "simple": 15,
+        "moderate": 25,
+        "complex": 50,
+        "enterprise": 75
+      },
+      "operationWeights": {
+        "create": 1,
+        "modify": 1.2,
+        "refactor": 1.8,
+        "analyze": 1.5,
+        "debug": 2,
+        "test": 1.3
+      },
+      "riskMultipliers": {
+        "low": 0.8,
+        "medium": 1,
+        "high": 1.3,
+        "critical": 1.6
+      },
+      "calibrationHistory": []
+    },
+    "stateManager": {
+      "store": {},
+      "persistencePath": "/Users/blaze/dev/stringray/.opencode/state/state.json",
+      "persistenceEnabled": true,
+      "writeQueue": {},
+      "initialized": true,
+      "earlyOperationsQueue": []
+    },
+    "configLoader": {
+      "configPath": "/Users/blaze/dev/stringray/.strray/config.json",
+      "cachedConfig": null,
+      "cacheExpiry": 30000,
+      "lastLoadTime": 0
+    },
+    "kernel": {
+      "config": {
+        "enabled": true,
+        "confidenceThreshold": 0.75,
+        "maxPatternsPerAnalysis": 10,
+        "enableLearning": true,
+        "autoPrevention": true
+      },
+      "patterns": {},
+      "assumptions": {},
+      "cascades": {}
+    },
+    "agentMetrics": {
+      "stateManager": {
+        "store": {},
+        "persistencePath": "/Users/blaze/dev/stringray/.opencode/state/state.json",
+        "persistenceEnabled": true,
+        "writeQueue": {},
+        "initialized": true,
+        "earlyOperationsQueue": []
+      },
+      "retentionConfig": {
+        "maxEntries": 10000,
+        "maxAgeMs": 2592000000,
+        "enableAutoCleanup": true,
+        "cleanupIntervalMs": 3600000
+      },
+      "initialized": false
+    }
+  },
+  "coordination:metrics": {
+    "totalWorkflows": 0,
+    "successfulWorkflows": 0,
+    "failedWorkflows": 0,
+    "averageDuration": 0,
+    "agentUtilization": {},
+    "coordinationEfficiency": 0
+  }
+}
\ No newline at end of file
diff --git a/src/inference/inference-cycle.ts b/src/inference/inference-cycle.ts
index 79d7d92c4..42fdc9c96 100644
--- a/src/inference/inference-cycle.ts
+++ b/src/inference/inference-cycle.ts
@@ -489,12 +489,8 @@ export class InferenceCycle {
     });
 
     try {
-      let agentName = p.type === "refactor" ? "refactorer" : "code-reviewer";
-
-      // In pure MCP mode, use real skill server names so the orchestrator dispatches to actual MCP tools
-      if (process.env.STRRAY_FORCE_MCP_GOVERNANCE === 'true') {
-        agentName = p.type === "refactor" ? "refactoring-strategies" : "code-review";
-      }
+      // Primary agent for apply is always refactorer (enforcer is no longer used as an agent)
+      const agentName = "refactorer";
 
       await this.invokeAgentInternal(agentName, prompt);
       return true;
@@ -523,9 +519,8 @@ export class InferenceCycle {
     ].join("\n");
 
     try {
-      const agentName = process.env.STRRAY_FORCE_MCP_GOVERNANCE === 'true' 
-        ? "code-review" 
-        : "code-reviewer";
+      // Primary agent for apply is always refactorer (enforcer is no longer used as an agent)
+      const agentName = "refactorer";
       await this.invokeAgentInternal(agentName, prompt);
       return true;
     } catch (err) {
@@ -562,9 +557,8 @@ export class InferenceCycle {
     ].join("\n");
 
     try {
-      const agentName = process.env.STRRAY_FORCE_MCP_GOVERNANCE === 'true' 
-        ? "architecture-patterns" 
-        : "architect";
+      // Primary agent for apply is always refactorer (enforcer is no longer used as an agent)
+      const agentName = "refactorer";
       await this.invokeAgentInternal(agentName, prompt);
       return true;
     } catch (err) {