@probelabs/probe 0.6.0-rc134 → 0.6.0-rc136

package/index.d.ts

@@ -560,5 +560,160 @@ export interface ProbeAgentEvents {
   removeAllListeners(event?: 'toolCall'): this;
 }
 
+/**
+ * Simple telemetry configuration (no OpenTelemetry dependencies)
+ */
+export interface SimpleTelemetryOptions {
+  /** Enable console logging */
+  enableConsole?: boolean;
+  /** Enable file logging */
+  enableFile?: boolean;
+  /** File path for logs */
+  filePath?: string;
+}
+
+/**
+ * Simple telemetry class for basic tracing without OpenTelemetry
+ */
+export declare class SimpleTelemetry {
+  constructor(options?: SimpleTelemetryOptions);
+  log(message: string, data?: any): void;
+  flush(): Promise<void>;
+  shutdown(): Promise<void>;
+}
+
+/**
+ * Simple application tracer for basic operations
+ */
+export declare class SimpleAppTracer {
+  constructor(telemetry?: SimpleTelemetry, sessionId?: string);
+  isEnabled(): boolean;
+  log(operation: string, data?: any): void;
+  flush(): Promise<void>;
+  shutdown(): Promise<void>;
+}
+
+/**
+ * Initialize simple telemetry from options
+ */
+export declare function initializeSimpleTelemetryFromOptions(options: any): SimpleTelemetry;
+
+/**
+ * Full OpenTelemetry configuration options
+ */
+export interface TelemetryConfigOptions {
+  /** Service name for tracing */
+  serviceName?: string;
+  /** Service version */
+  serviceVersion?: string;
+  /** Enable file export */
+  enableFile?: boolean;
+  /** Enable remote OTLP export */
+  enableRemote?: boolean;
+  /** Enable console export */
+  enableConsole?: boolean;
+  /** File path for trace export */
+  filePath?: string;
+  /** Remote OTLP endpoint URL */
+  remoteEndpoint?: string;
+}
+
+/**
+ * Full OpenTelemetry configuration class
+ */
+export declare class TelemetryConfig {
+  constructor(options?: TelemetryConfigOptions);
+
+  /** Initialize the OpenTelemetry SDK */
+  initialize(): void;
+
+  /** Get the tracer instance */
+  getTracer(): any;
+
+  /** Create a span with attributes */
+  createSpan(name: string, attributes?: Record<string, any>): any;
+
+  /** Wrap a function with automatic span creation */
+  wrapFunction(name: string, fn: Function, attributes?: Record<string, any>): Function;
+
+  /** Force flush all pending spans */
+  forceFlush(): Promise<void>;
+
+  /** Shutdown telemetry */
+  shutdown(): Promise<void>;
+}
+
+/**
+ * Application-specific tracing layer for AI operations
+ */
+export declare class AppTracer {
+  constructor(telemetryConfig?: TelemetryConfig, sessionId?: string);
+
+  /** Check if tracing is enabled */
+  isEnabled(): boolean;
+
+  /** Create a root span for the agent session */
+  createSessionSpan(attributes?: Record<string, any>): any;
+
+  /** Create a span for AI model requests */
+  createAISpan(modelName: string, provider: string, attributes?: Record<string, any>): any;
+
+  /** Create a span for tool calls */
+  createToolSpan(toolName: string, attributes?: Record<string, any>): any;
+
+  /** Create a span for code search operations */
+  createSearchSpan(query: string, attributes?: Record<string, any>): any;
+
+  /** Create a span for code extraction operations */
+  createExtractSpan(files: string | string[], attributes?: Record<string, any>): any;
+
+  /** Create a span for agent iterations */
+  createIterationSpan(iteration: number, attributes?: Record<string, any>): any;
+
+  /** Create a span for delegation operations */
+  createDelegationSpan(task: string, attributes?: Record<string, any>): any;
+
+  /** Create a span for JSON validation operations */
+  createJsonValidationSpan(responseLength: number, attributes?: Record<string, any>): any;
+
+  /** Create a span for Mermaid validation operations */
+  createMermaidValidationSpan(diagramCount: number, attributes?: Record<string, any>): any;
+
+  /** Create a span for schema processing operations */
+  createSchemaProcessingSpan(schemaType: string, attributes?: Record<string, any>): any;
+
+  /** Record delegation events */
+  recordDelegationEvent(eventType: string, data?: Record<string, any>): void;
+
+  /** Record JSON validation events */
+  recordJsonValidationEvent(eventType: string, data?: Record<string, any>): void;
+
+  /** Record Mermaid validation events */
+  recordMermaidValidationEvent(eventType: string, data?: Record<string, any>): void;
+
+  /** Add an event to the current span */
+  addEvent(name: string, attributes?: Record<string, any>): void;
+
+  /** Set attributes on the current span */
+  setAttributes(attributes: Record<string, any>): void;
+
+  /** Wrap a function with automatic span creation */
+  wrapFunction(spanName: string, fn: Function, attributes?: Record<string, any>): Function;
+
+  /** Execute a function within a span context */
+  withSpan(spanName: string, fn: Function, attributes?: Record<string, any>): Promise<any>;
+
+  /** Force flush all pending spans */
+  flush(): Promise<void>;
+
+  /** Shutdown tracing */
+  shutdown(): Promise<void>;
+}
+
+/**
+ * Initialize full OpenTelemetry telemetry from options
+ */
+export declare function initializeTelemetryFromOptions(options: any): TelemetryConfig;
+
 // Default export for ES modules
 export { ProbeAgent as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@probelabs/probe",
-  "version": "0.6.0-rc134",
+  "version": "0.6.0-rc136",
   "description": "Node.js wrapper for the probe code search tool",
   "main": "src/index.js",
   "module": "src/index.js",
@@ -21,6 +21,10 @@
       "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"
     }

