From 8138840cad6a76a58fdf4bd316afcd2de0418ca0 Mon Sep 17 00:00:00 2001
From: Snider <snider@host.uk.com>
Date: Wed, 4 Mar 2026 07:41:03 +0000
Subject: [PATCH] fix: pass workspace context from API key to tool execution

Brain tools require workspace_id in context for data isolation.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/Mcp/Controllers/McpApiController.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Mcp/Controllers/McpApiController.php b/src/Mcp/Controllers/McpApiController.php
index 3cb9e7a..87b416e 100644
--- a/src/Mcp/Controllers/McpApiController.php
+++ b/src/Mcp/Controllers/McpApiController.php
@@ -222,10 +222,16 @@ class McpApiController extends Controller
             throw new \RuntimeException("Tool not found: {$tool}");
         }
 
+        $context = [];
+
+        if ($apiKey?->workspace_id) {
+            $context['workspace_id'] = $apiKey->workspace_id;
+        }
+
         return $registry->execute(
             name: $tool,
             args: $arguments,
-            context: [],
+            context: $context,
             apiKey: $apiKey,
             validateDependencies: false
         );