Deploy Myco from CI

game/agent_controller.py

@@ -1,71 +1,77 @@
+# controller.py — full replacement
+
 from . import engine
 import json
 
+
 class MycoController:
     def __init__(self):
         self.position = [1, 1]
         self.history = []
 
     def get_agent_decision(self, current_mushroom, collection):
-        prompt = f"""
-        Current Position: {self.position}
-        Mushroom in clearing: {'Yes' if current_mushroom else 'No'}
-        Collection count: {len(collection)}
-        
-        Decide your next action: 'move', 'search', 'study', 'collect', or 'wait'.
-        If 'move', provide target coordinate (e.g., [1, 2]).
-        
-        Respond ONLY in valid JSON format:
-        {{"action": "...", "target": [x, y], "thought": "..."}}
-        """
-        
-        response = engine._llm(prompt) 
-        
-        # FIX: Validate response exists before parsing
+        # Build a real context so _llm has score/health/mystery data.
+        # This also prevents the system prompt from having blank lines.
+        ctx = engine._ctx(current_mushroom, list(collection or []))
+
+        prompt = (
+            f"Current position: {self.position}. "
+            f"Mushroom present: {'Yes' if current_mushroom else 'No'}. "
+            f"Collection count: {ctx.get('collection_count', 0)}. "
+            f"Score: {ctx.get('score', 0)}. Health: {ctx.get('health', 3)}/3. "
+            "Decide the next action: move, search, study, collect, or wait. "
+            "If move, provide a target coordinate. "
+            'Respond ONLY in valid JSON: {"action":"...","target":[x,y],"thought":"..."}'
+        )
+
+        response = engine._llm(prompt, ctx)
+
         if not response:
             return {"action": "wait", "target": None, "thought": "Engine returned no data."}
-            
+
         try:
-            start = response.find("{")
-            end = response.rfind("}") + 1
-            if start == -1 or end == 0:
-                raise ValueError("No JSON found in response")
-                
-            return json.loads(response[start:end])
+            parsed = json.loads(response)
+            # Validate the action field exists and is a known value
+            if parsed.get("action") not in {"move", "search", "study", "collect", "wait"}:
+                raise ValueError(f"Unknown action: {parsed.get('action')}")
+            return parsed
         except Exception as e:
-            print(f"[Myco] Controller Parse Error: {e}")
-            return {"action": "wait", "target": None, "thought": "Failed to parse JSON."}
+            print(f"[Myco] Controller parse error: {e} — raw: {response!r}")
+            return {"action": "wait", "target": None, "thought": "Failed to parse response."}
 
     def run_tick(self, current_mushroom, collection):
         decision = self.get_agent_decision(current_mushroom, collection)
-        action = decision.get("action")
-        
-        result = {"action_taken": action, "thought": decision.get("thought")}
-        
-        # EXECUTION LAYER
+        action = decision.get("action", "wait")
+        result = {"action_taken": action, "thought": decision.get("thought", "")}
+
         if action == "move":
-            # Add basic validation for grid boundaries if necessary
             target = decision.get("target")
             if isinstance(target, list) and len(target) == 2:
                 self.position = target
-        
+            else:
+                result["thought"] = "Move action had no valid target coordinate."
+
         elif action == "search":
-            # Ensure engine functions exist and return expected values
-            try:
-                mushroom, current, history = engine.discover_mushroom(collection)
-                result["data"] = {"mushroom": mushroom, "current": current}
-            except AttributeError:
-                result["thought"] = "Search function not found in engine."
-            
+            mushroom, current, history = engine.discover_mushroom(collection)
+            result["data"] = {"mushroom": mushroom, "current": current}
+
         elif action == "collect":
             if current_mushroom:
-                try:
-                    coll, hist = engine.collect_current(current_mushroom, collection, self.history)
-                    result["data"] = {"collection": coll}
-                    self.history = hist # Keep track of history
-                except AttributeError:
-                    
-                    result["thought"] = "Collect function not found in engine."
-                    
-        
+                coll, hist = engine.collect_current(
+                    current_mushroom, list(collection or []), self.history
+                )
+                self.history = hist
+                result["data"] = {"collection": coll}
+            else:
+                result["thought"] = "Nothing to collect — no mushroom in clearing."
+
+        elif action == "study":
+            if current_mushroom:
+                reply, hist = engine.study_current(current_mushroom, self.history)
+                self.history = hist
+                result["data"] = {"study_reply": reply}
+            else:
+                result["thought"] = "Nothing to study."
+
         return result
+