package/src/agent/ProbeAgent.js

@@ -1613,8 +1613,7 @@ When troubleshooting:
           // Build appropriate reminder message based on whether schema is provided
           let reminderContent;
           if (options.schema) {  // Apply for ANY schema, not just JSON schemas
-            // When schema is provided, AI should either use tools OR provide natural response
-            // Schema formatting will happen automatically afterward
+            // When schema is provided, AI must use attempt_completion to trigger schema formatting
             reminderContent = `Please use one of the available tools to help answer the question, or use attempt_completion if you have enough information to provide a final answer.
 
 Remember: Use proper XML format with BOTH opening and closing tags:
@@ -1623,16 +1622,14 @@ Remember: Use proper XML format with BOTH opening and closing tags:
 <parameter>value</parameter>
 </tool_name>
 
-IMPORTANT: A schema was provided for the final output format. You have two options:
+IMPORTANT: A schema was provided for the final output format.
 
-Option 1 - Use attempt_completion with your complete answer:
+You MUST use attempt_completion to provide your answer:
 <attempt_completion>
-[Your complete answer here - will be automatically formatted to match the schema]
+[Your complete answer here - provide in natural language, it will be automatically formatted to match the schema]
 </attempt_completion>
 
-Option 2 - Provide a natural response without any tool, and it will be automatically formatted.
-
-Do NOT try to format your response as JSON yourself - this will be done automatically.`;
+Your response will be automatically formatted to JSON. You can provide your answer in natural language or as JSON - either will work.`;
           } else {
             // Standard reminder without schema
             reminderContent = `Please use one of the available tools to help answer the question, or use attempt_completion if you have enough information to provide a final answer.
@@ -1928,8 +1925,9 @@ Convert your previous response content into actual JSON data that follows this s
         }
       } else if (reachedMaxIterations && options.schema && this.debug) {
         console.log('[DEBUG] Skipping schema formatting due to max iterations reached without completion');
-      } else if (completionAttempted && options.schema && !options._schemaFormatted) {
+      } else if (completionAttempted && options.schema && !options._schemaFormatted && !options._skipValidation) {
         // For attempt_completion results with schema, still clean markdown if needed
+        // Skip this validation if we're in a recursive correction call (_skipValidation flag)
         try {
           finalResult = cleanSchemaResponse(finalResult);
           
@@ -1995,9 +1993,10 @@ Convert your previous response content into actual JSON data that follows this s
                 0
               );
               
-              finalResult = await this.answer(schemaDefinitionPrompt, [], { 
-                ...options, 
-                _schemaFormatted: true 
+              finalResult = await this.answer(schemaDefinitionPrompt, [], {
+                ...options,
+                _schemaFormatted: true,
+                _skipValidation: true  // Skip validation in recursive correction calls to prevent loops
               });
               finalResult = cleanSchemaResponse(finalResult);
               validation = validateJsonResponse(finalResult);
@@ -2040,9 +2039,10 @@ Convert your previous response content into actual JSON data that follows this s
                 );
               }
               
-              finalResult = await this.answer(correctionPrompt, [], { 
-                ...options, 
-                _schemaFormatted: true 
+              finalResult = await this.answer(correctionPrompt, [], {
+                ...options,
+                _schemaFormatted: true,
+                _skipValidation: true  // Skip validation in recursive correction calls to prevent loops
               });
               finalResult = cleanSchemaResponse(finalResult);
               

package/src/agent/schemaUtils.js

@@ -765,6 +765,9 @@ Ensure all Mermaid diagrams are properly formatted within \`\`\`mermaid code blo
   return prompt;
 }
 
+// Counter to ensure unique session IDs even when created in the same millisecond
+let sessionIdCounter = 0;
+
 /**
  * Specialized JSON fixing agent
  * Uses a separate ProbeAgent instance optimized for JSON syntax correction
@@ -774,7 +777,7 @@ export class JsonFixingAgent {
     // Import ProbeAgent dynamically to avoid circular dependencies
     this.ProbeAgent = null;
     this.options = {
-      sessionId: options.sessionId || `json-fixer-${Date.now()}`,
+      sessionId: options.sessionId || `json-fixer-${Date.now()}-${sessionIdCounter++}`,
       path: options.path || process.cwd(),
       provider: options.provider,
       model: options.model,
@@ -1001,7 +1004,7 @@ export class MermaidFixingAgent {
     // Import ProbeAgent dynamically to avoid circular dependencies
     this.ProbeAgent = null;
     this.options = {
-      sessionId: options.sessionId || `mermaid-fixer-${Date.now()}`,
+      sessionId: options.sessionId || `mermaid-fixer-${Date.now()}-${sessionIdCounter++}`,
       path: options.path || process.cwd(),
       provider: options.provider,
       model: options.model,

package/src/agent/telemetry.js

@@ -1,6 +1,6 @@
 import nodeSDKPkg from '@opentelemetry/sdk-node';
 import resourcesPkg from '@opentelemetry/resources';
-import semanticConventionsPkg from '@opentelemetry/semantic-conventions';
+import { ATTR_SERVICE_NAME, ATTR_SERVICE_VERSION } from '@opentelemetry/semantic-conventions';
 import { trace, context, SpanStatusCode } from '@opentelemetry/api';
 import otlpPkg from '@opentelemetry/exporter-trace-otlp-http';
 import spanPkg from '@opentelemetry/sdk-trace-base';
@@ -10,8 +10,7 @@ import { dirname } from 'path';
 import { FileSpanExporter } from './fileSpanExporter.js';
 
 const { NodeSDK } = nodeSDKPkg;
-const { resourceFromAttributes } = resourcesPkg;
-const { ATTR_SERVICE_NAME, ATTR_SERVICE_VERSION } = semanticConventionsPkg;
+const { Resource } = resourcesPkg;
 const { OTLPTraceExporter } = otlpPkg;
 const { BatchSpanProcessor, ConsoleSpanExporter } = spanPkg;
 
@@ -40,7 +39,7 @@ export class TelemetryConfig {
       return;
     }
 
-    const resource = resourceFromAttributes({
+    const resource = new Resource({
       [ATTR_SERVICE_NAME]: this.serviceName,
       [ATTR_SERVICE_VERSION]: this.serviceVersion,
     });

package/src/index.js

@@ -35,6 +35,8 @@ 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';
@@ -58,10 +60,14 @@ export {
 	// Export hooks
 	HookManager,
 	HOOK_TYPES,
-	// Export telemetry classes
+	// Export simple telemetry classes (no OpenTelemetry dependencies)
 	SimpleTelemetry,
 	SimpleAppTracer,
 	initializeSimpleTelemetryFromOptions,
+	// Export full OpenTelemetry telemetry classes
+	TelemetryConfig,
+	AppTracer,
+	initializeTelemetryFromOptions,
 	// Export tool generators directly
 	searchTool,
 	queryTool,