Tools hot fix

CHANGELOG.md

@@ -8,6 +8,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 
+## [0.0.5a-alpha] - 2024-08-01
+
+### Changed
+
+- Hot fix for multiple tool result blocks
+- Hot fix for undefined usage tokens
+
+
 ## [0.0.5-alpha] - 2024-08-01
 
 ### Changed
@@ -26,6 +34,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Use haiku to create semantic names for conversations based on initial prompts
 - Use haiku to write commit messages
 
+
 ## [0.0.3-alpha] - 2024-07-27
 
 ### Changed
@@ -38,6 +47,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - file searching, adding to conversation, and patching
   - project editor to handle different data sources (only local filesystem so far)
 
+
 ## [0.0.2-alpha] - 2024-07-23
 
 ### Added
@@ -46,5 +56,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - File handling capabilities
 - Conversation management features
 
+
 ## [0.0.1-alpha] - 2023-07-20
 - Initial alpha release

api/deno.jsonc

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

api/src/editor/projectEditor.ts

@@ -634,6 +634,7 @@ export class ProjectEditor {
 
 			let changesMade = false;
 			let allOperationsSkipped = true;
+			const toolWarnings = [];
 			for (const operation of operations) {
 				const { search, replace } = operation;
 
@@ -643,7 +644,7 @@ export class ProjectEditor {
 						JSON.stringify(operation)
 					}. Operation skipped.`;
 					logger.warn(warningMessage);
-					this.conversation?.addMessageForToolResult(toolUseId, warningMessage, true);
+					toolWarnings.push(warningMessage);
 					continue; // Skip this operation
 				}
 
@@ -656,6 +657,10 @@ export class ProjectEditor {
 					allOperationsSkipped = false;
 				}
 			}
+			let toolWarning = '';
+			if (toolWarnings.length > 0) {
+				toolWarning = `Tool Use Warnings: \n${toolWarnings.join('\n')}\n`;
+			}
 
 			if (changesMade) {
 				await Deno.writeTextFile(fullFilePath, content);
@@ -672,20 +677,15 @@ export class ProjectEditor {
 				// Add success tool result message
 				this.conversation?.addMessageForToolResult(
 					toolUseId,
-					`Search and replace operations applied successfully to file: ${filePath}`,
+					`${toolWarning}Search and replace operations applied successfully to file: ${filePath}`,
 				);
 			} else {
 				const noChangesMessage = allOperationsSkipped
-					? `No changes were made to the file: ${filePath}. All operations were skipped due to identical search and replace strings.`
-					: `No changes were made to the file: ${filePath}. The search strings were not found in the file content.`;
+					? `${toolWarning}No changes were made to the file: ${filePath}. All operations were skipped due to identical search and replace strings.`
+					: `${toolWarning}No changes were made to the file: ${filePath}. The search strings were not found in the file content.`;
 				logger.info(noChangesMessage);
 				this.conversation?.addMessageForToolResult(toolUseId, noChangesMessage, true);
 			}
-
-			this.conversation?.addMessageForToolResult(
-				toolUseId,
-				`Search and replace operations applied successfully to file: ${filePath}`,
-			);
 		} catch (error) {
 			let errorMessage = `Failed to apply search and replace to ${filePath}: ${error.message}`;
 			logger.error(errorMessage);

cli/deno.jsonc

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

cli/src/commands/conversationStart.ts

@@ -313,9 +313,9 @@ function handleConversationUpdate(formatter: LogFormatter, data: ConversationRes
 		colors.green(`${symbols.info} ${statementCount} `) + colors.magenta(`${symbols.radioOn} ${turnCount} `) +
 		colors.blue(`${symbols.clockwiseRightAndLeftSemicircleArrows} ${totalTurnCount}`);
 
-	const summaryLine2 = colors.bold.cyan(`└─ `) + colors.red(`${symbols.arrowDown} ${tokenUsage.inputTokens} `) +
-		colors.yellow(`${symbols.arrowUp} ${tokenUsage.outputTokens} `) +
-		colors.green(`${symbols.radioOn} ${tokenUsage.totalTokens}`);
+	const summaryLine2 = colors.bold.cyan(`└─ `) + colors.red(`${symbols.arrowDown} ${tokenUsage?.inputTokens} `) +
+		colors.yellow(`${symbols.arrowUp} ${tokenUsage?.outputTokens} `) +
+		colors.green(`${symbols.radioOn} ${tokenUsage?.totalTokens}`);
 
 	const titleLine = colors.bold.cyan(`│ Title: ${colors.white(title.padEnd(45))} │`);
 	const maxLength = Math.max(summaryLine1.length, summaryLine2.length, titleLine.length);
@@ -326,7 +326,7 @@ function handleConversationUpdate(formatter: LogFormatter, data: ConversationRes
 	console.log(summaryLine2 + ' '.repeat(maxLength - summaryLine2.length) + colors.bold.cyan('─┘') + '\n');
 
 	// 	console.log(colors.dim.italic(
-	// 		`Token Usage: Input: ${tokenUsage.inputTokens}, Output: ${tokenUsage.outputTokens}, Total: ${tokenUsage.totalTokens}`,
+	// 		`Token Usage: Input: ${tokenUsage?.inputTokens}, Output: ${tokenUsage?.outputTokens}, Total: ${tokenUsage?.totalTokens}`,
 	// 	));
 }
 
@@ -384,9 +384,9 @@ function handleConversationComplete(response: ConversationResponse, options: { i
 			colors.green(`${symbols.info} ${statementCount} `) + colors.magenta(`${symbols.radioOn} ${turnCount} `) +
 			colors.blue(`${symbols.clockwiseRightAndLeftSemicircleArrows} ${totalTurnCount}`);
 
-		const summaryLine2 = colors.bold.cyan(`└─ `) + colors.red(`${symbols.arrowDown} ${tokenUsage.inputTokens} `) +
-			colors.yellow(`${symbols.arrowUp} ${tokenUsage.outputTokens} `) +
-			colors.green(`${symbols.radioOn} ${tokenUsage.totalTokens}`);
+		const summaryLine2 = colors.bold.cyan(`└─ `) + colors.red(`${symbols.arrowDown} ${tokenUsage?.inputTokens} `) +
+			colors.yellow(`${symbols.arrowUp} ${tokenUsage?.outputTokens} `) +
+			colors.green(`${symbols.radioOn} ${tokenUsage?.totalTokens}`);
 
 		const titleLine = colors.bold.cyan(`│ Title: ${colors.white(title.padEnd(45))} │`);
 		const maxLength = Math.max(summaryLine1.length, summaryLine2.length, titleLine.length);
@@ -397,7 +397,7 @@ function handleConversationComplete(response: ConversationResponse, options: { i
 		console.log(summaryLine2 + ' '.repeat(maxLength - summaryLine2.length) + colors.bold.cyan('─┘'));
 
 		console.log(colors.dim.italic(
-			`Token Usage: Input: ${tokenUsage.inputTokens}, Output: ${tokenUsage.outputTokens}, Total: ${tokenUsage.totalTokens}`,
+			`Token Usage: Input: ${tokenUsage?.inputTokens}, Output: ${tokenUsage?.outputTokens}, Total: ${tokenUsage?.totalTokens}`,
 		));
 	}
 }

deno.jsonc

@@ -1,6 +1,6 @@
 {
 	"name": "bbai",
-	"version": "0.0.5-alpha",
+	"version": "0.0.5a-alpha",
 	"exports": "./cli/src/main.ts",
 	"tasks": {
 		"format": "deno fmt src/ && deno task -c ./cli/deno.jsonc format && deno task -c ./api/deno.jsonc format",

src/shared/utils/fileListing.utils.ts

@@ -1,4 +1,4 @@
-import { join, relative } from '@std/path';
+import { globToRegExp, join, relative } from '@std/path';
 import { exists, walk } from '@std/fs';
 import { ConfigManager } from 'shared/configManager.ts';
 import { logger } from './logger.utils.ts';
@@ -63,8 +63,9 @@ async function generateFileListingTier(
 
 function shouldExclude(path: string, excludeOptions: string[]): boolean {
 	return excludeOptions.some((option) => {
-		const pattern = option.replace('--exclude=', '').replace(/\*/g, '.*');
-		return new RegExp(pattern).test(path);
+		const pattern = option.replace('--exclude=', '');
+		const regex = globToRegExp(pattern, { extended: true, globstar: true });
+		return regex.test(path);
 	});
 }
 

version.ts

@@ -1 +1 @@
-export const VERSION = "0.0.5-alpha";
+export const VERSION = "0.0.5a-alpha";