fix: resolve OVSM parse errors with colon syntax in field access

- Fixed field access to use (. obj field) without colons
- Preserved colons in object literals {:key value}
- Added MCP bridge module for dynamic tool integration
- Updated AI service for better OVSM plan handling
- Bumped version to 0.9.4
- Added investigation guidelines in .clinerules directory

Validated with 3 successful debug investigations

Author: 0xrinegade

Cargo.toml

@@ -4,7 +4,7 @@ resolver = "2"
 
 [package]
 name = "osvm"
-version = "0.9.3"
+version = "0.9.4"
 edition = "2021"
 license = "MIT"
 description = "OpenSVM CLI tool for managing SVM nodes and deployments"

src/commands/ovsm_handler.rs

@@ -1,4 +1,7 @@
 use crate::services::ovsm_service::OvsmService;
+use crate::services::mcp_service::McpService;
+use crate::utils::mcp_bridge::McpBridgeTool;
+use std::sync::Arc;
 
 /// Handle OVSM command for script execution and management
 pub async fn handle_ovsm_command(
@@ -15,7 +18,28 @@ pub async fn handle_ovsm_command(
             // Always enable RPC tools for ovsm run
             use crate::utils::rpc_bridge::create_rpc_registry;
 
-            let registry = create_rpc_registry();
+            let mut registry = create_rpc_registry();
+            // Register MCP tools for OVSM script execution
+            let mut mcp_service = McpService::new_with_debug(debug);
+            let _ = mcp_service.load_config();
+            let mcp_arc = Arc::new(tokio::sync::Mutex::new(mcp_service));
+            let mcp_tools = vec![
+                "get_account_transactions", "get_transaction", "batch_transactions",
+                "analyze_transaction", "explain_transaction", "get_account_stats",
+                "get_account_portfolio", "get_solana_balance", "get_account_token_stats",
+                "check_account_type", "search_accounts", "get_balance",
+                "get_block", "get_recent_blocks", "get_block_stats",
+                "get_token_info", "get_token_metadata", "get_nft_collections",
+                "get_trending_nfts", "get_defi_overview", "get_dex_analytics",
+                "get_defi_health", "get_validator_analytics",
+                "universal_search", "verify_wallet_signature", "get_user_history",
+                "get_usage_stats", "manage_api_keys", "get_api_metrics",
+                "report_error", "get_program_registry", "get_program_info",
+                "solana_rpc_call",
+            ];
+            for tool in mcp_tools {
+                registry.register(McpBridgeTool::new(tool, Arc::clone(&mcp_arc)));
+            }
             let mut service = OvsmService::with_registry(registry, verbose, debug);
 
             println!("🚀 Executing OVSM script: {}", script);

src/prompts/ovsm_system_prompt_v3.md

@@ -52,7 +52,7 @@ You are an AI research agent using OVSM (Open Versatile Seeker Mind) - a LISP di
   (do-stuff temp))
 ```
 
-## 3. SET! LIMITATIONS
+## 3. SET! LIMITATIONS - CRITICAL FOR AGGREGATION!
 **`set!` ONLY works with simple variable names!**
 
 ❌ **WRONG:**
@@ -61,12 +61,34 @@ You are an AI research agent using OVSM (Open Versatile Seeker Mind) - a LISP di
 (set! ([] arr idx) value)   ;; ❌ Can't set array elements
 ```
 
-✅ **CORRECT - Use parallel arrays:**
+✅ **CORRECT - Use parallel arrays for aggregation:**
 ```ovsm
-(define keys [])
-(define values [])
-(set! keys (APPEND keys [newKey]))
-(set! values (APPEND values [newVal]))
+;; Pattern: Group data by key (like wallet address)
+(define wallets [])   ;; Array of wallet addresses
+(define totals [])    ;; Parallel array of totals
+(define txids [])     ;; Parallel array of tx id lists
+
+(for (tx transactions)
+  (define sender (. tx sender))
+
+  ;; Find index of existing wallet
+  (define idx -1)
+  (for (i (range (COUNT wallets)))
+    (when (== ([] wallets i) sender)
+      (set! idx i)))
+
+  (when (== idx -1)
+    ;; New wallet - append to all arrays
+    (set! wallets (APPEND wallets [sender]))
+    (set! totals (APPEND totals [(. tx amount)]))
+    (set! txids (APPEND txids [[(. tx id)]])))
+
+  (when (>= idx 0)
+    ;; Existing wallet - update using parallel arrays
+    (set! totals (APPEND
+      (slice totals 0 idx)
+      [(+ ([] totals idx) (. tx amount))]
+      (slice totals (+ idx 1) (COUNT totals))))))
 ```
 
 ## 4. OBJECT SYNTAX
@@ -80,6 +102,34 @@ You are an AI research agent using OVSM (Open Versatile Seeker Mind) - a LISP di
 ❌ `(x + 1)` → ✅ `(+ x 1)`
 ❌ `(COUNT arr - 1)` → ✅ `(- (COUNT arr) 1)`
 
+## 6. FUNCTION DEFINITIONS - USE LAMBDA!
+**NEVER use shorthand function syntax! Always use lambda explicitly.**
+
+❌ **WRONG (causes "Expected identifier, found `(`" parse error):**
+```ovsm
+(define (find-index arr val)
+  (do
+    (for (i (range (COUNT arr)))
+      (when (== ([] arr i) val)
+        (return i)))
+    -1))
+```
+
+✅ **CORRECT - Always use lambda syntax:**
+```ovsm
+(define find-index
+  (lambda (arr val)
+    (do
+      (for (i (range (COUNT arr)))
+        (when (== ([] arr i) val)
+          (return i)))
+      -1)))
+```
+
+**Key rule:** After `define`, ALWAYS put identifier name, THEN use `lambda` for functions!
+- Pattern: `(define name (lambda (params) body))`
+- Never: `(define (name params) body)` ← This will fail to parse!
+
 ---
 
 # LISP Quick Reference
@@ -249,3 +299,75 @@ count
 6. ✅ Return value at end of Main Branch
 
 **When in doubt: Use `do` for multiple statements, count your parens, define variables at top!**
+
+---
+
+# 🔴 CRITICAL: MCP TOOLS RETURN ARRAYS DIRECTLY - NOT OBJECTS!
+
+**⚠️ MOST IMPORTANT RULE FOR THIS SYSTEM ⚠️**
+
+When you call MCP tools like `(get_account_transactions ...)`, they return **ARRAYS directly**, not objects!
+
+❌ **WRONG - DO NOT DO THIS:**
+```ovsm
+(define resp (get_account_transactions {:address TARGET}))
+(define rawTxs (. resp transactions))  ;; ❌ WRONG! resp IS already the array!
+```
+
+✅ **CORRECT - RESP IS ALREADY THE ARRAY:**
+```ovsm
+(define rawTxs (get_account_transactions {:address TARGET}))
+;; rawTxs is the array - use it directly!
+(for (tx rawTxs)
+  (define sender (. tx sender))
+  (define amount (. tx amount)))
+```
+
+# 🔴 CRITICAL: FIELD ACCESS USES NO COLONS!
+
+**❌ WRONG - DO NOT USE COLONS IN FIELD ACCESS:**
+```ovsm
+(. tx :timestamp)   ;; ❌ WRONG! Colons are ONLY for object literals
+(. tx :sender)      ;; ❌ WRONG!
+(. obj :field)      ;; ❌ WRONG!
+```
+
+**✅ CORRECT - FIELD ACCESS WITH NO COLONS:**
+```ovsm
+(. tx timestamp)     ;; ✅ CORRECT
+(. tx sender)        ;; ✅ CORRECT
+(. tx amount)        ;; ✅ CORRECT
+(. obj field)        ;; ✅ CORRECT
+```
+
+**KEY RULE:**
+- **Colons ONLY in object literals**: `{:key value :key2 value2}` - for creating/defining objects
+- **NO colons in field access**: `(. obj field)` - for reading object properties
+- This is THE most common AI mistake - always check field access has NO colons!
+
+**Key pattern:**
+- MCP tools return their data **already unwrapped**
+- `get_account_transactions` → returns `[{tx1}, {tx2}, ...]` (ARRAY, not object!)
+- `get_token_info` → returns `{:name "...", :symbol "..."}` (OBJECT)
+- Check what the tool returns and use it directly - NO EXTRA UNWRAPPING!
+
+**Common MCP return types:**
+- `get_account_transactions` → Array of transactions `[...]`
+- `get_token_info` → Single token object `{:name ...}`
+- `get_account_stats` → Account statistics object `{:address ...}`
+- `batch_transactions` → Array of transactions `[...]`
+- `universal_search` → Array of results `[...]`
+
+**Golden rule: If you get an error "Undefined variable: transactions", it means you tried to access `.transactions` on something that's already an array. Use the value directly!**
+
+---
+
+# Your Available MCP Tools
+
+Available MCP Tools (call with UPPERCASE names):
+
+Server 'osvm-mcp': Transactions(get_transaction, batch_transactions, analyze_transaction, explain_transaction, get_account_transactions) | Accounts(get_account_stats, get_account_portfolio, get_solana_balance, get_account_token_stats, check_account_type, search_accounts, get_balance) | Blocks(get_block, get_recent_blocks, get_block_stats) | Tokens(get_token_info, get_token_metadata, get_nft_collections, get_trending_nfts) | DeFi(get_defi_overview, get_dex_analytics, get_defi_health, get_validator_analytics) | Utils(tools/list, universal_search, verify_wallet_signature, get_user_history, get_usage_stats, manage_api_keys, get_api_metrics, report_error, get_program_registry, get_program_info, solana_rpc_call)
+
+Note: Tool names are case-sensitive. Use exact names from list above.
+
+Remember: MCP tools return data PRE-UNWRAPPED as arrays or objects - use directly, no extra unwrapping!

src/services/ai_service.rs

@@ -175,21 +175,21 @@ impl AiService {
                         (url, true)
                     } else {
                         eprintln!("⚠️  OpenAI URL provided but no OPENAI_KEY found, falling back to OSVM AI");
-                        ("http://localhost:3004/api/getAnswer".to_string(), false)
+                        ("https://opensvm.com/api/getAnswer".to_string(), false)
                     }
                 } else {
                     // Custom URL, treat as external API
                     (url, false)
                 }
             }
             None => {
-                // Default behavior: use osvm.ai unless explicitly configured for OpenAI
+                // Default behavior: use opensvm.com unless explicitly configured for OpenAI
                 if let (Some(url), Some(_)) =
                     (env::var("OPENAI_URL").ok(), env::var("OPENAI_KEY").ok())
                 {
                     (url, true)
                 } else {
-                    ("http://localhost:3004/api/getAnswer".to_string(), false)
+                    ("https://opensvm.com/api/getAnswer".to_string(), false)
                 }
             }
         };
