@probelabs/probe-chat 0.6.0-rc56 → 0.6.0-rc58

package/index.html

@@ -1735,15 +1735,67 @@
 				const response = await fetch(`/api/session/${sessionId}/history`);
 				const data = await response.json();
 				
+				console.log(`[DEBUG] Session restoration data:`, {
+					exists: data.exists,
+					historyLength: data.history ? data.history.length : 'null/undefined',
+					condition: data.exists && data.history && data.history.length > 0
+				});
+				
 				if (data.exists && data.history && data.history.length > 0) {
 					console.log(`Restored ${data.history.length} messages for session: ${sessionId}`);
 					
+					// Count message types for debugging
+					const messageTypes = {};
+					data.history.forEach(msg => {
+						messageTypes[msg.role] = (messageTypes[msg.role] || 0) + 1;
+					});
+					console.log(`[DEBUG] Message types to restore:`, messageTypes);
+					
 					// Render restored messages
-					data.history.forEach(message => {
+					let currentAiMessage = null;
+					data.history.forEach((message, index) => {
+						console.log(`[DEBUG] Processing message ${index + 1}/${data.history.length}: role=${message.role}`);
 						if (message.role === 'user') {
-							addUserMessage(message.content, message.images || []);
+							// Ensure images is always an array
+							const images = Array.isArray(message.images) ? message.images : [];
+							addUserMessage(message.content, images);
+							currentAiMessage = null; // Reset for new conversation turn
 						} else if (message.role === 'assistant') {
 							addAssistantMessage(message.content);
+							// Get the most recent AI message for tool call rendering
+							const messagesDiv = document.getElementById('messages');
+							const aiMessages = messagesDiv.querySelectorAll('.ai-message');
+							currentAiMessage = aiMessages[aiMessages.length - 1];
+						} else if (message.role === 'toolCall') {
+							console.log(`[DEBUG] Rendering toolCall message`);
+							// Handle tool call messages during restoration
+							try {
+								// Parse the tool call from the stored message
+								const toolCall = {
+									name: message.metadata?.name || 'unknown',
+									args: message.metadata?.args || {},
+									timestamp: message.timestamp,
+									status: 'completed'
+								};
+								
+								// If we have a current AI message, add the tool call to it
+								if (currentAiMessage) {
+									addToolCallToMessage(currentAiMessage, toolCall);
+								} else {
+									console.log(`[DEBUG] No current AI message for tool call, creating temporary message`);
+									// Create a temporary AI message for the tool call
+									const tempDiv = document.createElement('div');
+									tempDiv.className = 'ai-message';
+									const messagesDiv = document.getElementById('messages');
+									messagesDiv.appendChild(tempDiv);
+									addToolCallToMessage(tempDiv, toolCall);
+									currentAiMessage = tempDiv;
+								}
+							} catch (error) {
+								console.error('[DEBUG] Error rendering tool call:', error, message);
+							}
+						} else {
+							console.log(`[DEBUG] Skipping message with role: ${message.role}`);
 						}
 					});
 					
@@ -1778,12 +1830,17 @@
 						}
 					}, 100); // Small delay to ensure DOM is fully updated
 				} else {
-					console.log(`No history found for session: ${sessionId}`);
+					console.log(`[DEBUG] No history found for session: ${sessionId}`, {
+						exists: data.exists,
+						historyExists: !!data.history,
+						historyLength: data.history ? data.history.length : 'N/A'
+					});
 					// Show user-friendly message for session not found
 					showSessionNotFoundMessage(sessionId);
 				}
 			} catch (error) {
-				console.error('Error restoring session history:', error);
+				console.error('[DEBUG] Error restoring session history:', error);
+				console.error('[DEBUG] Error stack:', error.stack);
 				// Show error message for network or other errors
 				showSessionNotFoundMessage(sessionId);
 			}
@@ -2571,6 +2628,14 @@
 					}
 
 					toolDescription = `Extracting code from ${filePath}${lineInfo}`;
+				} else if (toolCall.name === 'searchFiles') {
+					const pattern = toolCall.args.pattern || '';
+					const directory = toolCall.args.directory || '.';
+					toolDescription = `Searching for files matching "${pattern}"${directory !== '.' ? ` in ${directory}` : ''}`;
+				} else if (toolCall.name === 'listFiles') {
+					const directory = toolCall.args.directory || '.';
+					const pattern = toolCall.args.pattern || '';
+					toolDescription = `Listing files${pattern ? ` matching "${pattern}"` : ''}${directory !== '.' ? ` in ${directory}` : ''}`;
 				} else {
 					toolDescription = `Using ${toolCall.name} tool`;
 				}

package/index.js

