Hot fix for missing conversation log entries

API.md

@@ -1,6 +1,6 @@
 # BBai API Documentation
 
-This document provides details about the endpoints available in the bbai API.
+This document provides details about the endpoints available in the BBai API.
 
 ## Base URL
 
@@ -20,60 +20,99 @@ All endpoints are relative to: `http://localhost:<port>/api/v1`
     ```
 
 ### Conversation Management
-- **POST** `/conversation`
-  - Start a new conversation.
-  - Request Body:
-    ```json
-    {
-      "prompt": "string",
-      "provider": "string" (optional),
-      "model": "string" (optional),
-      "startDir": "string"
-    }
-    ```
-  - Response: LLM-generated response
 
+#### List Conversations
+- **GET** `/conversation`
+  - Retrieve a list of conversations with pagination and filtering options.
+  - Query Parameters:
+    - `page` (integer, default: 1): Page number for pagination
+    - `pageSize` (integer, default: 10): Number of items per page
+    - `startDate` (string, format: date): Filter conversations starting from this date
+    - `endDate` (string, format: date): Filter conversations up to this date
+    - `llmProviderName` (string): Filter conversations by LLM provider name
+    - `startDir` (string, required): The starting directory for the project
+  - Response: List of conversations with pagination details
+
+#### Get Conversation
 - **GET** `/conversation/:id`
-  - Get details of a specific conversation.
-  - Response: Conversation details (to be implemented)
+  - Retrieve details of a specific conversation.
+  - Query Parameters:
+    - `startDir` (string, required): The starting directory for the project
+  - Response: Conversation details including messages, LLM provider, and token usage
 
+#### Continue Conversation
 - **POST** `/conversation/:id`
   - Continue an existing conversation.
   - Request Body:
     ```json
     {
-      "prompt": "string",
+      "statement": "string",
       "startDir": "string"
     }
     ```
-  - Response: LLM-generated response
+  - Response: LLM-generated response with conversation details
 
+#### Delete Conversation
 - **DELETE** `/conversation/:id`
-  - Delete a conversation.
+  - Delete a specific conversation.
+  - Query Parameters:
+    - `startDir` (string, required): The starting directory for the project
   - Response: Deletion confirmation message
 
+#### Clear Conversation
 - **POST** `/conversation/:id/clear`
-  - Clear the history of a conversation.
+  - Clear the history of a specific conversation.
+  - Query Parameters:
+    - `startDir` (string, required): The starting directory for the project
   - Response: Confirmation message
 
-- **POST** `/conversation/:id/undo`
-  - Undo the last change in a conversation.
-  - Response: Confirmation message
+### WebSocket Connection
+- **GET** `/ws/conversation/:id`
+  - Establish a WebSocket connection for real-time conversation updates.
+  - The client can send messages with the following format:
+    ```json
+    {
+      "task": "greeting" | "converse" | "cancel",
+      "statement": "string",
+      "startDir": "string"
+    }
+    ```
+  - The server will emit events for conversation updates, including:
+    - `conversationReady`
+    - `conversationEntry`
+    - `conversationAnswer`
+    - `conversationError`
+    - `conversationCancelled`
+
+## Note on Unimplemented Features
+
+The following features are mentioned in the codebase but are not fully implemented or exposed through the API:
+
+- Adding files to a conversation
+- Removing files from a conversation
+- Listing files in a conversation
+- Retrieving token usage
+- Running CLI commands
+- Loading external content
+- Retrieving conversation logs
+- Undoing the last change in a conversation
+
+These features may be implemented in future versions of the API.
+
+## Error Handling
+
+All endpoints may return appropriate HTTP status codes for various error conditions. Common error responses include:
+
+- 400 Bad Request: For invalid input or missing required parameters
+- 404 Not Found: When a requested resource (e.g., conversation) is not found
+- 500 Internal Server Error: For unexpected server-side errors
 
-### File Management
-- **POST** `/conversation/:id/file`
-  - Add a file to the conversation.
-  - Request Body: FormData with 'file' field
-  - Response: File addition confirmation
+Detailed error messages will be provided in the response body when applicable.
 
-- **DELETE** `/conversation/:id/file/:fileId`
-  - Remove a file from the conversation.
-  - Response: File removal confirmation
+## Authentication
 
-- **GET** `/conversation/:id/files`
-  - List files in the conversation.
-  - Response: Array of file names
+The current implementation does not include authentication. It is designed for local use only. Ensure proper security measures are in place when deploying this API in a production environment.
 
-Note: Some endpoints like Token Usage, CLI Command, External Content, Logs, and Persistence are not currently implemented in the provided code and have been removed from this documentation.
+## Versioning
 
-Detailed request/response schemas and examples for each endpoint will be added in future updates.
+This documentation is for API version 1 (`v1`). Future versions may introduce changes to the endpoint structure or functionality.

CHANGELOG.md

@@ -9,6 +9,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 
+## [0.0.8a-alpha] - 2024-08-15
+
+### Changed
+
+- Hot fix for missing conversation log entries
+
+
 ## [0.0.8-alpha] - 2024-08-15
 
 ### Changed

api/deno.jsonc

@@ -1,6 +1,6 @@
 {
 	"name": "bbai-api",
-	"version": "0.0.8-alpha",
+	"version": "0.0.8a-alpha",
 	"exports": "./src/main.ts",
 	"tasks": {
 		"start": "deno run --allow-read --allow-write --allow-run --allow-net --allow-env src/main.ts",

api/src/controllers/orchestratorController.ts

@@ -46,7 +46,7 @@ class OrchestratorController {
 	public llmProvider: LLM;
 	public eventManager!: EventManager;
 	private projectEditorRef!: WeakRef<ProjectEditor>;
-	private _providerRequestCount: number = 0;
+	//private _providerRequestCount: number = 0;
 	// counts across all interactions
 	// count of turns for most recent statement in most recent interaction
 	private _turnCount: number = 0;
@@ -267,13 +267,10 @@ class OrchestratorController {
 			const persistence = await new ConversationPersistence(interaction.id, this.projectEditor).init();
 
 			// Include the latest stats and usage in the saved conversation
-			const conversationData = {
-				...interaction,
-				stats: this.interactionStats.get(interaction.id),
-				tokenUsage: this._tokenUsageTotals,
-			} as unknown as LLMConversationInteraction;
+			//interaction.conversationStats = this.interactionStats.get(interaction.id),
+			//interaction.tokenUsageConversation = this.interactionTokenUsage.get(interaction.id),
 
-			await persistence.saveConversation(conversationData);
+			await persistence.saveConversation(interaction);
 
 			// Save system prompt and project info if running in local development
 			if (config.api?.environment === 'localdev') {
@@ -362,7 +359,9 @@ class OrchestratorController {
 				timestamp: string,
 				content: string,
 				conversationStats: ConversationMetrics,
-				tokenUsage: TokenUsage,
+				tokenUsageTurn: TokenUsage,
+				tokenUsageStatement: TokenUsage,
+				tokenUsageConversation: ConversationTokenUsage,
 			): Promise<void> => {
 				const conversationEntry: ConversationEntry = {
 					type,
@@ -371,8 +370,9 @@ class OrchestratorController {
 					conversationTitle: this.primaryInteraction.title,
 					content,
 					conversationStats,
-					tokenUsageConversation: this.tokenUsageTotals,
-					tokenUsageStatement: tokenUsage,
+					tokenUsageTurn: tokenUsageTurn,
+					tokenUsageStatement: tokenUsageStatement,
+					tokenUsageConversation: tokenUsageConversation,
 				};
 				this.eventManager.emit(
 					'projectEditor:conversationEntry',
@@ -423,25 +423,28 @@ class OrchestratorController {
 		toolUse: LLMAnswerToolUse,
 		_response: unknown,
 	): Promise<string> {
-		interaction.conversationLogger?.logToolUse(
+		logger.error(`Handling tool use for: ${toolUse.toolName}`);
+		await interaction.conversationLogger.logToolUse(
 			toolUse.toolName,
 			toolUse.toolInput,
-			interaction.conversationStats,
-			interaction.tokenUsageStatement,
+			//interaction.conversationStats,
+			//interaction.tokenUsageTurn,
+			//interaction.tokenUsageStatement,
+			//interaction.tokenUsageConversation,
 		);
 		const { messageId: _messageId, toolResponse, bbaiResponse, isError } = await this.toolManager.handleToolUse(
 			interaction,
 			toolUse,
 			this.projectEditor,
 		);
 		if (isError) {
-			interaction.conversationLogger?.logError(`Tool Result (${toolUse.toolName}): ${toolResponse}`);
+			interaction.conversationLogger.logError(`Tool Result (${toolUse.toolName}): ${toolResponse}`);
 		}
-		interaction.conversationLogger?.logToolResult(
+		await interaction.conversationLogger.logToolResult(
 			toolUse.toolName,
 			`BBai was ${isError ? 'unsuccessful' : 'successful'} with tool run: \n${bbaiResponse}`,
-			interaction.conversationStats,
-			interaction.tokenUsageStatement,
+			//interaction.conversationStats,
+			//interaction.tokenUsageStatement, // token usage is recorded with the tool use
 		);
 
 		return toolResponse;

api/src/editor/projectEditor.ts

@@ -1,6 +1,7 @@
 import { join } from '@std/path';
 
 import { FILE_LISTING_TIERS, generateFileListing, isPathWithinProject } from '../utils/fileHandling.utils.ts';
+import { GitUtils } from 'shared/git.ts';
 import LLMConversationInteraction, { FileMetadata, ProjectInfo } from '../llms/interactions/conversationInteraction.ts';
 import OrchestratorController from '../controllers/orchestratorController.ts';
 import { logger } from 'shared/logger.ts';
@@ -155,10 +156,12 @@ class ProjectEditor {
 
 				const fullFilePath = join(this.projectRoot, fileName);
 				const content = await Deno.readTextFile(fullFilePath);
+				const lastCommit = await GitUtils.getLastCommitForFile(this.projectRoot, fileName) || '';
 				const metadata: Omit<FileMetadata, 'path' | 'inSystemPrompt'> = {
 					size: new TextEncoder().encode(content).length,
 					lastModified: new Date(),
 					error: null,
+					lastCommit: lastCommit,
 				};
 				filesAdded.push({ fileName, metadata });
 
@@ -174,6 +177,7 @@ class ProjectEditor {
 						size: 0,
 						lastModified: new Date(),
 						error: errorMessage,
+						lastCommit: '',
 					},
 				});
 			}

api/src/errors/error.ts

@@ -124,6 +124,7 @@ export interface FileHandlingErrorOptions extends ErrorOptions {
 		| 'patch'
 		| 'search-project'
 		| 'search-replace'
+		| 'rewrite-file'
 		| 'request-files'
 		| 'remove-files';
 }