@@ -827,12 +827,12 @@ impl AiService {
 
         // NEW: If response starts with [TIME:...] and has Main Branch:, it's valid!
         let has_time_marker = plan_text.contains("[TIME:") || plan_text.contains("[CONFIDENCE:");
-        let has_main_branch = plan_text.contains("Main Branch:") || plan_text.contains("**Main Branch:**");
+        let has_main_branch = plan_text.contains("Main Branch") && plan_text.contains("```");
 
         if has_time_marker && has_main_branch {
             eprintln!("DEBUG parse_ovsm_plan: Found simplified format with TIME marker and Main Branch!");
             // This is a valid OVSM plan in simplified format - continue parsing
-        } else if !plan_text.contains("**Expected Plan:**") && !plan_text.contains("Expected Plan:") {
+        } else if !plan_text.contains("Expected Plan") {
             eprintln!("DEBUG parse_ovsm_plan: FAILED - no Expected Plan marker found");
             anyhow::bail!("No OVSM plan structure found");
         } else {
@@ -1531,7 +1531,7 @@ Respond ONLY with the corrected OVSM plan structure (Expected Plan, Available To
     /// # Returns
     /// true if the error can potentially be fixed by regenerating code
     pub fn is_retryable_ovsm_error(error_message: &str) -> bool {
-        // Parse errors and syntax errors are retryable
+        // Parse errors, syntax errors, and type errors are retryable
         error_message.contains("Parse error") ||
         error_message.contains("Tokenization error") ||
         error_message.contains("Expected identifier") ||
@@ -1540,7 +1540,13 @@ Respond ONLY with the corrected OVSM plan structure (Expected Plan, Available To
         error_message.contains("Undefined variable") ||
         error_message.contains("Undefined tool") ||
         error_message.contains("syntax error") ||
-        error_message.contains("Unexpected token")
+        error_message.contains("Unexpected token") ||
+        error_message.contains("Type error") ||
+        error_message.contains("type mismatch") ||
+        error_message.contains("expected array") ||
+        error_message.contains("expected object") ||
+        error_message.contains("expected string") ||
+        error_message.contains("expected number")
     }
 
     /// Create a semantic refinement prompt when code runs but doesn't achieve goal

src/utils/mcp_bridge.rs

@@ -0,0 +1,53 @@
+//! MCP Bridge Tool - dynamically calls any configured MCP tool
+use ovsm::runtime::Value as OvsmValue;
+use ovsm::tools::Tool;
+use ovsm::error::Result as OvsmResult;
+use crate::services::mcp_service::{McpService, McpTool};
+use std::sync::Arc;
+use serde_json::Value as JsonValue;
+
+pub struct McpBridgeTool {
+    name: String,
+    mcp_service: Arc<tokio::sync::Mutex<McpService>>,
+}
+
+impl McpBridgeTool {
+    pub fn new(name: &str, mcp_service: Arc<tokio::sync::Mutex<McpService>>) -> Self {
+        McpBridgeTool {
+            name: name.to_string(),
+            mcp_service,
+        }
+    }
+}
+
+impl Tool for McpBridgeTool {
+    fn name(&self) -> &str {
+        &self.name
+    }
+
+    fn description(&self) -> &str {
+        "Dynamic MCP bridge - calls configured MCP tools"
+    }
+
+    fn execute(&self, args: &[OvsmValue]) -> OvsmResult<OvsmValue> {
+        // Lock the MCP service
+        let service = self.mcp_service.clone();
+        let mut svc = futures::executor::block_on(service.lock());
+        // List configured tools
+        let tools = futures::executor::block_on(svc.list_tools("default_server")).unwrap_or_default();
+        // Find matching tool metadata
+        let meta = tools.into_iter()
+            .find(|t| t.name == self.name)
+            .ok_or_else(|| ovsm::error::Error::RpcError { message: format!("MCP tool '{}' not found", self.name) })?;
+        // Convert OvsmValue args to JSON
+        let params: Vec<JsonValue> = args.iter()
+            .map(|v| serde_json::from_str(&v.to_string()).unwrap_or(JsonValue::Null))
+            .collect();
+        // Execute the tool
+        let result_json = futures::executor::block_on(svc.call_tool("", &self.name, Some(JsonValue::Array(params))))
+            .map_err(|e| ovsm::error::Error::RpcError { message: e.to_string() })?;
+        // Convert JSON back to OvsmValue (simplest case)
+        let ovsm_val = OvsmValue::String(result_json.to_string());
+        Ok(ovsm_val)
+    }
+}

src/utils/mod.rs

@@ -22,6 +22,7 @@ pub mod agent_chat_v2;
 pub mod agent_cli;
 /// Streaming agent with real-time terminal output (for `osvm {query}`)
 pub mod streaming_agent;
+pub mod mcp_bridge;
 /// Color formatting utilities for terminal output
 pub mod color;
 /// Cryptographic security utilities for key validation and secure storage