@probelabs/probe 0.6.0-rc147 → 0.6.0-rc149

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@probelabs/probe",
-  "version": "0.6.0-rc147",
+  "version": "0.6.0-rc149",
   "description": "Node.js wrapper for the probe code search tool",
   "main": "src/index.js",
   "module": "src/index.js",
@@ -21,10 +21,6 @@
       "import": "./src/agent/simpleTelemetry.js",
       "require": "./cjs/agent/simpleTelemetry.cjs"
     },
-    "./telemetry/full": {
-      "import": "./src/agent/telemetry.js",
-      "require": "./cjs/agent/telemetry.cjs"
-    },
     "./agent/mcp": {
       "import": "./src/agent/mcp/index.js"
     }
@@ -79,13 +75,6 @@
     "@ai-sdk/google": "^2.0.14",
     "@ai-sdk/openai": "^2.0.10",
     "@modelcontextprotocol/sdk": "^1.0.0",
-    "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/core": "^1.30.1",
-    "@opentelemetry/exporter-trace-otlp-http": "^0.203.0",
-    "@opentelemetry/resources": "^2.0.1",
-    "@opentelemetry/sdk-node": "^0.203.0",
-    "@opentelemetry/sdk-trace-base": "^1.30.0",
-    "@opentelemetry/semantic-conventions": "^1.36.0",
     "@probelabs/maid": "^0.0.16",
     "ai": "^5.0.0",
     "axios": "^1.8.3",

package/src/agent/ProbeAgent.js

@@ -920,9 +920,7 @@ Examples:
 </search>
 
 <extract>
-<path>src/config.js</path>
-<start_line>15</start_line>
-<end_line>25</end_line>
+<targets>src/config.js:15-25</targets>
 </extract>
 
 <attempt_completion>

package/src/extract.js

