@probelabs/probe 0.6.0-rc101 → 0.6.0-rc103

package/build/mcp/index.js

@@ -8,7 +8,7 @@ import path from 'path';
 import fs from 'fs-extra';
 import { fileURLToPath } from 'url';
 // Import from parent package
-import { search, query, extract } from '../index.js';
+import { search, extract } from '../index.js';
 // Parse command-line arguments
 function parseArgs() {
     const args = process.argv.slice(2);
@@ -128,38 +128,22 @@ class ProbeServer {
                             },
                             query: {
                                 type: 'string',
-                                description: 'Elastic search query. Supports logical operators (AND, OR, NOT), and grouping with parentheses. Examples: "config", "(term1 OR term2) AND term3". Use quotes for exact matches, like function or type names.',
-                            },
-                            filesOnly: {
-                                type: 'boolean',
-                                description: 'Skip AST parsing and just output unique files',
-                            },
-                            ignore: {
-                                type: 'array',
-                                items: { type: 'string' },
-                                description: 'Custom patterns to ignore (in addition to .gitignore and common patterns)'
-                            },
-                            excludeFilenames: {
-                                type: 'boolean',
-                                description: 'Exclude filenames from being used for matching'
+                                description: 'Elastic search query. Supports logical operators (AND, OR, NOT), and grouping with parentheses. For exact matches of specific identifiers, use quotes: "MyFunction", "SpecificStruct", "exact_variable_name". Examples: "config", "(term1 OR term2) AND term3", "getUserData", "struct Config".',
                             },
                             exact: {
                                 type: 'boolean',
-                                description: 'Perform exact search without tokenization (case-insensitive)'
+                                description: 'When you exactly know what you are looking for, like known function name, struct name, or variable name, set this flag for precise matching'
                             },
                             allowTests: {
                                 type: 'boolean',
-                                description: 'Allow test files and test code blocks in results (disabled by default)'
+                                description: 'Allow test files and test code blocks in results (enabled by default)',
+                                default: true
                             },
                             session: {
                                 type: 'string',
                                 description: 'Session identifier for caching. Set to "new" if unknown, or want to reset cache. Re-use session ID returned from previous searches',
                                 default: "new",
                             },
-                            timeout: {
-                                type: 'number',
-                                description: 'Timeout for the search operation in seconds (default: 30)',
-                            },
                             noGitignore: {
                                 type: 'boolean',
                                 description: 'Skip .gitignore files (will use PROBE_NO_GITIGNORE environment variable if not set)',
@@ -168,50 +152,6 @@ class ProbeServer {
                         required: ['path', 'query']
                     },
                 },
-                {
-                    name: 'query_code',
-                    description: "Search code using ast-grep structural pattern matching. Use this tool to find specific code structures like functions, classes, or methods.",
-                    inputSchema: {
-                        type: 'object',
-                        properties: {
-                            path: {
-                                type: 'string',
-                                description: 'Absolute path to the directory to search in (e.g., "/Users/username/projects/myproject").',
-                            },
-                            pattern: {
-                                type: 'string',
-                                description: 'The ast-grep pattern to search for. Examples: "fn $NAME($$$PARAMS) $$$BODY" for Rust functions, "def $NAME($$$PARAMS): $$$BODY" for Python functions.',
-                            },
-                            language: {
-                                type: 'string',
-                                description: 'The programming language to search in. If not specified, the tool will try to infer the language from file extensions. Supported languages: rust, javascript, typescript, python, go, c, cpp, java, ruby, php, swift, csharp, yaml.',
-                            },
-                            ignore: {
-                                type: 'array',
-                                items: { type: 'string' },
-                                description: 'Custom patterns to ignore (in addition to common patterns)',
-                            },
-                            maxResults: {
-                                type: 'number',
-                                description: 'Maximum number of results to return'
-                            },
-                            format: {
-                                type: 'string',
-                                enum: ['markdown', 'plain', 'json', 'color'],
-                                description: 'Output format for the query results'
-                            },
-                            timeout: {
-                                type: 'number',
-                                description: 'Timeout for the query operation in seconds (default: 30)',
-                            },
-                            noGitignore: {
-                                type: 'boolean',
-                                description: 'Skip .gitignore files (will use PROBE_NO_GITIGNORE environment variable if not set)',
-                            }
-                        },
-                        required: ['path', 'pattern']
-                    },
-                },
                 {
                     name: 'extract_code',
                     description: "Extract code blocks from files based on line number, or symbol name. Fetch full file when line number is not provided.",
@@ -229,22 +169,8 @@ class ProbeServer {
                             },
                             allowTests: {
                                 type: 'boolean',
-                                description: 'Allow test files and test code blocks in results (disabled by default)',
-                            },
-                            contextLines: {
-                                type: 'number',
-                                description: 'Number of context lines to include before and after the extracted block when AST parsing fails to find a suitable node',
-                                default: 0
-                            },
-                            format: {
-                                type: 'string',
-                                enum: ['markdown', 'plain', 'json'],
-                                description: 'Output format for the extracted code',
-                                default: 'markdown'
-                            },
-                            timeout: {
-                                type: 'number',
-                                description: 'Timeout for the extract operation in seconds (default: 30)',
+                                description: 'Allow test files and test code blocks in results (enabled by default)',
+                                default: true
                             },
                             noGitignore: {
                                 type: 'boolean',
@@ -257,8 +183,8 @@ class ProbeServer {
             ],
         }));
         this.server.setRequestHandler(CallToolRequestSchema, async (request) => {
-            if (request.params.name !== 'search_code' && request.params.name !== 'query_code' && request.params.name !== 'extract_code' &&
-                request.params.name !== 'probe' && request.params.name !== 'query' && request.params.name !== 'extract') {
+            if (request.params.name !== 'search_code' && request.params.name !== 'extract_code' &&
+                request.params.name !== 'probe' && request.params.name !== 'extract') {
                 throw new McpError(ErrorCode.MethodNotFound, `Unknown tool: ${request.params.name}`);
             }
             try {
@@ -282,10 +208,6 @@ class ProbeServer {
                     }
                     result = await this.executeCodeSearch(args);
                 }
-                else if (request.params.name === 'query_code' || request.params.name === 'query') {
-                    const args = request.params.arguments;
-                    result = await this.executeCodeQuery(args);
-                }
                 else { // extract_code or extract
                     const args = request.params.arguments;
                     result = await this.executeCodeExtract(args);
@@ -331,20 +253,19 @@ class ProbeServer {
                 query: args.query
             };
             // Add optional parameters only if they exist
-            if (args.filesOnly !== undefined)
-                options.filesOnly = args.filesOnly;
-            if (args.ignore !== undefined)
-                options.ignore = args.ignore;
-            if (args.excludeFilenames !== undefined)
-                options.excludeFilenames = args.excludeFilenames;
             if (args.exact !== undefined)
                 options.exact = args.exact;
             if (args.maxResults !== undefined)
                 options.maxResults = args.maxResults;
             if (args.maxTokens !== undefined)
                 options.maxTokens = args.maxTokens;
-            if (args.allowTests !== undefined)
+            // Set allowTests to true by default if not specified
+            if (args.allowTests !== undefined) {
                 options.allowTests = args.allowTests;
+            }
+            else {
+                options.allowTests = true;
+            }
             // Use noGitignore from args, or fall back to PROBE_NO_GITIGNORE environment variable
             if (args.noGitignore !== undefined) {
                 options.noGitignore = args.noGitignore;
@@ -358,13 +279,6 @@ class ProbeServer {
             else {
                 options.session = "new";
             }
-            // Use timeout from args, or fall back to instance default
-            if (args.timeout !== undefined) {
-                options.timeout = args.timeout;
-            }
-            else if (this.defaultTimeout !== undefined) {
-                options.timeout = this.defaultTimeout;
-            }
             // Handle format options
             if (this.defaultFormat === 'outline-xml') {
                 // For outline-xml format, we pass it as a format flag to the search command
@@ -394,45 +308,6 @@ class ProbeServer {
             throw new McpError('MethodNotFound', `Error executing code search: ${error.message || String(error)}`);
         }
     }
-    async executeCodeQuery(args) {
-        try {
-            // Validate required parameters
-            if (!args.path) {
-                throw new Error("Path is required");
-            }
-            if (!args.pattern) {
-                throw new Error("Pattern is required");
-            }
-            // Create a single options object with both pattern and path
-            const options = {
-                path: args.path,
-                pattern: args.pattern,
-                language: args.language,
-                ignore: args.ignore,
-                allowTests: args.allowTests,
-                maxResults: args.maxResults,
-                format: args.format,
-                timeout: args.timeout || this.defaultTimeout
-            };
-            // Use noGitignore from args, or fall back to PROBE_NO_GITIGNORE environment variable
-            if (args.noGitignore !== undefined) {
-                options.noGitignore = args.noGitignore;
-            }
-            else if (process.env.PROBE_NO_GITIGNORE) {
-                options.noGitignore = process.env.PROBE_NO_GITIGNORE === 'true';
-            }
-            console.log("Executing query with options:", JSON.stringify({
-                path: options.path,
-                pattern: options.pattern
-            }));
-            const result = await query(options);
-            return result;
-        }
-        catch (error) {
-            console.error('Error executing code query:', error);
-            throw new McpError('MethodNotFound', `Error executing code query: ${error.message || String(error)}`);
-        }
-    }
     async executeCodeExtract(args) {
         try {
             // Validate required parameters
@@ -446,11 +321,15 @@ class ProbeServer {
             const options = {
                 files: args.files,
                 path: args.path,
-                allowTests: args.allowTests,
-                contextLines: args.contextLines,
-                format: args.format,
-                timeout: args.timeout || this.defaultTimeout
+                format: 'xml'
             };
+            // Set allowTests to true by default if not specified
+            if (args.allowTests !== undefined) {
+                options.allowTests = args.allowTests;
+            }
+            else {
+                options.allowTests = true;
+            }
             // Use noGitignore from args, or fall back to PROBE_NO_GITIGNORE environment variable
             if (args.noGitignore !== undefined) {
                 options.noGitignore = args.noGitignore;
@@ -510,5 +389,5 @@ class ProbeServer {
         console.error('Probe MCP server running on stdio');
     }
 }
-const server = new ProbeServer(cliConfig.timeout, cliConfig.format);
+const server = new ProbeServer(cliConfig.timeout, cliConfig.format || 'outline-xml');
 server.run().catch(console.error);

package/build/mcp/index.ts

@@ -112,37 +112,19 @@ console.log(`Bin directory: ${binDir}`);
 interface SearchCodeArgs {
   path: string;
   query: string | string[];
-  filesOnly?: boolean;
-  ignore?: string[];
-  excludeFilenames?: boolean;
   exact?: boolean;
   maxResults?: number;
   maxTokens?: number;
   allowTests?: boolean;
   session?: string;
-  timeout?: number;
   noGitignore?: boolean;
 }
 
-interface QueryCodeArgs {
-  path: string;
-  pattern: string;
-  language?: string;
-  ignore?: string[];
-  allowTests?: boolean;
-  maxResults?: number;
-  format?: 'markdown' | 'plain' | 'json' | 'color';
-  timeout?: number;
-  noGitignore?: boolean;
-}
 
 interface ExtractCodeArgs {
   path: string;
   files: string[];
   allowTests?: boolean;
-  contextLines?: number;
-  format?: 'markdown' | 'plain' | 'json';
-  timeout?: number;
   noGitignore?: boolean;
 }
 
@@ -193,38 +175,22 @@ class ProbeServer {
               },
               query: {
                 type: 'string',
-                description: 'Elastic search query. Supports logical operators (AND, OR, NOT), and grouping with parentheses. Examples: "config", "(term1 OR term2) AND term3". Use quotes for exact matches, like function or type names.',
-              },
-              filesOnly: {
-                type: 'boolean',
-                description: 'Skip AST parsing and just output unique files',
-              },
-              ignore: {
-                type: 'array',
-                items: { type: 'string' },
-                description: 'Custom patterns to ignore (in addition to .gitignore and common patterns)'
-              },
-              excludeFilenames: {
-                type: 'boolean',
-                description: 'Exclude filenames from being used for matching'
+                description: 'Elastic search query. Supports logical operators (AND, OR, NOT), and grouping with parentheses. For exact matches of specific identifiers, use quotes: "MyFunction", "SpecificStruct", "exact_variable_name". Examples: "config", "(term1 OR term2) AND term3", "getUserData", "struct Config".',
               },
               exact: {
                 type: 'boolean',
-                description: 'Perform exact search without tokenization (case-insensitive)'
+                description: 'When you exactly know what you are looking for, like known function name, struct name, or variable name, set this flag for precise matching'
               },
               allowTests: {
                 type: 'boolean',
-                description: 'Allow test files and test code blocks in results (disabled by default)'
+                description: 'Allow test files and test code blocks in results (enabled by default)',
+                default: true
               },
               session: {
                 type: 'string',
                 description: 'Session identifier for caching. Set to "new" if unknown, or want to reset cache. Re-use session ID returned from previous searches',
                 default: "new",
               },
-              timeout: {
-                type: 'number',
-                description: 'Timeout for the search operation in seconds (default: 30)',
-              },
               noGitignore: {
                 type: 'boolean',
                 description: 'Skip .gitignore files (will use PROBE_NO_GITIGNORE environment variable if not set)',
@@ -233,50 +199,6 @@ class ProbeServer {
             required: ['path', 'query']
           },
         },
-        {
-          name: 'query_code',
-          description: "Search code using ast-grep structural pattern matching. Use this tool to find specific code structures like functions, classes, or methods.",
-          inputSchema: {
-            type: 'object',
-            properties: {
-              path: {
-                type: 'string',
-                description: 'Absolute path to the directory to search in (e.g., "/Users/username/projects/myproject").',
-              },
-              pattern: {
-                type: 'string',
-                description: 'The ast-grep pattern to search for. Examples: "fn $NAME($$$PARAMS) $$$BODY" for Rust functions, "def $NAME($$$PARAMS): $$$BODY" for Python functions.',
-              },
-              language: {
-                type: 'string',
-                description: 'The programming language to search in. If not specified, the tool will try to infer the language from file extensions. Supported languages: rust, javascript, typescript, python, go, c, cpp, java, ruby, php, swift, csharp, yaml.',
-              },
-              ignore: {
-                type: 'array',
-                items: { type: 'string' },
-                description: 'Custom patterns to ignore (in addition to common patterns)',
-              },
-              maxResults: {
-                type: 'number',
-                description: 'Maximum number of results to return'
-              },
-              format: {
-                type: 'string',
-                enum: ['markdown', 'plain', 'json', 'color'],
-                description: 'Output format for the query results'
-              },
-              timeout: {
-                type: 'number',
-                description: 'Timeout for the query operation in seconds (default: 30)',
-              },
-              noGitignore: {
-                type: 'boolean',
-                description: 'Skip .gitignore files (will use PROBE_NO_GITIGNORE environment variable if not set)',
-              }
-            },
-            required: ['path', 'pattern']
-          },
-        },
         {
           name: 'extract_code',
           description: "Extract code blocks from files based on line number, or symbol name. Fetch full file when line number is not provided.",
@@ -294,22 +216,8 @@ class ProbeServer {
               },
               allowTests: {
                 type: 'boolean',
-                description: 'Allow test files and test code blocks in results (disabled by default)',
-              },
-              contextLines: {
-                type: 'number',
-                description: 'Number of context lines to include before and after the extracted block when AST parsing fails to find a suitable node',
-                default: 0
-              },
-              format: {
-                type: 'string',
-                enum: ['markdown', 'plain', 'json'],
-                description: 'Output format for the extracted code',
-                default: 'markdown'
-              },
-              timeout: {
-                type: 'number',
-                description: 'Timeout for the extract operation in seconds (default: 30)',
+                description: 'Allow test files and test code blocks in results (enabled by default)',
+                default: true
               },
               noGitignore: {
                 type: 'boolean',
@@ -323,8 +231,8 @@ class ProbeServer {
     }));
 
     this.server.setRequestHandler(CallToolRequestSchema, async (request) => {
-      if (request.params.name !== 'search_code' && request.params.name !== 'query_code' && request.params.name !== 'extract_code' &&
-          request.params.name !== 'probe' && request.params.name !== 'query' && request.params.name !== 'extract') {
+      if (request.params.name !== 'search_code' && request.params.name !== 'extract_code' &&
+          request.params.name !== 'probe' && request.params.name !== 'extract') {
         throw new McpError(
           ErrorCode.MethodNotFound,
           `Unknown tool: ${request.params.name}`
@@ -356,9 +264,6 @@ class ProbeServer {
           }
           
           result = await this.executeCodeSearch(args);
-        } else if (request.params.name === 'query_code' || request.params.name === 'query') {
-          const args = request.params.arguments as unknown as QueryCodeArgs;
-          result = await this.executeCodeQuery(args);
         } else { // extract_code or extract
           const args = request.params.arguments as unknown as ExtractCodeArgs;
           result = await this.executeCodeExtract(args);
@@ -409,13 +314,15 @@ class ProbeServer {
       };
       
       // Add optional parameters only if they exist
-      if (args.filesOnly !== undefined) options.filesOnly = args.filesOnly;
-      if (args.ignore !== undefined) options.ignore = args.ignore;
-      if (args.excludeFilenames !== undefined) options.excludeFilenames = args.excludeFilenames;
       if (args.exact !== undefined) options.exact = args.exact;
       if (args.maxResults !== undefined) options.maxResults = args.maxResults;
       if (args.maxTokens !== undefined) options.maxTokens = args.maxTokens;
-      if (args.allowTests !== undefined) options.allowTests = args.allowTests;
+      // Set allowTests to true by default if not specified
+      if (args.allowTests !== undefined) {
+        options.allowTests = args.allowTests;
+      } else {
+        options.allowTests = true;
+      }
       // Use noGitignore from args, or fall back to PROBE_NO_GITIGNORE environment variable
       if (args.noGitignore !== undefined) {
         options.noGitignore = args.noGitignore;
@@ -427,12 +334,6 @@ class ProbeServer {
       } else {
         options.session = "new";
       }
-      // Use timeout from args, or fall back to instance default
-      if (args.timeout !== undefined) {
-        options.timeout = args.timeout;
-      } else if (this.defaultTimeout !== undefined) {
-        options.timeout = this.defaultTimeout;
-      }
 
       // Handle format options
       if (this.defaultFormat === 'outline-xml') {
@@ -467,50 +368,6 @@ class ProbeServer {
     }
   }
 
-  private async executeCodeQuery(args: QueryCodeArgs): Promise<string> {
-    try {
-      // Validate required parameters
-      if (!args.path) {
-        throw new Error("Path is required");
-      }
-      if (!args.pattern) {
-        throw new Error("Pattern is required");
-      }
-
-      // Create a single options object with both pattern and path
-      const options: any = {
-        path: args.path,
-        pattern: args.pattern,
-        language: args.language,
-        ignore: args.ignore,
-        allowTests: args.allowTests,
-        maxResults: args.maxResults,
-        format: args.format,
-        timeout: args.timeout || this.defaultTimeout
-      };
-      
-      // Use noGitignore from args, or fall back to PROBE_NO_GITIGNORE environment variable
-      if (args.noGitignore !== undefined) {
-        options.noGitignore = args.noGitignore;
-      } else if (process.env.PROBE_NO_GITIGNORE) {
-        options.noGitignore = process.env.PROBE_NO_GITIGNORE === 'true';
-      }
-      
-      console.log("Executing query with options:", JSON.stringify({
-        path: options.path,
-        pattern: options.pattern
-      }));
-      
-      const result = await query(options);
-      return result;
-    } catch (error: any) {
-      console.error('Error executing code query:', error);
-      throw new McpError(
-        'MethodNotFound' as unknown as ErrorCode,
-        `Error executing code query: ${error.message || String(error)}`
-      );
-    }
-  }
 
   private async executeCodeExtract(args: ExtractCodeArgs): Promise<string> {
     try {
@@ -526,12 +383,16 @@ class ProbeServer {
       const options: any = {
         files: args.files,
         path: args.path,
-        allowTests: args.allowTests,
-        contextLines: args.contextLines,
-        format: args.format,
-        timeout: args.timeout || this.defaultTimeout
+        format: 'xml'
       };
       
+      // Set allowTests to true by default if not specified
+      if (args.allowTests !== undefined) {
+        options.allowTests = args.allowTests;
+      } else {
+        options.allowTests = true;
+      }
+      
       // Use noGitignore from args, or fall back to PROBE_NO_GITIGNORE environment variable
       if (args.noGitignore !== undefined) {
         options.noGitignore = args.noGitignore;
@@ -604,5 +465,5 @@ class ProbeServer {
   }
 }
 
-const server = new ProbeServer(cliConfig.timeout, cliConfig.format);
+const server = new ProbeServer(cliConfig.timeout, cliConfig.format || 'outline-xml');
 server.run().catch(console.error);

package/build/tools/system-message.js

@@ -73,13 +73,19 @@ For GitHub-compatible mermaid diagrams, avoid single quotes and parentheses in n
 
 **Rules:**
 - NO single quotes in any node labels: 'text' → "text" or text
-- NO parentheses in square brackets: [Text (detail)] → [Text - detail]
+- NO parentheses in square brackets: [Text (detail)] → [Text - detail]  
 - NO complex expressions in diamonds: {a && b} → {condition}
+- NO HTML tags in node labels: [<pre>code</pre>] → ["code block"] or [Code Block]
 - USE single quotes for styles and classes: classDef highlight fill:'#ff9999'
+- CRITICAL: When using quotes in node labels, place them INSIDE the brackets: ["quoted text"], NOT [quoted text"]
 
 **Examples:**
 - ✅ [Load Config] ["Run command"] {Valid?}
+- ✅ ["depends_on: [generate-items]"] (correct quote placement)
+- ✅ ["Code Block"] (clean text instead of HTML)
 - ❌ [Load (config)] [Run 'command'] {isValid('x')}
+- ❌ [depends_on: [generate-items"] (incorrect quote placement - quote ends inside bracket)
+- ❌ [<pre>depends_on: [generate-items]</pre>] (HTML tags in node labels)
 
 **Diagram Type Selection:**