genaicode 0.8.6 → 0.9.0

package/dist/ai-service/openai.js

@@ -1,20 +1,28 @@
 import OpenAI, { APIError } from 'openai';
 import assert from 'node:assert';
-import { printTokenUsageAndCost, processFunctionCalls, } from './common.js';
-import { abortController } from '../main/interactive/codegen-worker.js';
+import { printTokenUsageAndCost, processFunctionCalls } from './common.js';
+import { ModelType } from './common-types.js';
+import { abortController } from '../main/common/abort-controller.js';
 import { getServiceConfig } from './service-configurations.js';
 /**
  * This function generates content using the OpenAI chat model.
  */
-export async function generateContent(prompt, functionDefs, requiredFunctionName, temperature, cheap = false) {
+export const generateContent = async function generateContent(prompt, functionDefs, requiredFunctionName, temperature, modelType = ModelType.DEFAULT) {
     try {
         const serviceConfig = getServiceConfig('openai');
         assert(serviceConfig?.apiKey, 'OpenAI API key not configured, use OPENAI_API_KEY environment variable.');
         const openai = new OpenAI({ apiKey: serviceConfig?.apiKey, baseURL: serviceConfig?.openaiBaseUrl });
-        const defaultModel = cheap ? 'gpt-4o-mini' : 'gpt-4o-2024-11-20';
-        const modelOverrides = serviceConfig?.modelOverrides;
-        const model = cheap ? (modelOverrides?.cheap ?? defaultModel) : (modelOverrides?.default ?? defaultModel);
-        return internalGenerateContent(prompt, functionDefs, requiredFunctionName, temperature, cheap, model, openai);
+        const model = (() => {
+            switch (modelType) {
+                case ModelType.CHEAP:
+                    return serviceConfig.modelOverrides?.cheap ?? 'gpt-4o-mini';
+                case ModelType.REASONING:
+                    return serviceConfig.modelOverrides?.reasoning ?? 'o1-mini';
+                default:
+                    return serviceConfig.modelOverrides?.default ?? 'gpt-4o-2024-11-20';
+            }
+        })();
+        return internalGenerateContent(prompt, functionDefs, requiredFunctionName, temperature, modelType, model, openai);
     }
     catch (error) {
         if (error instanceof Error && error.message.includes('API key not configured')) {
@@ -22,9 +30,9 @@ export async function generateContent(prompt, functionDefs, requiredFunctionName
         }
         throw error;
     }
-}
-export async function internalGenerateContent(prompt, functionDefs, requiredFunctionName, temperature, cheap = false, model, openai) {
-    const toolCalls = await internalGenerateToolCalls(prompt, functionDefs, requiredFunctionName, temperature, cheap, model, openai);
+};
+export async function internalGenerateContent(prompt, functionDefs, requiredFunctionName, temperature, modelType = ModelType.DEFAULT, model, openai) {
+    const toolCalls = await internalGenerateToolCalls(prompt, functionDefs, requiredFunctionName, temperature, modelType, model, openai);
     const functionCalls = toolCalls.map((call) => {
         const name = call.function.name;
         const args = JSON.parse(call.function.arguments);
@@ -36,12 +44,14 @@ export async function internalGenerateContent(prompt, functionDefs, requiredFunc
     });
     return processFunctionCalls(functionCalls, functionDefs);
 }
-export async function internalGenerateToolCalls(prompt, functionDefs, requiredFunctionName, temperature, cheap = false, model, openai) {
+export async function internalGenerateToolCalls(prompt, functionDefs, requiredFunctionName, temperature, modelType = ModelType.DEFAULT, model, openai, serviceType = 'openai') {
     const messages = prompt
         .map((item) => {
         if (item.type === 'systemPrompt') {
             return {
-                role: 'system',
+                role: modelType === ModelType.REASONING && serviceType === 'openai'
+                    ? 'developer'
+                    : 'system',
                 content: item.systemPrompt,
             };
         }
@@ -126,11 +136,15 @@ export async function internalGenerateToolCalls(prompt, functionDefs, requiredFu
             response = await openai.chat.completions.create({
                 model: model,
                 messages,
-                tools: functionDefs.map((funDef) => ({ type: 'function', function: funDef })),
-                tool_choice: requiredFunctionName
-                    ? { type: 'function', function: { name: requiredFunctionName } }
-                    : 'required',
-                temperature: temperature,
+                ...(functionDefs.length > 0
+                    ? {
+                        tools: functionDefs.map((funDef) => ({ type: 'function', function: funDef })),
+                        tool_choice: requiredFunctionName
+                            ? { type: 'function', function: { name: requiredFunctionName } }
+                            : 'required',
+                    }
+                    : {}),
+                ...(modelType !== ModelType.REASONING ? { temperature } : {}),
             }, { signal: abortController?.signal });
             break; // Exit loop if successful
         }
@@ -166,11 +180,22 @@ export async function internalGenerateToolCalls(prompt, functionDefs, requiredFu
         usage,
         inputCostPerToken: 0.000005,
         outputCostPerToken: 0.000015,
-        cheap,
+        modelType,
     });
     const responseMessage = response.choices[0].message;
-    if (responseMessage.content) {
-        console.log('Message', responseMessage.content);
+    if (modelType === ModelType.REASONING) {
+        return [
+            {
+                id: 'reasoning_inference_response',
+                function: {
+                    name: 'reasoningInferenceResponse',
+                    arguments: JSON.stringify({
+                        ...('reasoning_content' in responseMessage ? { reasoning: responseMessage.reasoning_content } : {}),
+                        response: responseMessage.content,
+                    }),
+                },
+            },
+        ];
     }
     if (responseMessage.tool_calls) {
         return responseMessage.tool_calls;

package/dist/ai-service/openai.js.map

@@ -1 +1 @@
-{"version":3,"file":"openai.js","sourceRoot":"","sources":["../../src/ai-service/openai.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAC1C,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EACL,sBAAsB,EACtB,oBAAoB,GAKrB,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,MAAoB,EACpB,YAA2B,EAC3B,oBAAmC,EACnC,WAAmB,EACnB,KAAK,GAAG,KAAK;IAEb,IAAI,CAAC;QACH,MAAM,aAAa,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACjD,MAAM,CAAC,aAAa,EAAE,MAAM,EAAE,yEAAyE,CAAC,CAAC;QACzG,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,CAAC,CAAC;QAEpG,MAAM,YAAY,GAAG,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,mBAAmB,CAAC;QACjE,MAAM,cAAc,GAAG,aAAa,EAAE,cAAc,CAAC;QACrD,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,cAAc,EAAE,KAAK,IAAI,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,cAAc,EAAE,OAAO,IAAI,YAAY,CAAC,CAAC;QAE1G,OAAO,uBAAuB,CAAC,MAAM,EAAE,YAAY,EAAE,oBAAoB,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IAChH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAC,EAAE,CAAC;YAC/E,MAAM,IAAI,KAAK,CAAC,yEAAyE,CAAC,CAAC;QAC7F,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,MAAoB,EACpB,YAA2B,EAC3B,oBAAmC,EACnC,WAAmB,EACnB,KAAK,GAAG,KAAK,EACb,KAAa,EACb,MAAc;IAEd,MAAM,SAAS,GAAG,MAAM,yBAAyB,CAC/C,MAAM,EACN,YAAY,EACZ,oBAAoB,EACpB,WAAW,EACX,KAAK,EACL,KAAK,EACL,MAAM,CACP,CAAC;IAEF,MAAM,aAAa,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QAC3C,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;QAChC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAEjD,OAAO;YACL,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,IAAI;YACJ,IAAI;SACL,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO,oBAAoB,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;AAC3D,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,MAAoB,EACpB,YAA2B,EAC3B,oBAAmC,EACnC,WAAmB,EACnB,KAAK,GAAG,KAAK,EACb,KAAa,EACb,MAAc;IAEd,MAAM,QAAQ,GAAsC,MAAM;SACvD,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACZ,IAAI,IAAI,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;YACjC,OAAO;gBACL,IAAI,EAAE,QAAiB;gBACvB,OAAO,EAAE,IAAI,CAAC,YAAa;aAC5B,CAAC;QACJ,CAAC;aAAM,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YAChC,MAAM,QAAQ,GAAiC,EAAE,CAAC;YAClD,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBAC3B,QAAQ,CAAC,IAAI,CACX,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;oBAC3C,IAAI,EAAE,MAAe;oBACrB,IAAI,EAAE,QAAQ,CAAC,IAAI;oBACnB,OAAO,EAAE,QAAQ,CAAC,OAAO,IAAI,EAAE;oBAC/B,YAAY,EAAE,QAAQ,CAAC,IAAI;iBAC5B,CAAC,CAAC,CACJ,CAAC;YACJ,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;gBACnC,QAAQ,CAAC,IAAI,CAAC;oBACZ,IAAI,EAAE,MAAe;oBACrB,OAAO,EAAE;wBACP,GAAG,IAAI,CAAC,MAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;4BAC9B,IAAI,EAAE,WAAoB;4BAC1B,SAAS,EAAE;gCACT,GAAG,EAAE,OAAO,GAAG,KAAK,CAAC,SAAS,GAAG,UAAU,GAAG,KAAK,CAAC,SAAS;6BAC9D;yBACF,CAAC,CAAC;wBACH,GAAG,CAAC,IAAI,CAAC,IAAI;4BACX,CAAC,CAAC;gCACE;oCACE,IAAI,EAAE,MAAe;oCACrB,IAAI,EAAE,IAAI,CAAC,IAAI;iCAChB;6BACF;4BACH,CAAC,CAAC,EAAE,CAAC;qBACR;iBACF,CAAC,CAAC;YACL,CAAC;iBAAM,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;gBACrB,QAAQ,CAAC,IAAI,CAAC;oBACZ,IAAI,EAAE,MAAe;oBACrB,OAAO,EAAE,IAAI,CAAC,IAAI;iBACnB,CAAC,CAAC;YACL,CAAC;YACD,OAAO,QAAQ,CAAC;QAClB,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC;YAClC,MAAM,OAAO,GAA+B;gBAC1C,IAAI,EAAE,WAAoB;gBAC1B,OAAO,EACL,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM;oBACvB,CAAC,CAAC,IAAI,CAAC,IAAI;oBACX,CAAC,CAAE;wBACC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;wBACzD,sEAAsE;wBACtE,GAAG,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;4BACrC,IAAI,EAAE,WAAoB;4BAC1B,SAAS,EAAE;gCACT,GAAG,EAAE,OAAO,GAAG,KAAK,CAAC,SAAS,GAAG,UAAU,GAAG,KAAK,CAAC,SAAS;6BAC9D;yBACF,CAAC,CAAC;qBACgC;gBAC3C,GAAG,CAAC,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC;oBACrD,CAAC,CAAC;wBACE,UAAU,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;4BAC5C,IAAI,EAAE,UAAmB;4BACzB,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE;4BACzE,EAAE,EAAE,IAAI,CAAC,IAAI;yBACd,CAAC,CAAC;qBACJ;oBACH,CAAC,CAAC,EAAE,CAAC;aACR,CAAC;YACF,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACnE,OAAO,OAAO,CAAC,OAAO,CAAC;YACzB,CAAC;YACD,OAAO,OAAO,CAAC;QACjB,CAAC;IACH,CAAC,CAAC;SACD,IAAI,EAAE,CAAC;IAEV,OAAO,CAAC,GAAG,CAAC,uBAAuB,KAAK,EAAE,CAAC,CAAC;IAE5C,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,MAAM,UAAU,GAAG,CAAC,CAAC;IACrB,IAAI,QAAQ,GAAuD,SAAS,CAAC;IAE7E,OAAO,UAAU,GAAG,UAAU,EAAE,CAAC;QAC/B,IAAI,CAAC;YACH,QAAQ,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAC7C;gBACE,KAAK,EAAE,KAAK;gBACZ,QAAQ;gBACR,KAAK,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,UAAmB,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;gBACtF,WAAW,EAAE,oBAAoB;oBAC/B,CAAC,CAAC,EAAE,IAAI,EAAE,UAAmB,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,oBAAoB,EAAE,EAAE;oBACzE,CAAC,CAAC,UAAU;gBACd,WAAW,EAAE,WAAW;aACzB,EACD,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,CACpC,CAAC;YACF,MAAM,CAAC,0BAA0B;QACnC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,KAAK,YAAY,QAAQ,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;gBACtD,mBAAmB;gBACnB,IAAI,UAAU,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAClG,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;gBACtC,OAAO,CAAC,GAAG,CAAC,gCAAgC,UAAU,qBAAqB,UAAU,GAAG,CAAC,OAAO,UAAU,GAAG,CAAC,CAAC;gBAC/G,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,UAAU,GAAG,IAAI,CAAC,CAAC,CAAC;gBACvE,UAAU,EAAE,CAAC;YACf,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,KAAK,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;gBAC3C,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;YAC5D,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,UAAU,KAAK,UAAU,EAAE,CAAC;QAC9B,OAAO,CAAC,KAAK,CAAC,oCAAoC,UAAU,iCAAiC,CAAC,CAAC;QAC/F,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;IAC7D,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,CAAC;IAEjB,+BAA+B;IAC/B,MAAM,KAAK,GAAe;QACxB,WAAW,EAAE,QAAQ,CAAC,KAAM,CAAC,aAAa,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,qBAAqB,EAAE,aAAa,IAAI,CAAC,CAAC;QACxG,YAAY,EAAE,QAAQ,CAAC,KAAM,CAAC,iBAAiB;QAC/C,WAAW,EAAE,QAAQ,CAAC,KAAM,CAAC,YAAY;QACzC,eAAe,EAAE,QAAQ,CAAC,KAAK,EAAE,qBAAqB,EAAE,aAAa;KACtE,CAAC;IACF,sBAAsB,CAAC;QACrB,SAAS,EAAE,QAAQ;QACnB,KAAK;QACL,iBAAiB,EAAE,QAAQ;QAC3B,kBAAkB,EAAE,QAAQ;QAC5B,KAAK;KACN,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IAEpD,IAAI,eAAe,CAAC,OAAO,EAAE,CAAC;QAC5B,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC;IAClD,CAAC;IAED,IAAI,eAAe,CAAC,UAAU,EAAE,CAAC;QAC/B,OAAO,eAAe,CAAC,UAAU,CAAC;IACpC,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;IACrD,CAAC;AACH,CAAC"}
+{"version":3,"file":"openai.js","sourceRoot":"","sources":["../../src/ai-service/openai.ts"],"names":[],"mappings":"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"}

package/dist/ai-service/service-configurations-types.d.ts

@@ -0,0 +1,55 @@
+/**
+ * Full service configuration interface.
+ * This interface includes sensitive data and should only be used internally.
+ */
+export type ServiceConfig<T extends AiServiceType = AiServiceType> = {
+    /**
+     * Model overrides for the service.
+     * Allows customizing model names for different modes.
+     */
+    modelOverrides?: {
+        default?: string;
+        cheap?: string;
+        reasoning?: string;
+    };
+} & (T extends keyof ServiceConfigRequirements ? ServiceConfigRequirements[T] : {
+    apiKey?: string;
+    openaiBaseUrl?: string;
+    googleCloudProjectId?: string;
+    googleCloudRegion?: string;
+});
+/**
+ * Type map defining which configuration fields are required for each service type
+ */
+export type ServiceConfigRequirements = {
+    'vertex-ai': {
+        apiKey?: never;
+        googleCloudProjectId: string;
+        googleCloudRegion?: never;
+    };
+    'vertex-ai-claude': {
+        apiKey?: never;
+        googleCloudProjectId: string;
+        googleCloudRegion: string;
+    };
+    openai: {
+        apiKey: string | undefined;
+        openaiBaseUrl?: string | undefined;
+        googleCloudProjectId?: never;
+        googleCloudRegion?: never;
+    };
+    'ai-studio': {
+        apiKey: string | undefined;
+        googleCloudProjectId?: never;
+        googleCloudRegion?: never;
+    };
+    anthropic: {
+        apiKey: string | undefined;
+        googleCloudProjectId?: never;
+        googleCloudRegion?: never;
+    };
+}; /** Example: {@link ../../examples/genaicode_plugins/grok_ai_service.ts} */
+export type PluginAiServiceType = `plugin:${string}`;
+/** Example: {@link ../../examples/genaicode_plugins/nonsense_action_handlers.ts} */
+export type PluginActionType = `plugin:${string}`;
+export type AiServiceType = 'vertex-ai' | 'ai-studio' | 'vertex-ai-claude' | 'openai' | 'anthropic' | PluginAiServiceType;

package/dist/ai-service/service-configurations-types.js

@@ -0,0 +1,6 @@
+/**
+ * Full service configuration interface.
+ * This interface includes sensitive data and should only be used internally.
+ */
+export {};
+//# sourceMappingURL=service-configurations-types.js.map

package/dist/ai-service/service-configurations-types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"service-configurations-types.js","sourceRoot":"","sources":["../../src/ai-service/service-configurations-types.ts"],"names":[],"mappings":"AAAA;;;GAGG"}

package/dist/ai-service/service-configurations.d.ts

@@ -1,5 +1,6 @@
-import { AiServiceType } from '../main/codegen-types.js';
-import { ServiceConfig, ServiceConfigurations, SanitizedServiceConfig, SanitizedServiceConfigurations } from '../main/ui/common/api-types.js';
+import { AiServiceType } from './service-configurations-types.js';
+import { ServiceConfigurations, SanitizedServiceConfig, SanitizedServiceConfigurations } from '../main/ui/common/api-types.js';
+import { ServiceConfig } from './service-configurations-types.js';
 /**
  * Get all service configurations.
  * This method returns the full configurations including sensitive data.

package/dist/ai-service/service-configurations.js

@@ -6,6 +6,7 @@ const configurations = {
         modelOverrides: {
             default: modelOverrides.aiStudio?.default ?? 'gemini-1.5-pro-002',
             cheap: modelOverrides.aiStudio?.cheap ?? 'gemini-1.5-flash-002',
+            reasoning: modelOverrides.aiStudio?.reasoning ?? 'gemini-2.0-flash-thinking-exp-01-21',
         },
     },
     anthropic: {
@@ -13,6 +14,7 @@ const configurations = {
         modelOverrides: {
             default: modelOverrides.anthropic?.default ?? 'claude-3-5-sonnet-20241022',
             cheap: modelOverrides.anthropic?.cheap ?? 'claude-3-5-haiku-20241022',
+            reasoning: modelOverrides.anthropic?.reasoning ?? 'claude-3-5-sonnet-20241022',
         },
     },
     openai: {
@@ -21,6 +23,7 @@ const configurations = {
         modelOverrides: {
             default: modelOverrides.openai?.default ?? 'gpt-4o-2024-11-20',
             cheap: modelOverrides.openai?.cheap ?? 'gpt-4o-mini',
+            reasoning: modelOverrides.openai?.reasoning ?? 'o1-mini',
         },
     },
     'vertex-ai': {
@@ -28,6 +31,7 @@ const configurations = {
         modelOverrides: {
             default: modelOverrides.vertexAi?.default ?? 'gemini-1.5-pro-002',
             cheap: modelOverrides.vertexAi?.cheap ?? 'gemini-1.5-flash-002',
+            reasoning: modelOverrides.vertexAi?.reasoning ?? 'gemini-2.0-flash-thinking-exp-01-21',
         },
     },
     'vertex-ai-claude': {
@@ -36,6 +40,7 @@ const configurations = {
         modelOverrides: {
             default: 'claude-3-5-sonnet@20240620',
             cheap: 'claude-3-haiku@20240307',
+            reasoning: 'claude-3-5-sonnet@20240620',
         },
     },
 };

package/dist/ai-service/service-configurations.js.map

@@ -1 +1 @@
-{"version":3,"file":"service-configurations.js","sourceRoot":"","sources":["../../src/ai-service/service-configurations.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"service-configurations.js","sourceRoot":"","sources":["../../src/ai-service/service-configurations.ts"],"names":[],"mappings":"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"}

package/dist/ai-service/unescape-function-call.d.ts

@@ -1,4 +1,4 @@
-import { FunctionCall } from './common.js';
+import { FunctionCall } from './common-types.js';
 /**
  * Unescapes c-escaped strings in a function call object
  * @param functionCall The function call object to unescape

package/dist/ai-service/vertex-ai-claude.d.ts

@@ -1,5 +1,5 @@
-import { FunctionCall, PromptItem, FunctionDef } from './common.js';
+import { GenerateContentFunction } from './common-types.js';
 /**
  * This function generates content using the Anthropic Claude model via Vertex AI.
  */
-export declare function generateContent(prompt: PromptItem[], functionDefs: FunctionDef[], requiredFunctionName: string | null, temperature: number, cheap?: boolean): Promise<FunctionCall[]>;
+export declare const generateContent: GenerateContentFunction;

package/dist/ai-service/vertex-ai-claude.js

@@ -1,12 +1,14 @@
 import { AnthropicVertex } from '@anthropic-ai/vertex-sdk';
 import assert from 'node:assert';
 import { printTokenUsageAndCost, processFunctionCalls } from './common.js';
-import { abortController } from '../main/interactive/codegen-worker.js';
+import { ModelType } from './common-types.js';
+import { abortController } from '../main/common/abort-controller.js';
 import { getServiceConfig } from './service-configurations.js';
+import { reasoningInferenceResponse } from '../prompt/function-defs/reasoning-inference.js';
 /**
  * This function generates content using the Anthropic Claude model via Vertex AI.
  */
-export async function generateContent(prompt, functionDefs, requiredFunctionName, temperature, cheap = false) {
+export const generateContent = async function generateContent(prompt, functionDefs, requiredFunctionName, temperature, modelType = ModelType.DEFAULT) {
     const serviceConfig = getServiceConfig('vertex-ai-claude');
     assert(serviceConfig.googleCloudProjectId, 'googleCloudProjectId is not set in the service configuration');
     assert(serviceConfig.googleCloudRegion, 'googleCloudRegion is not set in the service configuration');
@@ -14,6 +16,16 @@ export async function generateContent(prompt, functionDefs, requiredFunctionName
         projectId: serviceConfig.googleCloudProjectId,
         region: serviceConfig.googleCloudRegion,
     });
+    let systemPrompt = prompt.find((item) => item.type === 'systemPrompt')?.systemPrompt || '';
+    if (modelType === ModelType.REASONING) {
+        // This solution mimics the behavior of a reasoning model by using a function call
+        if (!functionDefs.some((f) => f.name === reasoningInferenceResponse.name)) {
+            functionDefs = [...functionDefs, reasoningInferenceResponse];
+        }
+        requiredFunctionName = reasoningInferenceResponse.name;
+        systemPrompt +=
+            '\nFirst, reason step-by-step. Then, call reasoningInferenceResponse with your reasoning and answer.';
+    }
     const messages = prompt
         .filter((item) => item.type !== 'systemPrompt')
         .map((item) => {
@@ -55,15 +67,17 @@ export async function generateContent(prompt, functionDefs, requiredFunctionName
         }
     })
         .filter((message) => !!message);
-    const model = cheap
+    const model = modelType === ModelType.CHEAP
         ? (serviceConfig.modelOverrides?.cheap ?? 'claude-3-5-haiku@20240620')
-        : (serviceConfig.modelOverrides?.default ?? 'claude-3-5-sonnet@20240620');
+        : modelType === ModelType.REASONING
+            ? (serviceConfig.modelOverrides?.reasoning ?? 'claude-3-5-sonnet@20240620')
+            : (serviceConfig.modelOverrides?.default ?? 'claude-3-5-sonnet@20240620');
     console.log(`Using Vertex AI Claude model: ${model}`);
     const response = await client.messages.create({
         model: model,
-        max_tokens: cheap ? 4096 : 8192,
+        max_tokens: 4096,
         temperature: temperature,
-        system: prompt.find((item) => item.type === 'systemPrompt').systemPrompt,
+        system: systemPrompt,
         messages: messages,
         tools: functionDefs.map((fd) => ({
             name: fd.name,
@@ -85,7 +99,7 @@ export async function generateContent(prompt, functionDefs, requiredFunctionName
         usage,
         inputCostPerToken: 3 / 1000 / 1000,
         outputCostPerToken: 15 / 1000 / 1000,
-        cheap,
+        modelType,
     });
     const responseMessages = response.content.filter((item) => item.type !== 'tool_use');
     if (responseMessages.length > 0) {
@@ -99,5 +113,5 @@ export async function generateContent(prompt, functionDefs, requiredFunctionName
         args: item.input,
     }));
     return processFunctionCalls(functionCalls, functionDefs);
-}
+};
 //# sourceMappingURL=vertex-ai-claude.js.map

package/dist/ai-service/vertex-ai-claude.js.map

@@ -1 +1 @@
-{"version":3,"file":"vertex-ai-claude.js","sourceRoot":"","sources":["../../src/ai-service/vertex-ai-claude.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"vertex-ai-claude.js","sourceRoot":"","sources":["../../src/ai-service/vertex-ai-claude.ts"],"names":[],"mappings":"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"}

package/dist/ai-service/vertex-ai-imagen.d.ts

@@ -1,14 +1,7 @@
+import { ModelType } from './common-types.js';
 interface ImageSize {
     width: number;
     height: number;
 }
-/**
- * Generate an image using Vertex AI's Imagen model and return the image URL
- * @param {string} prompt - The description of the image to generate
- * @param {string|undefined} contextImagePath - The image to be used as a context
- * @param {ImageSize} size - The size of the image to generate
- * @param {boolean} cheap - Whether to use a cheaper model
- * @returns {Promise<string>} - The url of the generated image
- */
-export declare function generateImage(prompt: string, contextImagePath: string | undefined, size: ImageSize, cheap?: boolean): Promise<string>;
+export declare function generateImage(prompt: string, contextImagePath: string | undefined, size: ImageSize, modelType?: ModelType): Promise<string>;
 export {};

package/dist/ai-service/vertex-ai-imagen.js

@@ -3,16 +3,9 @@ import mime from 'mime-types';
 import { PredictionServiceClient, helpers } from '@google-cloud/aiplatform';
 import { setTempBuffer } from '../files/temp-buffer.js';
 import { resizeImageBuffer } from '../images/resize-image.js';
-import { abortController } from '../main/interactive/codegen-worker.js';
-/**
- * Generate an image using Vertex AI's Imagen model and return the image URL
- * @param {string} prompt - The description of the image to generate
- * @param {string|undefined} contextImagePath - The image to be used as a context
- * @param {ImageSize} size - The size of the image to generate
- * @param {boolean} cheap - Whether to use a cheaper model
- * @returns {Promise<string>} - The url of the generated image
- */
-export async function generateImage(prompt, contextImagePath, size, cheap = false) {
+import { abortController } from '../main/common/abort-controller.js';
+import { ModelType } from './common-types.js';
+export async function generateImage(prompt, contextImagePath, size, modelType = ModelType.DEFAULT) {
     // Limitation in @google-cloud/aiplatform
     abortController?.signal.throwIfAborted();
     // Initialize the PredictionServiceClient
@@ -28,7 +21,7 @@ export async function generateImage(prompt, contextImagePath, size, cheap = fals
     // Set the model name based on the cheap parameter
     const modelName = contextImagePath
         ? 'imagegeneration@002'
-        : cheap
+        : modelType === ModelType.CHEAP
             ? 'imagen-3.0-fast-generate-001'
             : 'imagen-3.0-generate-001';
     console.log(`Using Vertex AI Imagen model: ${modelName}`);

package/dist/ai-service/vertex-ai-imagen.js.map

@@ -1 +1 @@
-{"version":3,"file":"vertex-ai-imagen.js","sourceRoot":"","sources":["../../src/ai-service/vertex-ai-imagen.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"vertex-ai-imagen.js","sourceRoot":"","sources":["../../src/ai-service/vertex-ai-imagen.ts"],"names":[],"mappings":"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"}

package/dist/ai-service/vertex-ai.d.ts

@@ -1,6 +1,5 @@
-import { FunctionCall, PromptItem, FunctionDef } from './common.js';
-import { CodegenOptions } from '../main/codegen-types.js';
+import { GenerateContentFunction } from './common-types.js';
 /**
  * This function generates content using the Gemini Pro model.
  */
-export declare function generateContent(prompt: PromptItem[], functionDefs: FunctionDef[], requiredFunctionName: string | null, temperature: number, cheap: boolean | undefined, options: CodegenOptions): Promise<FunctionCall[]>;
+export declare const generateContent: GenerateContentFunction;

package/dist/ai-service/vertex-ai.js

@@ -1,14 +1,15 @@
 import assert from 'node:assert';
 import { VertexAI, HarmCategory, HarmBlockThreshold, FunctionCallingMode, } from '@google-cloud/vertexai';
 import { printTokenUsageAndCost, processFunctionCalls } from './common.js';
-import { abortController } from '../main/interactive/codegen-worker.js';
+import { ModelType } from './common-types.js';
+import { abortController } from '../main/common/abort-controller.js';
 import { unescapeFunctionCall } from './unescape-function-call.js';
-import { disableVertexUnescape } from '../cli/cli-params.js';
+import { enableVertexUnescape } from '../cli/cli-params.js';
 import { getServiceConfig } from './service-configurations.js';
 /**
  * This function generates content using the Gemini Pro model.
  */
-export async function generateContent(prompt, functionDefs, requiredFunctionName, temperature, cheap = false, options) {
+export const generateContent = async function generateContent(prompt, functionDefs, requiredFunctionName, temperature, modelType = ModelType.DEFAULT, options = {}) {
     try {
         // Limitation: https://github.com/googleapis/nodejs-vertexai/issues/143
         abortController?.signal.throwIfAborted();
@@ -62,7 +63,7 @@ export async function generateContent(prompt, functionDefs, requiredFunctionName
         const req = {
             contents: messages,
         };
-        const model = await getGenModel(prompt.find((item) => item.type === 'systemPrompt').systemPrompt, temperature, functionDefs, options.geminiBlockNone, requiredFunctionName, cheap);
+        const model = await getGenModel(prompt.find((item) => item.type === 'systemPrompt').systemPrompt, temperature, functionDefs, options.geminiBlockNone, requiredFunctionName, modelType);
         const result = await model.generateContent(req);
         // Print token usage
         const usageMetadata = result.response.usageMetadata;
@@ -76,7 +77,7 @@ export async function generateContent(prompt, functionDefs, requiredFunctionName
             usage,
             inputCostPerToken: 0.000125 / 1000,
             outputCostPerToken: 0.000375 / 1000,
-            cheap,
+            modelType,
         });
         if (result.response.promptFeedback) {
             console.log('Prompt feedback:');
@@ -91,7 +92,7 @@ export async function generateContent(prompt, functionDefs, requiredFunctionName
             .flat()
             .filter((functionCall) => !!functionCall)
             .map((call) => ({ name: call.name, args: call.args }))
-            .map(disableVertexUnescape ? (call) => call : unescapeFunctionCall);
+            .map(enableVertexUnescape ? (call) => call : unescapeFunctionCall);
         if (functionCalls.length === 0) {
             const textResponse = result.response.candidates
                 .map((candidate) => candidate.content.parts?.map((part) => part.text))
@@ -117,18 +118,20 @@ export async function generateContent(prompt, functionDefs, requiredFunctionName
         }
         throw error;
     }
-}
+};
 // A function to get the generative model
 // Modified to accept temperature parameter and cheap flag
-function getGenModel(systemPrompt, temperature, functionDefs, geminiBlockNone, requiredFunctionName, cheap = false) {
+function getGenModel(systemPrompt, temperature, functionDefs, geminiBlockNone, requiredFunctionName, modelType = ModelType.DEFAULT) {
     try {
         console.log('Recovering function call');
         const serviceConfig = getServiceConfig('vertex-ai');
         // Initialize Vertex with your Cloud project and location
         const vertex_ai = new VertexAI({ project: serviceConfig?.googleCloudProjectId });
-        const defaultModel = cheap ? 'gemini-1.5-flash-002' : 'gemini-1.5-pro-002';
+        const defaultModel = modelType === ModelType.CHEAP ? 'gemini-1.5-flash-002' : 'gemini-1.5-pro-002';
         const modelOverrides = serviceConfig?.modelOverrides;
-        const model = cheap ? (modelOverrides?.cheap ?? defaultModel) : (modelOverrides?.default ?? defaultModel);
+        const model = modelType === ModelType.CHEAP
+            ? (modelOverrides?.cheap ?? defaultModel)
+            : (modelOverrides?.default ?? defaultModel);
         console.log(`Using Vertex AI model: ${model}`);
         // Instantiate the models
         return vertex_ai.preview.getGenerativeModel({
@@ -191,7 +194,7 @@ function getGenModel(systemPrompt, temperature, functionDefs, geminiBlockNone, r
 async function recoverFunctionCall(textResponse, functionCalls, functionDef) {
     // @ts-expect-error: "object" !== "OBJECT"
     const schema = functionDef.parameters;
-    const result = await getGenModel('Your role is read the text below and if possible, return it in the desired format.', 0.2, undefined, undefined, null, false).generateContent({
+    const result = await getGenModel('Your role is read the text below and if possible, return it in the desired format.', 0.2, undefined, undefined, null, ModelType.DEFAULT).generateContent({
         contents: [
             {
                 role: 'user',
@@ -213,7 +216,9 @@ async function recoverFunctionCall(textResponse, functionCalls, functionDef) {
             return false;
         }
         const parsed = JSON.parse(text);
-        functionCalls.push(unescapeFunctionCall({ name: functionDef.name, args: parsed }));
+        functionCalls.push(enableVertexUnescape
+            ? unescapeFunctionCall({ name: functionDef.name, args: parsed })
+            : { name: functionDef.name, args: parsed });
         return true;
     }
     catch {

package/dist/ai-service/vertex-ai.js.map

@@ -1 +1 @@
-{"version":3,"file":"vertex-ai.js","sourceRoot":"","sources":["../../src/ai-service/vertex-ai.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"vertex-ai.js","sourceRoot":"","sources":["../../src/ai-service/vertex-ai.ts"],"names":[],"mappings":"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"}

package/dist/cli/cli-params.d.ts

@@ -23,6 +23,6 @@ export declare const temperature: number;
 export declare const contentMask: string | undefined;
 export declare const ignorePatterns: string[];
 export declare const disableAiServiceFallback: boolean;
-export declare const disableVertexUnescape: boolean;
+export declare const enableVertexUnescape: boolean;
 export declare const disableHistory: boolean;
 export declare const uiPort: number;

package/dist/cli/cli-params.js

@@ -31,7 +31,7 @@ export const ignorePatterns = params
     .filter((param) => param.startsWith('--ignore-pattern='))
     .map((param) => param.split('=')[1]);
 export const disableAiServiceFallback = params.includes('--disable-ai-service-fallback');
-export const disableVertexUnescape = params.includes('--disable-vertex-unescape');
+export const enableVertexUnescape = params.includes('--enable-vertex-unescape');
 export const disableHistory = params.includes('--disable-history');
 // New variable to store the ui-port value
 export const uiPort = parseInt(params.find((param) => param.startsWith('--ui-port='))?.split('=')[1] || '1337', 10);