@@ -48,7 +48,7 @@ export async function extract(options) {
 	const hasContent = options.content !== undefined && options.content !== null;
 
 	if (!hasFiles && !hasInputFile && !hasContent) {
-		throw new Error('Either files array, inputFile, or content must be provided');
+		throw new Error('Extract requires one of: "files" (array of file paths), "inputFile" (path to input file), or "content" (string/buffer for stdin)');
 	}
 
 	// Get the binary path

package/src/index.js

@@ -39,8 +39,6 @@ import { searchTool, queryTool, extractTool, delegateTool } from './tools/vercel
 import { bashTool } from './tools/bash.js';
 import { ProbeAgent } from './agent/ProbeAgent.js';
 import { SimpleTelemetry, SimpleAppTracer, initializeSimpleTelemetryFromOptions } from './agent/simpleTelemetry.js';
-import { TelemetryConfig, initializeTelemetryFromOptions } from './agent/telemetry.js';
-import { AppTracer } from './agent/appTracer.js';
 import { listFilesToolInstance, searchFilesToolInstance } from './agent/probeTool.js';
 import { StorageAdapter, InMemoryStorageAdapter } from './agent/storage/index.js';
 import { HookManager, HOOK_TYPES } from './agent/hooks/index.js';
@@ -64,14 +62,10 @@ export {
 	// Export hooks
 	HookManager,
 	HOOK_TYPES,
-	// Export simple telemetry classes (no OpenTelemetry dependencies)
+	// Export simple telemetry classes (lightweight, no heavy dependencies)
 	SimpleTelemetry,
 	SimpleAppTracer,
 	initializeSimpleTelemetryFromOptions,
-	// Export full OpenTelemetry telemetry classes
-	TelemetryConfig,
-	AppTracer,
-	initializeTelemetryFromOptions,
 	// Export tool generators directly
 	searchTool,
 	queryTool,

package/src/mcp/index.ts

@@ -199,18 +199,18 @@ class ProbeServer {
         },
         {
           name: 'extract_code',
-          description: "Extract code from files. Formats: file.js (whole file), file.js:42 (from line), file.js#functionName (symbol).",
+          description: "Extract code blocks from files using tree-sitter AST parsing. Each file path can include optional line numbers or symbol names to extract specific code blocks.",
           inputSchema: {
             type: 'object',
             properties: {
               path: {
                 type: 'string',
-                description: 'Absolute path to the project directory',
+                description: 'Absolute path to the project root directory (used as working directory for relative file paths)',
               },
               files: {
                 type: 'array',
                 items: { type: 'string' },
-                description: 'Array of file paths with optional line/symbol: ["file.rs:10", "file.rs#func_name"]',
+                description: 'Array of file paths to extract from. Formats: "file.js" (entire file), "file.js:42" (code block at line 42), "file.js:10-20" (lines 10-20), "file.js#funcName" (specific symbol). Line numbers and symbols are part of the path string, not separate parameters. Paths can be absolute or relative to the project directory.',
               }
             },
             required: ['path', 'files'],

package/src/tools/common.js

@@ -7,13 +7,8 @@ import { z } from 'zod';
 
 // Common schemas for tool parameters (used for internal execution after XML parsing)
 export const searchSchema = z.object({
-	query: z.string().describe('Search query with Elasticsearch syntax. Use + for important terms.'),
-	path: z.string().optional().default('.').describe('Path to search in. For dependencies use "go:github.com/owner/repo", "js:package_name", or "rust:cargo_name" etc.'),
-	allow_tests: z.boolean().optional().default(false).describe('Allow test files in search results'),
-	exact: z.boolean().optional().default(false).describe('Perform exact search without tokenization (case-insensitive)'),
-	maxResults: z.number().optional().describe('Maximum number of results to return'),
-	maxTokens: z.number().optional().default(10000).describe('Maximum number of tokens to return'),
-	language: z.string().optional().describe('Limit search to files of a specific programming language')
+	query: z.string().describe('Search query with Elasticsearch syntax. Use quotes for exact matches, AND/OR for boolean logic, - for negation.'),
+	path: z.string().optional().default('.').describe('Path to search in. For dependencies use "go:github.com/owner/repo", "js:package_name", or "rust:cargo_name" etc.')
 });
 
 export const querySchema = z.object({
@@ -24,13 +19,8 @@ export const querySchema = z.object({
 });
 
 export const extractSchema = z.object({
-	targets: z.string().optional().describe('File paths or symbols to extract from. Can include line numbers, symbol names, or multiple space-separated targets'),
-	input_content: z.string().optional().describe('Text content to extract file paths from'),
-	line: z.number().optional().describe('Start line number to extract a specific code block'),
-	end_line: z.number().optional().describe('End line number for extracting a range of lines'),
-	allow_tests: z.boolean().optional().default(false).describe('Allow test files and test code blocks'),
-	context_lines: z.number().optional().default(10).describe('Number of context lines to include'),
-	format: z.string().optional().default('plain').describe('Output format (plain, markdown, json, xml, color, outline-xml, outline-diff)')
+	targets: z.string().optional().describe('File paths or symbols to extract from. Formats: "file.js" (whole file), "file.js:42" (line 42), "file.js:10-20" (lines 10-20), "file.js#funcName" (symbol). Multiple targets separated by spaces.'),
+	input_content: z.string().optional().describe('Text content to extract file paths from (alternative to targets)')
 });
 
 export const delegateSchema = z.object({
@@ -120,13 +110,8 @@ You need to focus on main keywords when constructing the query, and always use e
 - Once data is returned, it's cached and won't return on next runs (this is expected behavior)
 
 Parameters:
-- query: (required) Search query with Elasticsearch syntax. You can use + for important terms, and - for negation.
-- path: (required) Path to search in. All dependencies located in /dep folder, under language sub folders, like this: "/dep/go/github.com/owner/repo", "/dep/js/package_name", or "/dep/rust/cargo_name" etc. YOU SHOULD ALWAYS provide FULL PATH when searching dependencies, including depency name.
-- allow_tests: (optional, default: false) Allow test files in search results (true/false).
-- exact: (optional, default: false) Perform exact pricise search. Use it when you already know function or struct name, or some other code block, and want exact match.
-- maxResults: (optional) Maximum number of results to return (number).
-- maxTokens: (optional, default: 10000) Maximum number of tokens to return (number).
-- language: (optional) Limit search to files of a specific programming language (e.g., 'rust', 'js', 'python', 'go' etc.).
+- query: (required) Search query with Elasticsearch syntax. Use quotes for exact matches ("functionName"), AND/OR for boolean logic, - for negation, + for important terms.
+- path: (optional, default: '.') Path to search in. All dependencies located in /dep folder, under language sub folders, like this: "/dep/go/github.com/owner/repo", "/dep/js/package_name", or "/dep/rust/cargo_name" etc.
 
 **Workflow:** Always start with search, then use extract for detailed context when needed.
 
@@ -148,30 +133,24 @@ User: How to calculate the total amount in the payments module?
 <search>
 <query>calculate AND payment</query>
 <path>src/utils</path>
-<allow_tests>false</allow_tests>
 </search>
 
 User: How do the user authentication and authorization work?
 <search>
-<query>+user and (authentification OR authroization OR authz)</query>
+<query>+user AND (authentication OR authorization OR authz)</query>
 <path>.</path>
-<allow_tests>true</allow_tests>
-<language>go</language>
 </search>
 
 User: Find all react imports in the project.
 <search>
-<query>import { react }</query>
+<query>"import" AND "react"</query>
 <path>.</path>
-<exact>true</exact>
-<language>js</language>
 </search>
 
-User: Find how decompoud library works?
+User: Find how decompound library works?
 <search>
-<query>import { react }</query>
+<query>decompound</query>
 <path>/dep/rust/decompound</path>
-<language>rust</language>
 </search>
 
 </examples>
@@ -208,11 +187,9 @@ Full file extraction should be the LAST RESORT! Always prefer search.
 **Session Awareness:** Reuse context from previous tool calls. Don't re-extract the same symbols you already have.
 
 Parameters:
-- targets: (required) File paths or symbols to extract from. Can include line numbers, symbol names, or multiple space-separated targets (e.g., 'src/main.rs:10-20', 'src/utils.js#myFunction').
-  For multiple extractions: 'session.rs#AuthService.login auth.rs:2-100 config.rs#DatabaseConfig'
-- line: (optional) Start line number to extract a specific code block. Use with end_line for ranges.
-- end_line: (optional) End line number for extracting a range of lines.
-- allow_tests: (optional, default: false) Allow test files and test code blocks (true/false).
+- targets: (required) File paths or symbols to extract from. Formats: "file.js" (whole file), "file.js:42" (code block at line 42), "file.js:10-20" (lines 10-20), "file.js#funcName" (specific symbol). Multiple targets separated by spaces.
+- input_content: (optional) Text content to extract file paths from (alternative to targets for processing diffs/logs).
+
 Usage Example:
 
 <examples>
@@ -239,9 +216,7 @@ User: Lets read the whole file
 
 User: Read the first 10 lines of the file
 <extract>
-<targets>src/search/ranking.rs</targets>
-<line>1</line>
-<end_line>10</end_line>
+<targets>src/search/ranking.rs:1-10</targets>
 </extract>
 
 User: Read file inside the dependency
@@ -349,7 +324,7 @@ export const bashDescription = 'Execute bash commands for system exploration and
 // Valid tool names that should be parsed as tool calls
 const DEFAULT_VALID_TOOLS = [
 	'search',
-	'query', 
+	'query',
 	'extract',
 	'delegate',
 	'listFiles',
@@ -358,6 +333,43 @@ const DEFAULT_VALID_TOOLS = [
 	'attempt_completion'
 ];
 
+/**
+ * Get valid parameter names for a specific tool from its schema
+ * @param {string} toolName - Name of the tool
+ * @returns {string[]} - Array of valid parameter names for this tool
+ */
+function getValidParamsForTool(toolName) {
+	// Map tool names to their schemas
+	const schemaMap = {
+		search: searchSchema,
+		query: querySchema,
+		extract: extractSchema,
+		delegate: delegateSchema,
+		bash: bashSchema,
+		attempt_completion: attemptCompletionSchema
+	};
+
+	const schema = schemaMap[toolName];
+	if (!schema) {
+		// For tools without schema (listFiles, searchFiles, implement), return common params
+		// These are the shared params that appear across multiple tools
+		return ['path', 'directory', 'pattern', 'recursive', 'includeHidden', 'task', 'files', 'autoCommits', 'result'];
+	}
+
+	// For attempt_completion, it has custom validation, just return 'result'
+	if (toolName === 'attempt_completion') {
+		return ['result'];
+	}
+
+	// Extract keys from Zod schema
+	if (schema && schema._def && schema._def.shape) {
+		return Object.keys(schema._def.shape());
+	}
+
+	// Fallback: return empty array if we can't extract schema keys
+	return [];
+}
+
 // Simple XML parser helper - safer string-based approach
 export function parseXmlToolCall(xmlString, validTools = DEFAULT_VALID_TOOLS) {
 	// Look for each valid tool name specifically using string search
@@ -387,15 +399,12 @@ export function parseXmlToolCall(xmlString, validTools = DEFAULT_VALID_TOOLS) {
 
 		const params = {};
 
+		// Get valid parameters for this specific tool from its schema
+		const validParams = getValidParamsForTool(toolName);
+
 		// Parse parameters using string-based approach for better safety
-		// Common parameter names to look for (can be extended as needed)
-		// Note: includes both camelCase and underscore_case variants to handle inconsistencies
-		const commonParams = ['query', 'file_path', 'line', 'end_line', 'path', 'recursive', 'includeHidden',
-		                      'max_results', 'maxResults', 'result', 'command', 'description', 'task', 'param', 'pattern',
-		                      'allow_tests', 'exact', 'maxTokens', 'language', 'input_content',
-		                      'context_lines', 'format', 'directory', 'autoCommits', 'files', 'targets'];
-
-		for (const paramName of commonParams) {
+		// Only look for parameters that are valid for this specific tool
+		for (const paramName of validParams) {
 			const paramOpenTag = `<${paramName}>`;
 			const paramCloseTag = `</${paramName}>`;
 
@@ -410,7 +419,7 @@ export function parseXmlToolCall(xmlString, validTools = DEFAULT_VALID_TOOLS) {
 			if (paramCloseIndex === -1) {
 				// Find the next opening tag after this parameter
 				let nextTagIndex = innerContent.length;
-				for (const nextParam of commonParams) {
+				for (const nextParam of validParams) {
 					const nextOpenTag = `<${nextParam}>`;
 					const nextIndex = innerContent.indexOf(nextOpenTag, paramOpenIndex + paramOpenTag.length);
 					if (nextIndex !== -1 && nextIndex < nextTagIndex) {

package/build/agent/appTracer.js

@@ -1,360 +0,0 @@
-import { trace, context, SpanStatusCode } from '@opentelemetry/api';
-
-/**
- * Application-specific tracing layer for probe-agent
- * Provides higher-level tracing functions for AI operations and tool calls
- */
-export class AppTracer {
-  constructor(telemetryConfig, sessionId = null) {
-    this.telemetryConfig = telemetryConfig;
-    this.tracer = telemetryConfig?.getTracer();
-    this.sessionId = sessionId || this.generateSessionId();
-    this.traceId = this.generateTraceId();
-  }
-
-  /**
-   * Generate a unique session ID
-   */
-  generateSessionId() {
-    return Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15);
-  }
-
-  /**
-   * Generate trace ID from session ID for consistent tracing
-   */
-  generateTraceId() {
-    if (!this.sessionId) return null;
-    
-    // Create a deterministic trace ID from session ID
-    const hash = this.hashString(this.sessionId);
-    return hash.padEnd(32, '0').substring(0, 32);
-  }
-
-  /**
-   * Simple hash function for session ID
-   */
-  hashString(str) {
-    let hash = 0;
-    for (let i = 0; i < str.length; i++) {
-      const char = str.charCodeAt(i);
-      hash = ((hash << 5) - hash) + char;
-      hash = hash & hash; // Convert to 32bit integer
-    }
-    return Math.abs(hash).toString(16);
-  }
-
-  /**
-   * Check if tracing is enabled
-   */
-  isEnabled() {
-    return this.tracer !== null;
-  }
-
-  /**
-   * Create a root span for the agent session
-   */
-  createSessionSpan(attributes = {}) {
-    if (!this.isEnabled()) return null;
-
-    return this.tracer.startSpan('agent.session', {
-      attributes: {
-        'session.id': this.sessionId,
-        'trace.id': this.traceId,
-        ...attributes,
-      },
-    });
-  }
-
-  /**
-   * Create a span for AI model requests
-   */
-  createAISpan(modelName, provider, attributes = {}) {
-    if (!this.isEnabled()) return null;
-
-    return this.tracer.startSpan('ai.request', {
-      attributes: {
-        'ai.model': modelName,
-        'ai.provider': provider,
-        'session.id': this.sessionId,
-        ...attributes,
-      },
-    });
-  }
-
-  /**
-   * Create a span for tool calls
-   */
-  createToolSpan(toolName, attributes = {}) {
-    if (!this.isEnabled()) return null;
-
-    return this.tracer.startSpan('tool.call', {
-      attributes: {
-        'tool.name': toolName,
-        'session.id': this.sessionId,
-        ...attributes,
-      },
-    });
-  }
-
-  /**
-   * Create a span for code search operations
-   */
-  createSearchSpan(query, attributes = {}) {
-    if (!this.isEnabled()) return null;
-
-    return this.tracer.startSpan('search.query', {
-      attributes: {
-        'search.query': query,
-        'session.id': this.sessionId,
-        ...attributes,
-      },
-    });
-  }
-
-  /**
-   * Create a span for code extraction operations
-   */
-  createExtractSpan(files, attributes = {}) {
-    if (!this.isEnabled()) return null;
-
-    return this.tracer.startSpan('extract.files', {
-      attributes: {
-        'extract.file_count': Array.isArray(files) ? files.length : 1,
-        'extract.files': Array.isArray(files) ? files.join(',') : files,
-        'session.id': this.sessionId,
-        ...attributes,
-      },
-    });
-  }
-
-  /**
-   * Create a span for agent iterations
-   */
-  createIterationSpan(iteration, attributes = {}) {
-    if (!this.isEnabled()) return null;
-
-    return this.tracer.startSpan('agent.iteration', {
-      attributes: {
-        'iteration.number': iteration,
-        'session.id': this.sessionId,
-        ...attributes,
-      },
-    });
-  }
-
-  /**
-   * Create a span for delegation operations
-   */
-  createDelegationSpan(task, attributes = {}) {
-    if (!this.isEnabled()) return null;
-
-    return this.tracer.startSpan('agent.delegation', {
-      attributes: {
-        'delegation.task': task.substring(0, 200) + (task.length > 200 ? '...' : ''),
-        'delegation.task_length': task.length,
-        'session.id': this.sessionId,
-        ...attributes,
-      },
-    });
-  }
-
-  /**
-   * Create a span for JSON validation operations
-   */
-  createJsonValidationSpan(responseLength, attributes = {}) {
-    if (!this.isEnabled()) return null;
-
-    return this.tracer.startSpan('validation.json', {
-      attributes: {
-        'validation.response_length': responseLength,
-        'session.id': this.sessionId,
-        ...attributes,
-      },
-    });
-  }
-
-  /**
-   * Create a span for Mermaid validation operations
-   */
-  createMermaidValidationSpan(diagramCount, attributes = {}) {
-    if (!this.isEnabled()) return null;
-
-    return this.tracer.startSpan('validation.mermaid', {
-      attributes: {
-        'validation.diagram_count': diagramCount,
-        'session.id': this.sessionId,
-        ...attributes,
-      },
-    });
-  }
-
-  /**
-   * Create a span for schema processing operations
-   */
-  createSchemaProcessingSpan(schemaType, attributes = {}) {
-    if (!this.isEnabled()) return null;
-
-    return this.tracer.startSpan('schema.processing', {
-      attributes: {
-        'schema.type': schemaType,
-        'session.id': this.sessionId,
-        ...attributes,
-      },
-    });
-  }
-
-  /**
-   * Record delegation events
-   */
-  recordDelegationEvent(eventType, data = {}) {
-    if (!this.isEnabled()) return;
-
-    this.addEvent(`delegation.${eventType}`, {
-      'session.id': this.sessionId,
-      ...data
-    });
-  }
-
-  /**
-   * Record JSON validation events
-   */
-  recordJsonValidationEvent(eventType, data = {}) {
-    if (!this.isEnabled()) return;
-
-    this.addEvent(`json_validation.${eventType}`, {
-      'session.id': this.sessionId,
-      ...data
-    });
-  }
-
-  /**
-   * Record Mermaid validation events
-   */
-  recordMermaidValidationEvent(eventType, data = {}) {
-    if (!this.isEnabled()) return;
-
-    this.addEvent(`mermaid_validation.${eventType}`, {
-      'session.id': this.sessionId,
-      ...data
-    });
-  }
-
-  /**
-   * Add an event to the current or most recent span
-   */
-  addEvent(name, attributes = {}) {
-    if (!this.isEnabled()) return;
-
-    // Try to add to the current span in context
-    const activeSpan = trace.getActiveSpan();
-    if (activeSpan) {
-      activeSpan.addEvent(name, {
-        'session.id': this.sessionId,
-        ...attributes,
-      });
-    } else {
-      // Fallback: log as structured data if no active span
-      if (this.telemetryConfig?.enableConsole) {
-        console.log(`[Event] ${name}:`, attributes);
-      }
-    }
-  }
-
-  /**
-   * Set attributes on the current span
-   */
-  setAttributes(attributes) {
-    if (!this.isEnabled()) return;
-
-    const activeSpan = trace.getActiveSpan();
-    if (activeSpan) {
-      activeSpan.setAttributes({
-        'session.id': this.sessionId,
-        ...attributes,
-      });
-    }
-  }
-
-  /**
-   * Wrap a function with automatic span creation
-   */
-  wrapFunction(spanName, fn, attributes = {}) {
-    if (!this.isEnabled()) {
-      return fn;
-    }
-
-    return async (...args) => {
-      const span = this.tracer.startSpan(spanName, {
-        attributes: {
-          'session.id': this.sessionId,
-          ...attributes,
-        },
-      });
-
-      try {
-        const result = await context.with(trace.setSpan(context.active(), span), () => fn(...args));
-        span.setStatus({ code: SpanStatusCode.OK });
-        return result;
-      } catch (error) {
-        span.setStatus({
-          code: SpanStatusCode.ERROR,
-          message: error.message,
-        });
-        span.recordException(error);
-        throw error;
-      } finally {
-        span.end();
-      }
-    };
-  }
-
-  /**
-   * Execute a function within a span context
-   */
-  async withSpan(spanName, fn, attributes = {}) {
-    if (!this.isEnabled()) {
-      return fn();
-    }
-
-    const span = this.tracer.startSpan(spanName, {
-      attributes: {
-        'session.id': this.sessionId,
-        ...attributes,
-      },
-    });
-
-    try {
-      const result = await context.with(trace.setSpan(context.active(), span), () => fn());
-      span.setStatus({ code: SpanStatusCode.OK });
-      return result;
-    } catch (error) {
-      span.setStatus({
-        code: SpanStatusCode.ERROR,
-        message: error.message,
-      });
-      span.recordException(error);
-      throw error;
-    } finally {
-      span.end();
-    }
-  }
-
-
-  /**
-   * Force flush all pending spans
-   */
-  async flush() {
-    if (this.telemetryConfig) {
-      await this.telemetryConfig.forceFlush();
-    }
-  }
-
-  /**
-   * Shutdown tracing
-   */
-  async shutdown() {
-    if (this.telemetryConfig) {
-      await this.telemetryConfig.shutdown();
-    }
-  }
-}