From d6ddc73b0ac2b3d37485f5b43804b76f42d13f24 Mon Sep 17 00:00:00 2001 From: Charlie Garrison Date: Sun, 10 Aug 2025 12:56:31 +1000 Subject: [PATCH 1/2] fix datasource spelling; format --- api/src/llms/tools/applyPatch.tool/tool.ts | 6 +++--- api/src/llms/tools/blockEdit.tool/tool.ts | 4 ++-- .../llms/tools/displayResource.tool/tool.ts | 4 ++-- api/src/llms/tools/editResource.tool/tool.ts | 4 ++-- api/src/llms/tools/findResources.tool/tool.ts | 2 +- .../llms/tools/forgetResources.tool/tool.ts | 4 ++-- .../llms/tools/imageManipulation.tool/tool.ts | 6 +++--- api/src/llms/tools/loadDataSource.tool/tool.ts | 4 ++-- api/src/llms/tools/loadResources.tool/tool.ts | 4 ++-- api/src/llms/tools/moveResources.tool/tool.ts | 6 +++--- .../llms/tools/removeResources.tool/tool.ts | 4 ++-- .../llms/tools/renameResources.tool/tool.ts | 4 ++-- .../llms/tools/rewriteResource.tool/tool.ts | 4 ++-- api/src/llms/tools/runCommand.tool/tool.ts | 6 +++--- .../llms/tools/searchAndReplace.tool/tool.ts | 6 +++--- .../searchAndReplaceMultilineCode.tool/tool.ts | 6 +++--- api/src/llms/tools/writeResource.tool/tool.ts | 4 ++-- api/src/prompts/defaultPrompts.ts | 8 ++++---- api/tests/t/resources/resourceManager.test.ts | 14 +++++++------- bui/src/components/Projects/DataSourcesTab.tsx | 2 +- bui/src/static/styles.css | 18 +++++++++--------- bui/src/utils/upgrade.utils.ts | 4 +++- docs/beyond-better-tools.md | 2 +- src/shared/utils/upgrade.utils.ts | 4 +++- 24 files changed, 67 insertions(+), 63 deletions(-) diff --git a/api/src/llms/tools/applyPatch.tool/tool.ts b/api/src/llms/tools/applyPatch.tool/tool.ts index c7b47aac..56908a79 100644 --- a/api/src/llms/tools/applyPatch.tool/tool.ts +++ b/api/src/llms/tools/applyPatch.tool/tool.ts @@ -116,7 +116,7 @@ Notes: ); if (!primaryDsConnection) { throw createError(ErrorType.DataSourceHandling, `No primary data source`, { - name: 'data-source', + name: 'datasource', dataSourceIds: dataSourceId ? [dataSourceId] : undefined, } as DataSourceHandlingErrorOptions); } @@ -125,7 +125,7 @@ Notes: const dsConnectionToUseId = dsConnectionToUse.id; if (!dsConnectionToUseId) { throw createError(ErrorType.DataSourceHandling, `No data source id`, { - name: 'data-source', + name: 'datasource', dataSourceIds: dataSourceId ? [dataSourceId] : undefined, } as DataSourceHandlingErrorOptions); } @@ -133,7 +133,7 @@ Notes: const dataSourceRoot = dsConnectionToUse.getDataSourceRoot(); if (!dataSourceRoot) { throw createError(ErrorType.DataSourceHandling, `No data source root`, { - name: 'data-source', + name: 'datasource', dataSourceIds: dataSourceId ? [dataSourceId] : undefined, } as DataSourceHandlingErrorOptions); } diff --git a/api/src/llms/tools/blockEdit.tool/tool.ts b/api/src/llms/tools/blockEdit.tool/tool.ts index 6f8607d5..80a1170f 100644 --- a/api/src/llms/tools/blockEdit.tool/tool.ts +++ b/api/src/llms/tools/blockEdit.tool/tool.ts @@ -219,7 +219,7 @@ export default class LLMToolBlockEdit extends LLMTool { ); if (!primaryDsConnection) { throw createError(ErrorType.DataSourceHandling, `No primary data source`, { - name: 'data-source', + name: 'datasource', dataSourceIds: dataSourceId ? [dataSourceId] : undefined, } as DataSourceHandlingErrorOptions); } @@ -228,7 +228,7 @@ export default class LLMToolBlockEdit extends LLMTool { const dsConnectionToUseId = dsConnectionToUse.id; if (!dsConnectionToUseId) { throw createError(ErrorType.DataSourceHandling, `No data source id`, { - name: 'data-source', + name: 'datasource', dataSourceIds: dataSourceId ? [dataSourceId] : undefined, } as DataSourceHandlingErrorOptions); } diff --git a/api/src/llms/tools/displayResource.tool/tool.ts b/api/src/llms/tools/displayResource.tool/tool.ts index 6f25c65f..7c294f98 100644 --- a/api/src/llms/tools/displayResource.tool/tool.ts +++ b/api/src/llms/tools/displayResource.tool/tool.ts @@ -91,7 +91,7 @@ export default class LLMToolDisplayResource extends LLMTool { ); if (!primaryDsConnection) { throw createError(ErrorType.DataSourceHandling, `No primary data source`, { - name: 'data-source', + name: 'datasource', dataSourceIds: dataSourceId ? [dataSourceId] : undefined, } as DataSourceHandlingErrorOptions); } @@ -100,7 +100,7 @@ export default class LLMToolDisplayResource extends LLMTool { const dsConnectionToUseId = dsConnectionToUse.id; if (!dsConnectionToUseId) { throw createError(ErrorType.DataSourceHandling, `No data source id`, { - name: 'data-source', + name: 'datasource', dataSourceIds: dataSourceId ? [dataSourceId] : undefined, } as DataSourceHandlingErrorOptions); } diff --git a/api/src/llms/tools/editResource.tool/tool.ts b/api/src/llms/tools/editResource.tool/tool.ts index 09b2e2af..1ec2091a 100644 --- a/api/src/llms/tools/editResource.tool/tool.ts +++ b/api/src/llms/tools/editResource.tool/tool.ts @@ -324,7 +324,7 @@ export default class LLMToolEditResource extends LLMTool { ); if (!primaryDsConnection) { throw createError(ErrorType.DataSourceHandling, `No primary data source`, { - name: 'data-source', + name: 'datasource', dataSourceIds: dataSourceId ? [dataSourceId] : undefined, } as DataSourceHandlingErrorOptions); } @@ -333,7 +333,7 @@ export default class LLMToolEditResource extends LLMTool { const dsConnectionToUseId = dsConnectionToUse.id; if (!dsConnectionToUseId) { throw createError(ErrorType.DataSourceHandling, `No data source id`, { - name: 'data-source', + name: 'datasource', dataSourceIds: dataSourceId ? [dataSourceId] : undefined, } as DataSourceHandlingErrorOptions); } diff --git a/api/src/llms/tools/findResources.tool/tool.ts b/api/src/llms/tools/findResources.tool/tool.ts index d1cb85cd..4978a04b 100755 --- a/api/src/llms/tools/findResources.tool/tool.ts +++ b/api/src/llms/tools/findResources.tool/tool.ts @@ -178,7 +178,7 @@ Leave empty to search only by resource name, date, or size.`, if (dsConnections.length === 0) { throw createError(ErrorType.DataSourceHandling, `No valid data sources found`, { - name: 'data-source', + name: 'datasource', dataSourceIds: targetDataSourceIds, } as DataSourceHandlingErrorOptions); } diff --git a/api/src/llms/tools/forgetResources.tool/tool.ts b/api/src/llms/tools/forgetResources.tool/tool.ts index 39661738..286476e7 100644 --- a/api/src/llms/tools/forgetResources.tool/tool.ts +++ b/api/src/llms/tools/forgetResources.tool/tool.ts @@ -96,7 +96,7 @@ export default class LLMToolForgetResources extends LLMTool { ); if (!primaryDsConnection) { throw createError(ErrorType.DataSourceHandling, `No primary data source`, { - name: 'data-source', + name: 'datasource', dataSourceIds: dataSourceId ? [dataSourceId] : undefined, } as DataSourceHandlingErrorOptions); } @@ -105,7 +105,7 @@ export default class LLMToolForgetResources extends LLMTool { const dsConnectionToUseId = dsConnectionToUse.id; if (!dsConnectionToUseId) { throw createError(ErrorType.DataSourceHandling, `No data source id`, { - name: 'data-source', + name: 'datasource', dataSourceIds: dataSourceId ? [dataSourceId] : undefined, } as DataSourceHandlingErrorOptions); } diff --git a/api/src/llms/tools/imageManipulation.tool/tool.ts b/api/src/llms/tools/imageManipulation.tool/tool.ts index 864ca0bf..0385f66d 100644 --- a/api/src/llms/tools/imageManipulation.tool/tool.ts +++ b/api/src/llms/tools/imageManipulation.tool/tool.ts @@ -273,7 +273,7 @@ Example: ); if (!primaryDsConnection) { throw createError(ErrorType.DataSourceHandling, `No primary data source`, { - name: 'data-source', + name: 'datasource', dataSourceIds: dataSourceId ? [dataSourceId] : undefined, } as DataSourceHandlingErrorOptions); } @@ -282,7 +282,7 @@ Example: const dsConnectionToUseId = dsConnectionToUse.id; if (!dsConnectionToUseId) { throw createError(ErrorType.DataSourceHandling, `No data source id`, { - name: 'data-source', + name: 'datasource', dataSourceIds: dataSourceId ? [dataSourceId] : undefined, } as DataSourceHandlingErrorOptions); } @@ -290,7 +290,7 @@ Example: const dataSourceRoot = dsConnectionToUse.getDataSourceRoot(); if (!dataSourceRoot) { throw createError(ErrorType.DataSourceHandling, `No data source root`, { - name: 'data-source', + name: 'datasource', dataSourceIds: dataSourceId ? [dataSourceId] : undefined, } as DataSourceHandlingErrorOptions); } diff --git a/api/src/llms/tools/loadDataSource.tool/tool.ts b/api/src/llms/tools/loadDataSource.tool/tool.ts index 307a9094..538ce6ba 100644 --- a/api/src/llms/tools/loadDataSource.tool/tool.ts +++ b/api/src/llms/tools/loadDataSource.tool/tool.ts @@ -149,7 +149,7 @@ export default class LLMToolLoadDatasource extends LLMTool { ); if (!primaryDsConnection) { throw createError(ErrorType.DataSourceHandling, `Data source not found`, { - name: 'data-source', + name: 'datasource', dataSourceIds: dataSourceId ? [dataSourceId] : undefined, } as DataSourceHandlingErrorOptions); } @@ -158,7 +158,7 @@ export default class LLMToolLoadDatasource extends LLMTool { const dsConnectionToLoadId = dsConnectionToLoad.id; if (!dsConnectionToLoadId) { throw createError(ErrorType.DataSourceHandling, `No data source id`, { - name: 'data-source', + name: 'datasource', dataSourceIds: dataSourceId ? [dataSourceId] : undefined, } as DataSourceHandlingErrorOptions); } diff --git a/api/src/llms/tools/loadResources.tool/tool.ts b/api/src/llms/tools/loadResources.tool/tool.ts index e4d8da78..565b5909 100644 --- a/api/src/llms/tools/loadResources.tool/tool.ts +++ b/api/src/llms/tools/loadResources.tool/tool.ts @@ -116,7 +116,7 @@ export default class LLMToolLoadResources extends LLMTool { ); if (!primaryDsConnection) { throw createError(ErrorType.DataSourceHandling, `No primary data source`, { - name: 'data-source', + name: 'datasource', dataSourceIds: dataSourceId ? [dataSourceId] : undefined, } as DataSourceHandlingErrorOptions); } @@ -125,7 +125,7 @@ export default class LLMToolLoadResources extends LLMTool { const dsConnectionToUseId = dsConnectionToUse.id; if (!dsConnectionToUseId) { throw createError(ErrorType.DataSourceHandling, `No data source id`, { - name: 'data-source', + name: 'datasource', dataSourceIds: dataSourceId ? [dataSourceId] : undefined, } as DataSourceHandlingErrorOptions); } diff --git a/api/src/llms/tools/moveResources.tool/tool.ts b/api/src/llms/tools/moveResources.tool/tool.ts index b7d4f8fb..ccdeba24 100644 --- a/api/src/llms/tools/moveResources.tool/tool.ts +++ b/api/src/llms/tools/moveResources.tool/tool.ts @@ -133,7 +133,7 @@ export default class LLMToolMoveResources extends LLMTool { //logger.info(`LLMToolMoveResources: getDsConnections`, { primaryDsConnection, dsConnections, notFound }); if (!primaryDsConnection) { throw createError(ErrorType.DataSourceHandling, `No primary data source`, { - name: 'data-source', + name: 'datasource', dataSourceIds: dataSourceId ? [dataSourceId] : undefined, } as DataSourceHandlingErrorOptions); } @@ -142,7 +142,7 @@ export default class LLMToolMoveResources extends LLMTool { const dsConnectionToUseId = dsConnectionToUse.id; if (!dsConnectionToUseId) { throw createError(ErrorType.DataSourceHandling, `No data source id`, { - name: 'data-source', + name: 'datasource', dataSourceIds: dataSourceId ? [dataSourceId] : undefined, } as DataSourceHandlingErrorOptions); } @@ -150,7 +150,7 @@ export default class LLMToolMoveResources extends LLMTool { const dataSourceRoot = dsConnectionToUse.getDataSourceRoot(); if (!dataSourceRoot) { throw createError(ErrorType.DataSourceHandling, `No data source root`, { - name: 'data-source', + name: 'datasource', dataSourceIds: dataSourceId ? [dataSourceId] : undefined, } as DataSourceHandlingErrorOptions); } diff --git a/api/src/llms/tools/removeResources.tool/tool.ts b/api/src/llms/tools/removeResources.tool/tool.ts index 894c0631..b412b41f 100644 --- a/api/src/llms/tools/removeResources.tool/tool.ts +++ b/api/src/llms/tools/removeResources.tool/tool.ts @@ -297,7 +297,7 @@ export default class LLMToolRemoveResources extends LLMTool { ); if (!primaryDsConnection) { throw createError(ErrorType.DataSourceHandling, `No primary data source`, { - name: 'data-source', + name: 'datasource', dataSourceIds: dataSourceId ? [dataSourceId] : undefined, } as DataSourceHandlingErrorOptions); } @@ -306,7 +306,7 @@ export default class LLMToolRemoveResources extends LLMTool { const dsConnectionToUseId = dsConnectionToUse.id; if (!dsConnectionToUseId) { throw createError(ErrorType.DataSourceHandling, `No data source id`, { - name: 'data-source', + name: 'datasource', dataSourceIds: dataSourceId ? [dataSourceId] : undefined, } as DataSourceHandlingErrorOptions); } diff --git a/api/src/llms/tools/renameResources.tool/tool.ts b/api/src/llms/tools/renameResources.tool/tool.ts index cc661e1d..f8131f2d 100644 --- a/api/src/llms/tools/renameResources.tool/tool.ts +++ b/api/src/llms/tools/renameResources.tool/tool.ts @@ -128,7 +128,7 @@ export default class LLMToolRenameResources extends LLMTool { ); if (!primaryDsConnection) { throw createError(ErrorType.DataSourceHandling, `No primary data source`, { - name: 'data-source', + name: 'datasource', dataSourceIds: dataSourceId ? [dataSourceId] : undefined, } as DataSourceHandlingErrorOptions); } @@ -137,7 +137,7 @@ export default class LLMToolRenameResources extends LLMTool { const dsConnectionToUseId = dsConnectionToUse.id; if (!dsConnectionToUseId) { throw createError(ErrorType.DataSourceHandling, `No data source id`, { - name: 'data-source', + name: 'datasource', dataSourceIds: dataSourceId ? [dataSourceId] : undefined, } as DataSourceHandlingErrorOptions); } diff --git a/api/src/llms/tools/rewriteResource.tool/tool.ts b/api/src/llms/tools/rewriteResource.tool/tool.ts index bbe39b64..65a124b9 100644 --- a/api/src/llms/tools/rewriteResource.tool/tool.ts +++ b/api/src/llms/tools/rewriteResource.tool/tool.ts @@ -169,14 +169,14 @@ export default class LLMToolRewriteResource extends LLMTool { const dsConnectionToUseId = dsConnectionToUse.id; if (!dsConnectionToUseId) { throw createError(ErrorType.DataSourceHandling, `No data source id`, { - name: 'data-source', + name: 'datasource', dataSourceIds: dataSourceId ? [dataSourceId] : undefined, } as DataSourceHandlingErrorOptions); } if (!dsConnectionToUse) { throw createError(ErrorType.DataSourceHandling, `No primary data source`, { - name: 'data-source', + name: 'datasource', dataSourceIds: dataSourceId ? [dataSourceId] : undefined, } as DataSourceHandlingErrorOptions); } diff --git a/api/src/llms/tools/runCommand.tool/tool.ts b/api/src/llms/tools/runCommand.tool/tool.ts index fb9813b5..f908d1d3 100644 --- a/api/src/llms/tools/runCommand.tool/tool.ts +++ b/api/src/llms/tools/runCommand.tool/tool.ts @@ -180,7 +180,7 @@ export default class LLMToolRunCommand extends LLMTool { ); if (!primaryDsConnection) { throw createError(ErrorType.DataSourceHandling, `No primary data source`, { - name: 'data-source', + name: 'datasource', dataSourceIds: dataSourceId ? [dataSourceId] : undefined, } as DataSourceHandlingErrorOptions); } @@ -189,7 +189,7 @@ export default class LLMToolRunCommand extends LLMTool { const dsConnectionToUseId = dsConnectionToUse.id; if (!dsConnectionToUseId) { throw createError(ErrorType.DataSourceHandling, `No data source id`, { - name: 'data-source', + name: 'datasource', dataSourceIds: dataSourceId ? [dataSourceId] : undefined, } as DataSourceHandlingErrorOptions); } @@ -197,7 +197,7 @@ export default class LLMToolRunCommand extends LLMTool { const dataSourceRoot = dsConnectionToUse.getDataSourceRoot(); if (!dataSourceRoot) { throw createError(ErrorType.DataSourceHandling, `No data source root`, { - name: 'data-source', + name: 'datasource', dataSourceIds: dataSourceId ? [dataSourceId] : undefined, } as DataSourceHandlingErrorOptions); } diff --git a/api/src/llms/tools/searchAndReplace.tool/tool.ts b/api/src/llms/tools/searchAndReplace.tool/tool.ts index f4d9fdb7..f1df3994 100644 --- a/api/src/llms/tools/searchAndReplace.tool/tool.ts +++ b/api/src/llms/tools/searchAndReplace.tool/tool.ts @@ -126,7 +126,7 @@ export default class LLMToolSearchAndReplace extends LLMTool { ); if (!primaryDsConnection) { throw createError(ErrorType.DataSourceHandling, `No primary data source`, { - name: 'data-source', + name: 'datasource', dataSourceIds: dataSourceId ? [dataSourceId] : undefined, } as DataSourceHandlingErrorOptions); } @@ -135,7 +135,7 @@ export default class LLMToolSearchAndReplace extends LLMTool { const dsConnectionToUseId = dsConnectionToUse.id; if (!dsConnectionToUseId) { throw createError(ErrorType.DataSourceHandling, `No data source id`, { - name: 'data-source', + name: 'datasource', dataSourceIds: dataSourceId ? [dataSourceId] : undefined, } as DataSourceHandlingErrorOptions); } @@ -143,7 +143,7 @@ export default class LLMToolSearchAndReplace extends LLMTool { const dataSourceRoot = dsConnectionToUse.getDataSourceRoot(); //if (!dataSourceRoot) { // throw createError(ErrorType.DataSourceHandling, `No data source root`, { - // name: 'data-source', + // name: 'datasource', // dataSourceIds: dataSourceId ? [dataSourceId] : undefined, // } as DataSourceHandlingErrorOptions); //} diff --git a/api/src/llms/tools/searchAndReplaceMultilineCode.tool/tool.ts b/api/src/llms/tools/searchAndReplaceMultilineCode.tool/tool.ts index bb7c2846..d1937622 100644 --- a/api/src/llms/tools/searchAndReplaceMultilineCode.tool/tool.ts +++ b/api/src/llms/tools/searchAndReplaceMultilineCode.tool/tool.ts @@ -530,7 +530,7 @@ export default class LLMToolSearchAndReplaceCode extends LLMTool { ); if (!primaryDsConnection) { throw createError(ErrorType.DataSourceHandling, `No primary data source`, { - name: 'data-source', + name: 'datasource', dataSourceIds: dataSourceId ? [dataSourceId] : undefined, } as DataSourceHandlingErrorOptions); } @@ -539,7 +539,7 @@ export default class LLMToolSearchAndReplaceCode extends LLMTool { const dsConnectionToUseId = dsConnectionToUse.id; if (!dsConnectionToUseId) { throw createError(ErrorType.DataSourceHandling, `No data source id`, { - name: 'data-source', + name: 'datasource', dataSourceIds: dataSourceId ? [dataSourceId] : undefined, } as DataSourceHandlingErrorOptions); } @@ -547,7 +547,7 @@ export default class LLMToolSearchAndReplaceCode extends LLMTool { const dataSourceRoot = dsConnectionToUse.getDataSourceRoot(); if (!dataSourceRoot) { throw createError(ErrorType.DataSourceHandling, `No data source root`, { - name: 'data-source', + name: 'datasource', dataSourceIds: dataSourceId ? [dataSourceId] : undefined, } as DataSourceHandlingErrorOptions); } diff --git a/api/src/llms/tools/writeResource.tool/tool.ts b/api/src/llms/tools/writeResource.tool/tool.ts index 24df6463..39301f0f 100644 --- a/api/src/llms/tools/writeResource.tool/tool.ts +++ b/api/src/llms/tools/writeResource.tool/tool.ts @@ -304,14 +304,14 @@ export default class LLMToolWriteResource extends LLMTool { const dsConnectionToUseId = dsConnectionToUse.id; if (!dsConnectionToUseId) { throw createError(ErrorType.DataSourceHandling, `No data source id`, { - name: 'data-source', + name: 'datasource', dataSourceIds: dataSourceId ? [dataSourceId] : undefined, } as DataSourceHandlingErrorOptions); } if (!dsConnectionToUse) { throw createError(ErrorType.DataSourceHandling, `No primary data source`, { - name: 'data-source', + name: 'datasource', dataSourceIds: dataSourceId ? [dataSourceId] : undefined, } as DataSourceHandlingErrorOptions); } diff --git a/api/src/prompts/defaultPrompts.ts b/api/src/prompts/defaultPrompts.ts index b99119a3..3a1606d5 100644 --- a/api/src/prompts/defaultPrompts.ts +++ b/api/src/prompts/defaultPrompts.ts @@ -232,9 +232,9 @@ In each conversational turn, you will begin by thinking about your response. Onc BB provides access to multiple data sources through a unified system. Each data source has a unique ID, name, type, capabilities, and configuration. You have access to the following data sources: - + ${formattedDsConnections} - + You will almost always want to use \`load_datasource\` tool before proceeding with your objective. It is important to know the resources available and their URI format. @@ -532,9 +532,9 @@ Your role is to: BB provides access to multiple data sources through a unified system. Each data source has a unique ID, type, capabilities, and access method. You have access to the following data sources: - + ${formattedDsConnections} - + You will almost always want to use \`load_datasource\` tool before proceeding with your objective. It is important to know the resources available and their URI format. diff --git a/api/tests/t/resources/resourceManager.test.ts b/api/tests/t/resources/resourceManager.test.ts index bb23d125..5b581e4f 100644 --- a/api/tests/t/resources/resourceManager.test.ts +++ b/api/tests/t/resources/resourceManager.test.ts @@ -99,7 +99,7 @@ // // describe('loadResource', () => { // it('should load a file resource', async () => { -// const result = await resourceManager.loadResource('bb+filesystem+test-data-source://test.txt'); +// const result = await resourceManager.loadResource('bb+filesystem+test-datasource://test.txt'); // // assertEquals(result.content, 'Test content'); // assertEquals(result.metadata.type, 'file'); @@ -109,7 +109,7 @@ // // it('should reject for non-existent resources', async () => { // await assertRejects( -// () => resourceManager.loadResource('bb+filesystem+test-data-source://nonexistent.txt'), +// () => resourceManager.loadResource('bb+filesystem+test-datasource://nonexistent.txt'), // Error, // 'Failed to load resource' // ); @@ -152,7 +152,7 @@ // describe('writeResource', () => { // it('should write a new file resource', async () => { // const testContent = 'New test content'; -// const uri = 'bb+filesystem+test-data-source://new_test_file.txt'; +// const uri = 'bb+filesystem+test-datasource://new_test_file.txt'; // // // Write the resource // const writeResult = await resourceManager.writeResource(uri, testContent); @@ -176,7 +176,7 @@ // await Deno.writeTextFile(filePath, 'Original content'); // // const updatedContent = 'Updated content'; -// const uri = 'bb+filesystem+test-data-source://update_test.txt'; +// const uri = 'bb+filesystem+test-datasource://update_test.txt'; // // // Update the resource // await resourceManager.writeResource(uri, updatedContent); @@ -196,8 +196,8 @@ // const sourceFilePath = join(tempDir, 'source.txt'); // await Deno.writeTextFile(sourceFilePath, 'Source content'); // -// const sourceUri = 'bb+filesystem+test-data-source://source.txt'; -// const destUri = 'bb+filesystem+test-data-source://destination.txt'; +// const sourceUri = 'bb+filesystem+test-datasource://source.txt'; +// const destUri = 'bb+filesystem+test-datasource://destination.txt'; // // // Move the resource // const moveResult = await resourceManager.moveResource(sourceUri, destUri); @@ -226,7 +226,7 @@ // const filePath = join(tempDir, 'to_delete.txt'); // await Deno.writeTextFile(filePath, 'Delete me'); // -// const uri = 'bb+filesystem+test-data-source://to_delete.txt'; +// const uri = 'bb+filesystem+test-datasource://to_delete.txt'; // // // Delete the resource // const deleteResult = await resourceManager.deleteResource(uri); diff --git a/bui/src/components/Projects/DataSourcesTab.tsx b/bui/src/components/Projects/DataSourcesTab.tsx index 410924ee..e4068848 100644 --- a/bui/src/components/Projects/DataSourcesTab.tsx +++ b/bui/src/components/Projects/DataSourcesTab.tsx @@ -28,7 +28,7 @@ export function DataSourcesTab({ editingProject, onUpdate, appState }: DataSourc }; return ( -
+
{ /*

diff --git a/bui/src/static/styles.css b/bui/src/static/styles.css index 4c08353f..e26443e8 100644 --- a/bui/src/static/styles.css +++ b/bui/src/static/styles.css @@ -139,39 +139,39 @@ /* Data Source Component Styles */ /* -.bb-data-source-container { +.bb-datasource-container { @apply w-full p-4 space-y-4; } -.bb-data-source-list { +.bb-datasource-list { @apply space-y-4; } -.bb-no-data-sources { +.bb-no-datasources { @apply text-gray-500 dark:text-gray-400 text-center py-4; } -.bb-data-source-item { +.bb-datasource-item { @apply border rounded-lg p-4 bg-white dark:bg-gray-800 border-gray-200 dark:border-gray-700 shadow-sm; } -.bb-data-source-item.primary { +.bb-datasource-item.primary { @apply border-blue-300 dark:border-blue-700 bg-blue-50 dark:bg-blue-900/20; } -.bb-data-source-item.disabled { +.bb-datasource-item.disabled { @apply opacity-60; } -.bb-data-source-header { +.bb-datasource-header { @apply flex justify-between items-center mb-2; } -.bb-data-source-actions { +.bb-datasource-actions { @apply flex gap-2; } -.bb-data-source-details { +.bb-datasource-details { @apply space-y-2; } diff --git a/bui/src/utils/upgrade.utils.ts b/bui/src/utils/upgrade.utils.ts index ae73aa96..cdbdd4d9 100644 --- a/bui/src/utils/upgrade.utils.ts +++ b/bui/src/utils/upgrade.utils.ts @@ -18,7 +18,9 @@ export interface GithubRelease { export async function fetchLatestRelease(): Promise { //console.log('upgrade.utils: Fetching latest release'); try { - const response = await fetch('https://asyagnmzoxgyhqprdaky.storage.supabase.co/storage/v1/object/releases/latest.json'); + const response = await fetch( + 'https://asyagnmzoxgyhqprdaky.storage.supabase.co/storage/v1/object/releases/latest.json', + ); //console.log('upgrade.utils: GitHub API response status:', response.status); if (!response.ok) { diff --git a/docs/beyond-better-tools.md b/docs/beyond-better-tools.md index 0c317592..4d0e5da3 100644 --- a/docs/beyond-better-tools.md +++ b/docs/beyond-better-tools.md @@ -79,7 +79,7 @@ These tools perform complex analysis or data gathering and return rich informati - **Interaction Flow**: ``` LLM: "I need to find how authentication is implemented across the codebase" - Tool Call: semantic_search --query="authentication implementation" --context-depth=medium --data-sources=all + Tool Call: semantic_search --query="authentication implementation" --context-depth=medium --datasources=all Tool Response: { "results": [ { diff --git a/src/shared/utils/upgrade.utils.ts b/src/shared/utils/upgrade.utils.ts index ca858b9f..dd4619f6 100644 --- a/src/shared/utils/upgrade.utils.ts +++ b/src/shared/utils/upgrade.utils.ts @@ -137,7 +137,9 @@ export async function performUpgrade(): Promise { } export async function fetchLatestRelease(): Promise { - const response = await fetch('https://asyagnmzoxgyhqprdaky.storage.supabase.co/storage/v1/object/releases/latest.json'); + const response = await fetch( + 'https://asyagnmzoxgyhqprdaky.storage.supabase.co/storage/v1/object/releases/latest.json', + ); if (!response.ok) { throw new Error(`Failed to fetch latest release: ${response.statusText}`); } From c2cd714f20a0f37c29fb48e1886fe8f94a1a06f8 Mon Sep 17 00:00:00 2001 From: Charlie Garrison Date: Sun, 10 Aug 2025 12:58:03 +1000 Subject: [PATCH 2/2] Change style of oss version --- api/deno.jsonc | 2 +- bui/deno.jsonc | 2 +- cli/deno.jsonc | 2 +- deno.jsonc | 2 +- dui/src-tauri/Cargo.toml | 2 +- dui/src-tauri/tauri.conf.json | 2 +- scripts/update_version.ts | 2 +- version.ts | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/api/deno.jsonc b/api/deno.jsonc index 87cc7940..f315a3df 100644 --- a/api/deno.jsonc +++ b/api/deno.jsonc @@ -1,6 +1,6 @@ { "name": "bb-api", - "version": "0.9.0+oss", + "version": "0.9.0-oss", "license": "AGPL-3.0-or-later", "copyright": "2025 - Beyond Better ", "exports": "./src/main.ts", diff --git a/bui/deno.jsonc b/bui/deno.jsonc index 86292adc..b77490a6 100644 --- a/bui/deno.jsonc +++ b/bui/deno.jsonc @@ -1,5 +1,5 @@ { - "version": "0.9.0+oss", + "version": "0.9.0-oss", "license": "AGPL-3.0-or-later", "copyright": "2025 - Beyond Better ", "lock": false, diff --git a/cli/deno.jsonc b/cli/deno.jsonc index 0e0b61cb..5e66b7a4 100644 --- a/cli/deno.jsonc +++ b/cli/deno.jsonc @@ -1,6 +1,6 @@ { "name": "bb-cli", - "version": "0.9.0+oss", + "version": "0.9.0-oss", "license": "AGPL-3.0-or-later", "copyright": "2025 - Beyond Better ", "exports": "./src/main.ts", diff --git a/deno.jsonc b/deno.jsonc index 52f355bb..e427640d 100644 --- a/deno.jsonc +++ b/deno.jsonc @@ -1,6 +1,6 @@ { "name": "bb", - "version": "0.9.0+oss", + "version": "0.9.0-oss", "license": "AGPL-3.0-or-later", "copyright": "2025 - Beyond Better ", "exports": "./cli/src/main.ts", diff --git a/dui/src-tauri/Cargo.toml b/dui/src-tauri/Cargo.toml index 6a3eba0a..3dead1f4 100644 --- a/dui/src-tauri/Cargo.toml +++ b/dui/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "beyond-better" -version = "0.9.0+oss" +version = "0.9.0-oss" description = "Beyond Better Desktop App" authors = ["cngarrison"] edition = "2021" diff --git a/dui/src-tauri/tauri.conf.json b/dui/src-tauri/tauri.conf.json index d2cfc513..29558767 100644 --- a/dui/src-tauri/tauri.conf.json +++ b/dui/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "Beyond Better", - "version": "0.9.0+oss", + "version": "0.9.0-oss", "identifier": "dev.beyondbetter.app", "build": { "beforeDevCommand": "npx vite", diff --git a/scripts/update_version.ts b/scripts/update_version.ts index 0868b971..13e49456 100644 --- a/scripts/update_version.ts +++ b/scripts/update_version.ts @@ -20,7 +20,7 @@ import { parse as parseToml } from '@std/toml'; const updateVersion = async (newVersion: string, minVersion: string) => { // Add +oss build metadata for open source version - const ossVersion = newVersion + '+oss'; + const ossVersion = newVersion + '-oss'; const files = ['deno.jsonc', 'cli/deno.jsonc', 'bui/deno.jsonc', 'api/deno.jsonc', 'dui/src-tauri/tauri.conf.json']; diff --git a/version.ts b/version.ts index 9139c2e9..70e0a153 100644 --- a/version.ts +++ b/version.ts @@ -1,3 +1,3 @@ -export const VERSION = "0.9.0+oss"; +export const VERSION = "0.9.0-oss"; export const REQUIRED_API_VERSION = "0.9.0"; \ No newline at end of file