diff --git a/packages/mcp/src/handlers.ts b/packages/mcp/src/handlers.ts
index 1530d0c3..ba39cdb6 100644
--- a/packages/mcp/src/handlers.ts
+++ b/packages/mcp/src/handlers.ts
@@ -83,7 +83,7 @@ export class ToolHandlers {
 
                         if (metadataStr) {
                             try {
-                                const metadata = JSON.parse(metadataStr);
+                                const metadata = typeof metadataStr === 'string' ? JSON.parse(metadataStr) : metadataStr;
                                 const codebasePath = metadata.codebasePath;
 
                                 if (codebasePath && typeof codebasePath === 'string') {