Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/deno.jsonc
Original file line number Diff line number Diff line change
@@ -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 <charlie@beyondbetter.app>",
"exports": "./src/main.ts",
Expand Down
6 changes: 3 additions & 3 deletions api/src/llms/tools/applyPatch.tool/tool.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -125,15 +125,15 @@ 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);
}

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);
}
Expand Down
4 changes: 2 additions & 2 deletions api/src/llms/tools/blockEdit.tool/tool.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions api/src/llms/tools/displayResource.tool/tool.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions api/src/llms/tools/editResource.tool/tool.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion api/src/llms/tools/findResources.tool/tool.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions api/src/llms/tools/forgetResources.tool/tool.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -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);
}
Expand Down
6 changes: 3 additions & 3 deletions api/src/llms/tools/imageManipulation.tool/tool.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -282,15 +282,15 @@ 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);
}

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);
}
Expand Down
4 changes: 2 additions & 2 deletions api/src/llms/tools/loadDataSource.tool/tool.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions api/src/llms/tools/loadResources.tool/tool.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -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);
}
Expand Down
6 changes: 3 additions & 3 deletions api/src/llms/tools/moveResources.tool/tool.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -142,15 +142,15 @@ 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);
}

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);
}
Expand Down
4 changes: 2 additions & 2 deletions api/src/llms/tools/removeResources.tool/tool.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions api/src/llms/tools/renameResources.tool/tool.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions api/src/llms/tools/rewriteResource.tool/tool.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
6 changes: 3 additions & 3 deletions api/src/llms/tools/runCommand.tool/tool.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -189,15 +189,15 @@ 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);
}

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);
}
Expand Down
6 changes: 3 additions & 3 deletions api/src/llms/tools/searchAndReplace.tool/tool.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -135,15 +135,15 @@ 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);
}

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);
//}
Expand Down
6 changes: 3 additions & 3 deletions api/src/llms/tools/searchAndReplaceMultilineCode.tool/tool.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -539,15 +539,15 @@ 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);
}

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);
}
Expand Down
4 changes: 2 additions & 2 deletions api/src/llms/tools/writeResource.tool/tool.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
8 changes: 4 additions & 4 deletions api/src/prompts/defaultPrompts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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:

<data-sources>
<datasources>
${formattedDsConnections}
</data-sources>
</datasources>

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.

Expand Down Expand Up @@ -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:

<data-sources>
<datasources>
${formattedDsConnections}
</data-sources>
</datasources>

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.

Expand Down
Loading