Skip to content

An AI-powered task-management system you can drop into Cursor, Lovable, Windsurf, Roo, and others.

Merge remote-tracking branch 'origin/next' into telemetry

Ralph Khreishbc19bc7927de
diff --cc scripts/modules/ai-services-unified.js
index 11a3ffc2,da958986..948c2a15
--- a/scripts/modules/ai-services-unified.js
+++ b/scripts/modules/ai-services-unified.js
@@@ -15,11 -15,9 +15,12 @@@ import
getFallbackProvider,
getFallbackModelId,
getParametersForRole,
+ getUserId,
+ MODEL_MAP,
- getDebugFlag
++ getDebugFlag,
+ getBaseUrlForRole
} from './config-manager.js';
-import { log, resolveEnvVariable, findProjectRoot } from './utils.js';
+import { log, resolveEnvVariable, isSilentMode } from './utils.js';
import * as anthropic from '../../src/ai-providers/anthropic.js';
import * as perplexity from '../../src/ai-providers/perplexity.js';
@@@ -339,9 -285,13 +340,15 @@@ async function _unifiedServiceRunner(se
'AI service call failed for all configured roles.';
for (const currentRole of sequence) {
- let providerName, modelId, apiKey, roleParams, providerFnSet, providerApiFn;
- let providerResponse;
- let telemetryData = null;
+ let providerName,
+ modelId,
+ apiKey,
+ roleParams,
+ providerFnSet,
+ providerApiFn,
- baseUrl;
++ baseUrl,
++ providerResponse,
++ telemetryData = null;
try {
log('info', `New AI service call with role: ${currentRole}`);
diff --cc src/ai-providers/anthropic.js
index bad8105d,27602757..080cc43b
--- a/src/ai-providers/anthropic.js
+++ b/src/ai-providers/anthropic.js
@@@ -51,7 -49,8 +49,8 @@@ function getClient(apiKey, baseUrl)
* @param {Array<object>} params.messages - The messages array (e.g., [{ role: 'user', content: '...' }]).
* @param {number} [params.maxTokens] - Maximum tokens for the response.
* @param {number} [params.temperature] - Temperature for generation.
+ * @param {string} [params.baseUrl] - The base URL for the Anthropic API.
- * @returns {Promise<string>} The generated text content.
+ * @returns {Promise<object>} The generated text content and usage.
* @throws {Error} If the API call fails.
*/
export async function generateAnthropicText({
@@@ -167,7 -155,8 +162,8 @@@ export async function streamAnthropicTe
* @param {number} [params.maxTokens] - Maximum tokens for the response.
* @param {number} [params.temperature] - Temperature for generation.
* @param {number} [params.maxRetries] - Max retries for validation/generation.
+ * @param {string} [params.baseUrl] - The base URL for the Anthropic API.
- * @returns {Promise<object>} The generated object matching the schema.
+ * @returns {Promise<object>} The generated object matching the schema and usage.
* @throws {Error} If generation or validation fails.
*/
export async function generateAnthropicObject({
@@@ -211,16 -197,8 +204,15 @@@
'debug',
`Anthropic generateObject result received. Tokens: ${result.usage.completionTokens}/${result.usage.promptTokens}`
);
- return result.object;
+ // Return both object and usage
+ return {
+ object: result.object,
+ usage: {
+ inputTokens: result.usage.promptTokens,
+ outputTokens: result.usage.completionTokens
+ }
+ };
} catch (error) {
- // Simple error logging
log(
'error',
`Anthropic generateObject ('${objectName}') failed: ${error.message}`
diff --cc src/ai-providers/google.js
index 676dc4ec,7428816b..108cd8f4
--- a/src/ai-providers/google.js
+++ b/src/ai-providers/google.js
@@@ -9,9 -9,19 +9,19 @@@ import { generateText, streamText, gene
import { log } from '../../scripts/modules/utils.js'; // Import logging utility
// Consider making model configurable via config-manager.js later
-const DEFAULT_MODEL = 'gemini-2.0-pro'; // Or a suitable default
+const DEFAULT_MODEL = 'gemini-2.5-pro-exp-03-25'; // Or a suitable default
const DEFAULT_TEMPERATURE = 0.2; // Or a suitable default
+ function getClient(apiKey, baseUrl) {
+ if (!apiKey) {
+ throw new Error('Google API key is required.');
+ }
+ return createGoogleGenerativeAI({
+ apiKey: apiKey,
+ ...(baseUrl && { baseURL: baseUrl })
+ });
+ }
+
/**
* Generates text using a Google AI model.
*
@@@ -37,30 -48,15 +48,25 @@@ async function generateGoogleText(
log('info', `Generating text with Google model: ${modelId}`);
try {
- // const google = new GoogleGenerativeAI({ apiKey }); // Incorrect instantiation
- const googleProvider = createGoogleGenerativeAI({ apiKey }); // Correct instantiation
- // const model = google.getGenerativeModel({ model: modelId }); // Incorrect model retrieval
- const model = googleProvider(modelId); // Correct model retrieval
-
- // Construct payload suitable for Vercel SDK's generateText
- // Note: The exact structure might depend on how messages are passed
+ const googleProvider = getClient(apiKey, baseUrl);
+ const model = googleProvider(modelId);
const result = await generateText({
- model, // Pass the model instance
- messages, // Pass the messages array directly
+ model,
+ messages,
temperature,
- maxOutputTokens: maxTokens // Map to correct Vercel SDK param if available
+ maxOutputTokens: maxTokens
});
- return result.text;
+
+ // Assuming result structure provides text directly or within a property
+ // return result.text; // Adjust based on actual SDK response
+ // Return both text and usage
+ return {
+ text: result.text,
+ usage: {
+ inputTokens: result.usage.promptTokens,
+ outputTokens: result.usage.completionTokens
+ }
+ };
} catch (error) {
log(
'error',
@@@ -146,31 -140,16 +150,25 @@@ async function generateGoogleObject(
log('info', `Generating object with Google model: ${modelId}`);
try {
- // const google = new GoogleGenerativeAI({ apiKey }); // Incorrect instantiation
- const googleProvider = createGoogleGenerativeAI({ apiKey }); // Correct instantiation
- // const model = google.getGenerativeModel({ model: modelId }); // Incorrect model retrieval
- const model = googleProvider(modelId); // Correct model retrieval
-
+ const googleProvider = getClient(apiKey, baseUrl);
+ const model = googleProvider(modelId);
- const { object } = await generateObject({
+ const result = await generateObject({
- model, // Pass the model instance
+ model,
schema,
messages,
temperature,
maxOutputTokens: maxTokens
- // Note: 'objectName' or 'mode' might not be directly applicable here
- // depending on how `@ai-sdk/google` handles `generateObject`.
- // Check SDK docs if specific tool calling/JSON mode needs explicit setup.
});
- return object;
+
+ // return object; // Return the parsed object
+ // Return both object and usage
+ return {
+ object: result.object,
+ usage: {
+ inputTokens: result.usage.promptTokens,
+ outputTokens: result.usage.completionTokens
+ }
+ };
} catch (error) {
log(
'error',
diff --cc src/ai-providers/openai.js
index 22cb9620,3a0f2090..dae77229
--- a/src/ai-providers/openai.js
+++ b/src/ai-providers/openai.js
@@@ -5,8 -15,8 +15,8 @@@ function getClient(apiKey, baseUrl)
/**
* Generates text using OpenAI models via Vercel AI SDK.
*
- * @param {object} params - Parameters including apiKey, modelId, messages, maxTokens, temperature.
+ * @param {object} params - Parameters including apiKey, modelId, messages, maxTokens, temperature, baseUrl.
- * @returns {Promise<string>} The generated text content.
+ * @returns {Promise<object>} The generated text content and usage.
* @throws {Error} If API call fails.
*/
export async function generateOpenAIText(params) {
@@@ -23,13 -33,12 +33,13 @@@
throw new Error('Invalid or empty messages array provided for OpenAI.');
}
- const openaiClient = createOpenAI({ apiKey });
+ const openaiClient = getClient(apiKey, baseUrl);
try {
- const result = await openaiClient.chat(messages, {
- model: modelId,
- max_tokens: maxTokens,
+ const result = await generateText({
+ model: openaiClient(modelId),
+ messages,
+ maxTokens,
temperature
});
@@@ -116,8 -121,8 +126,8 @@@ export async function streamOpenAIText(
/**
* Generates structured objects using OpenAI models via Vercel AI SDK.
*
- * @param {object} params - Parameters including apiKey, modelId, messages, schema, objectName, maxTokens, temperature.
+ * @param {object} params - Parameters including apiKey, modelId, messages, schema, objectName, maxTokens, temperature, baseUrl.
- * @returns {Promise<object>} The generated object matching the schema.
+ * @returns {Promise<object>} The generated object matching the schema and usage.
* @throws {Error} If API call fails or object generation fails.
*/
export async function generateOpenAIObject(params) {
diff --cc src/ai-providers/openrouter.js
index 36b7f2fc,f842cbf2..af9c9fef
--- a/src/ai-providers/openrouter.js
+++ b/src/ai-providers/openrouter.js
@@@ -28,11 -38,10 +38,11 @@@ async function generateOpenRouterText(
throw new Error('Messages array cannot be empty.');
try {
- const openrouter = createOpenRouter({ apiKey });
+ const openrouter = getClient(apiKey, baseUrl);
const model = openrouter.chat(modelId); // Assuming chat model
- const { text } = await generateText({
+ // Capture the full result from generateText
+ const result = await generateText({
model,
messages,
maxTokens,
@@@ -156,15 -143,15 +170,15 @@@ async function generateOpenRouterObject
throw new Error('Messages array cannot be empty.');
try {
- const openrouter = createOpenRouter({ apiKey });
+ const openrouter = getClient(apiKey, baseUrl);
const model = openrouter.chat(modelId);
- const { object } = await generateObject({
+ // Capture the full result from generateObject
+ const result = await generateObject({
model,
schema,
- mode: 'tool', // Standard mode for most object generation
+ mode: 'tool',
tool: {
- // Define the tool based on the schema
name: objectName,
description: `Generate an object conforming to the ${objectName} schema.`,
parameters: schema
diff --cc src/ai-providers/xai.js
index 94a58ef0,fa2cc954..5969060b
--- a/src/ai-providers/xai.js
+++ b/src/ai-providers/xai.js
@@@ -31,7 -30,8 +30,8 @@@ function getClient(apiKey, baseUrl)
* @param {Array<object>} params.messages - The messages array (e.g., [{ role: 'user', content: '...' }]).
* @param {number} [params.maxTokens] - Maximum tokens for the response.
* @param {number} [params.temperature] - Temperature for generation.
+ * @param {string} [params.baseUrl] - The base URL for the xAI API.
- * @returns {Promise<string>} The generated text content.
+ * @returns {Promise<object>} The generated text content and usage.
* @throws {Error} If the API call fails.
*/
export async function generateXaiText({
@@@ -117,7 -113,8 +120,8 @@@ export async function streamXaiText(
* @param {number} [params.maxTokens] - Maximum tokens for the response.
* @param {number} [params.temperature] - Temperature for generation.
* @param {number} [params.maxRetries] - Max retries for validation/generation.
+ * @param {string} [params.baseUrl] - The base URL for the xAI API.
- * @returns {Promise<object>} The generated object matching the schema.
+ * @returns {Promise<object>} The generated object matching the schema and its usage.
* @throws {Error} If generation or validation fails.
*/
export async function generateXaiObject({
diff --cc tests/unit/ai-services-unified.test.js
index d34806a7,4098e75e..4cd2b4df
--- a/tests/unit/ai-services-unified.test.js
+++ b/tests/unit/ai-services-unified.test.js
@@@ -8,30 -8,7 +8,31 @@@ const mockGetResearchModelId = jest.fn(
const mockGetFallbackProvider = jest.fn();
const mockGetFallbackModelId = jest.fn();
const mockGetParametersForRole = jest.fn();
+const mockGetUserId = jest.fn();
+const mockGetDebugFlag = jest.fn();
+
+// --- Mock MODEL_MAP Data ---
+// Provide a simplified structure sufficient for cost calculation tests
+const mockModelMap = {
+ anthropic: [
+ {
+ id: 'test-main-model',
+ cost_per_1m_tokens: { input: 3, output: 15, currency: 'USD' }
+ },
+ {
+ id: 'test-fallback-model',
+ cost_per_1m_tokens: { input: 3, output: 15, currency: 'USD' }
+ }
+ ],
+ perplexity: [
+ {
+ id: 'test-research-model',
+ cost_per_1m_tokens: { input: 1, output: 1, currency: 'USD' }
+ }
+ ]
+ // Add other providers/models if needed for specific tests
+};
+ const mockGetBaseUrlForRole = jest.fn();
jest.unstable_mockModule('../../scripts/modules/config-manager.js', () => ({
getMainProvider: mockGetMainProvider,
@@@ -41,9 -18,7 +42,10 @@@
getFallbackProvider: mockGetFallbackProvider,
getFallbackModelId: mockGetFallbackModelId,
getParametersForRole: mockGetParametersForRole,
+ getUserId: mockGetUserId,
+ getDebugFlag: mockGetDebugFlag,
- MODEL_MAP: mockModelMap
++ MODEL_MAP: mockModelMap,
+ getBaseUrlForRole: mockGetBaseUrlForRole
}));
// Mock AI Provider Modules