@@ -58,6 +58,7 @@ export function main() {
     .option('-p, --port <port>', 'Port to run web server on (default: 8080)')
     .option('-m, --message <message>', 'Send a single message and exit (non-interactive mode)')
     .option('-s, --session-id <sessionId>', 'Specify a session ID for the chat (optional)')
+    .option('--images <urls>', 'Comma-separated list of image URLs to include in the message')
     .option('--json', 'Output the response as JSON in non-interactive mode')
     .option('--max-iterations <number>', 'Maximum number of tool iterations allowed (default: 30)')
     .option('--prompt <value>', 'Use a custom prompt (values: architect, code-review, support, path to a file, or arbitrary string)')
@@ -76,6 +77,13 @@ export function main() {
   const options = program.opts();
   const pathArg = program.args[0];
 
+  // Parse image URLs if provided
+  let imageUrls = [];
+  if (options.images) {
+    imageUrls = options.images.split(',').map(url => url.trim()).filter(url => url.length > 0);
+    console.log(`Using ${imageUrls.length} image(s):`, imageUrls);
+  }
+
   // --- Logging Configuration ---
   const isPipedInput = process.env.PROBE_STDIN_PIPED === '1';
   const isNonInteractive = !!options.message || isPipedInput;
@@ -315,6 +323,27 @@ export function main() {
   const googleApiKey = process.env.GOOGLE_API_KEY;
   const hasApiKeys = !!(anthropicApiKey || openaiApiKey || googleApiKey);
 
+  // --- Web Mode (check before non-interactive to override) ---
+  if (options.web) {
+    if (!hasApiKeys) {
+      // Use logWarn for web mode warning
+      logWarn(chalk.yellow('Warning: No API key provided. The web interface will show instructions on how to set up API keys.'));
+    }
+    // Import and start web server
+    import('./webServer.js')
+      .then(async module => {
+        const { startWebServer } = module;
+        logInfo(`Starting web server on port ${process.env.PORT || 8080}...`);
+        await startWebServer(version, hasApiKeys, { allowEdit: options.allowEdit });
+      })
+      .catch(error => {
+        logError(chalk.red(`Error starting web server: ${error.message}`));
+        process.exit(1);
+      });
+    return; // Exit main function
+  }
+  // --- End Web Mode ---
+
   // --- Non-Interactive Mode ---
   if (isNonInteractive) {
     if (!hasApiKeys) {
@@ -370,7 +399,7 @@ export function main() {
         }
 
         logInfo('Sending message...'); // Log only if debug
-        const result = await chat.chat(message, chat.getSessionId()); // Use the chat's current session ID
+        const result = await chat.chat(message, chat.getSessionId(), null, imageUrls); // Use the chat's current session ID and pass images
 
         if (result && typeof result === 'object' && result.response !== undefined) {
           if (options.json) {
@@ -417,28 +446,6 @@ export function main() {
   // --- End Non-Interactive Mode ---
 
 
-  // --- Web Mode ---
-  if (options.web) {
-    if (!hasApiKeys) {
-      // Use logWarn for web mode warning
-      logWarn(chalk.yellow('Warning: No API key provided. The web interface will show instructions on how to set up API keys.'));
-    }
-    // Import and start web server
-    import('./webServer.js')
-      .then(module => {
-        const { startWebServer } = module;
-        logInfo(`Starting web server on port ${process.env.PORT || 8080}...`);
-        startWebServer(version, hasApiKeys, { allowEdit: options.allowEdit });
-      })
-      .catch(error => {
-        logError(chalk.red(`Error starting web server: ${error.message}`));
-        process.exit(1);
-      });
-    return; // Exit main function
-  }
-  // --- End Web Mode ---
-
-
   // --- Interactive CLI Mode ---
   // (This block only runs if not non-interactive and not web mode)
 
@@ -544,7 +551,7 @@ export function main() {
 
       const spinner = ora('Thinking...').start(); // Spinner is ok for interactive mode
       try {
-        const result = await chat.chat(message); // Uses internal session ID
+        const result = await chat.chat(message, null, null, imageUrls); // Uses internal session ID and pass images
         spinner.stop();
 
         logInfo(chalk.green('Assistant:'));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@probelabs/probe-chat",
-  "version": "0.6.0-rc56",
+  "version": "0.6.0-rc58",
   "description": "CLI and web interface for Probe code search (formerly @probelabs/probe-web and @probelabs/probe-chat)",
   "main": "index.js",
   "type": "module",
@@ -32,7 +32,7 @@
     "@ai-sdk/anthropic": "^1.2.0",
     "@ai-sdk/google": "^1.2.1",
     "@ai-sdk/openai": "^1.3.0",
-    "@buger/probe": "^0.6.0-rc56",
+    "@buger/probe": "^0.6.0-rc58",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/exporter-trace-otlp-http": "^0.203.0",
     "@opentelemetry/resources": "^2.0.1",

package/webServer.js

@@ -5,7 +5,7 @@ import { readFileSync, existsSync } from 'fs';
 import { resolve, dirname, join } from 'path';
 import { fileURLToPath } from 'url';
 import { randomUUID } from 'crypto';
-import { ProbeChat } from './probeChat.js';
+import { ChatSessionManager } from './ChatSessionManager.js';
 import { TokenUsageDisplay } from './tokenUsageDisplay.js';
 import { authMiddleware, withAuth } from './auth.js';
 import {
@@ -32,7 +32,7 @@ let globalStorage = null;
 const chatSessions = new Map();
 
 /**
- * Retrieve or create a ProbeChat instance keyed by sessionId.
+ * Retrieve or create a ChatSessionManager instance keyed by sessionId.
  */
 function getOrCreateChat(sessionId, apiCredentials = null) {
 	if (!sessionId) {
@@ -54,24 +54,19 @@ function getOrCreateChat(sessionId, apiCredentials = null) {
 	}
 
 	// Create options object with sessionId and API credentials if provided
-	const options = { sessionId };
+	const options = { 
+		sessionId,
+		storage: globalStorage,
+		debug: process.env.DEBUG_CHAT === '1'
+	};
+	
 	if (apiCredentials) {
 		options.apiProvider = apiCredentials.apiProvider;
 		options.apiKey = apiCredentials.apiKey;
 		options.apiUrl = apiCredentials.apiUrl;
 	}
-	
-	// Pass storage instance for persistent storage
-	if (globalStorage) {
-		options.storage = globalStorage;
-	}
 
-	const newChat = new ProbeChat(options);
-	
-	// Add timestamps for session tracking
-	const now = Date.now();
-	newChat.createdAt = now;
-	newChat.lastActivity = now;
+	const newChat = new ChatSessionManager(options);
 	
 	// Store in memory cache
 	chatSessions.set(sessionId, newChat);
@@ -80,8 +75,8 @@ function getOrCreateChat(sessionId, apiCredentials = null) {
 	if (globalStorage) {
 		globalStorage.saveSession({
 			id: sessionId,
-			createdAt: now,
-			lastActivity: now,
+			createdAt: newChat.createdAt,
+			lastActivity: newChat.lastActivity,
 			firstMessagePreview: null, // Will be updated when first message is sent
 			metadata: {
 				apiProvider: apiCredentials?.apiProvider || null
@@ -92,7 +87,7 @@ function getOrCreateChat(sessionId, apiCredentials = null) {
 	}
 	
 	if (process.env.DEBUG_CHAT === '1') {
-		console.log(`[DEBUG] Created and stored new chat instance for session: ${sessionId}. Total sessions: ${chatSessions.size}`);
+		console.log(`[DEBUG] Created and stored new ChatSessionManager instance for session: ${sessionId}. Total sessions: ${chatSessions.size}`);
 		if (apiCredentials && apiCredentials.apiKey) {
 			console.log(`[DEBUG] Chat instance created with client-provided API credentials (provider: ${apiCredentials.apiProvider})`);
 		}
@@ -107,7 +102,7 @@ function getOrCreateChat(sessionId, apiCredentials = null) {
  * @param {Object} options - Additional options
  * @param {boolean} options.allowEdit - Whether to allow editing files via the implement tool
  */
-export function startWebServer(version, hasApiKeys = true, options = {}) {
+export async function startWebServer(version, hasApiKeys = true, options = {}) {
 	const allowEdit = options?.allowEdit || false;
 	
 	if (allowEdit) {
@@ -130,16 +125,14 @@ export function startWebServer(version, hasApiKeys = true, options = {}) {
 		verbose: process.env.DEBUG_CHAT === '1' 
 	});
 	
-	// Initialize storage asynchronously
-	(async () => {
-		try {
-			await globalStorage.initialize();
-			const stats = await globalStorage.getStats();
-			console.log(`Chat history storage: ${stats.storage_type} (${stats.session_count} sessions, ${stats.visible_message_count} messages)`);
-		} catch (error) {
-			console.warn('Failed to initialize chat history storage:', error.message);
-		}
-	})();
+	// Initialize storage synchronously before server starts
+	try {
+		await globalStorage.initialize();
+		const stats = await globalStorage.getStats();
+		console.log(`Chat history storage: ${stats.storage_type} (${stats.session_count} sessions, ${stats.visible_message_count} messages)`);
+	} catch (error) {
+		console.warn('Failed to initialize chat history storage:', error.message);
+	}
 
 	// Map to store SSE clients by session ID
 	const sseClients = new Map();
@@ -763,9 +756,9 @@ export function startWebServer(version, hasApiKeys = true, options = {}) {
 					// The loop is inside chatInstance.chat now.
 					// We expect the *final* result string back.
 					try {
-						// Pass API credentials to the chat method if provided
-						const apiCredentials = apiKey ? { apiProvider, apiKey, apiUrl } : null;
-						const result = await chatInstance.chat(message, chatSessionId, apiCredentials, images); // Pass session ID, API credentials, and images
+						// ChatSessionManager handles session ID and API credentials internally
+						// Only pass the message and images
+						const result = await chatInstance.chat(message, images);
 
 						// Check if cancelled *during* the chat call (ProbeChat throws error)
 						// Error handled in catch block