@machina.ai/cell-cli-core 1.0.17-rc1 → 1.0.21-rc1

package/dist/src/core/nonInteractiveToolExecutor.test.js

@@ -5,42 +5,23 @@
  */
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { executeToolCall } from './nonInteractiveToolExecutor.js';
-import { Icon, } from '../index.js';
-import { Type } from '@google/genai';
+import { ToolErrorType, } from '../index.js';
+import { MockTool } from '../test-utils/tools.js';
 const mockConfig = {
     getSessionId: () => 'test-session-id',
     getUsageStatisticsEnabled: () => true,
     getDebugMode: () => false,
+    getContentGeneratorConfig: () => ({
+        model: 'test-model',
+        authType: 'oauth-personal',
+    }),
 };
 describe('executeToolCall', () => {
     let mockToolRegistry;
     let mockTool;
     let abortController;
     beforeEach(() => {
-        mockTool = {
-            name: 'testTool',
-            displayName: 'Test Tool',
-            description: 'A tool for testing',
-            icon: Icon.Hammer,
-            schema: {
-                name: 'testTool',
-                description: 'A tool for testing',
-                parameters: {
-                    type: Type.OBJECT,
-                    properties: {
-                        param1: { type: Type.STRING },
-                    },
-                    required: ['param1'],
-                },
-            },
-            execute: vi.fn(),
-            validateToolParams: vi.fn(() => null),
-            shouldConfirmExecute: vi.fn(() => Promise.resolve(false)),
-            isOutputMarkdown: false,
-            canUpdateOutput: false,
-            getDescription: vi.fn(),
-            toolLocations: vi.fn(() => []),
-        };
+        mockTool = new MockTool();
         mockToolRegistry = {
             getTool: vi.fn(),
             // Add other ToolRegistry methods if needed, or use a more complete mock
@@ -60,10 +41,10 @@ describe('executeToolCall', () => {
             returnDisplay: 'Success!',
         };
         vi.mocked(mockToolRegistry.getTool).mockReturnValue(mockTool);
-        vi.mocked(mockTool.execute).mockResolvedValue(toolResult);
+        vi.spyOn(mockTool, 'validateBuildAndExecute').mockResolvedValue(toolResult);
         const response = await executeToolCall(mockConfig, request, mockToolRegistry, abortController.signal);
         expect(mockToolRegistry.getTool).toHaveBeenCalledWith('testTool');
-        expect(mockTool.execute).toHaveBeenCalledWith(request.args, abortController.signal);
+        expect(mockTool.validateBuildAndExecute).toHaveBeenCalledWith(request.args, abortController.signal);
         expect(response.callId).toBe('call1');
         expect(response.error).toBeUndefined();
         expect(response.resultDisplay).toBe('Success!');
@@ -99,32 +80,42 @@ describe('executeToolCall', () => {
             },
         ]);
     });
-    it('should return an error if tool execution fails', async () => {
+    it('should return an error if tool validation fails', async () => {
         const request = {
             callId: 'call3',
             name: 'testTool',
-            args: { param1: 'value1' },
+            args: { param1: 'invalid' },
             isClientInitiated: false,
             prompt_id: 'prompt-id-3',
         };
-        const executionError = new Error('Tool execution failed');
+        const validationErrorResult = {
+            llmContent: 'Error: Invalid parameters',
+            returnDisplay: 'Invalid parameters',
+            error: {
+                message: 'Invalid parameters',
+                type: ToolErrorType.INVALID_TOOL_PARAMS,
+            },
+        };
         vi.mocked(mockToolRegistry.getTool).mockReturnValue(mockTool);
-        vi.mocked(mockTool.execute).mockRejectedValue(executionError);
+        vi.spyOn(mockTool, 'validateBuildAndExecute').mockResolvedValue(validationErrorResult);
         const response = await executeToolCall(mockConfig, request, mockToolRegistry, abortController.signal);
-        expect(response.callId).toBe('call3');
-        expect(response.error).toBe(executionError);
-        expect(response.resultDisplay).toBe('Tool execution failed');
-        expect(response.responseParts).toEqual([
-            {
+        expect(response).toStrictEqual({
+            callId: 'call3',
+            error: new Error('Invalid parameters'),
+            errorType: ToolErrorType.INVALID_TOOL_PARAMS,
+            responseParts: {
                 functionResponse: {
-                    name: 'testTool',
                     id: 'call3',
-                    response: { error: 'Tool execution failed' },
+                    name: 'testTool',
+                    response: {
+                        output: 'Error: Invalid parameters',
+                    },
                 },
             },
-        ]);
+            resultDisplay: 'Invalid parameters',
+        });
     });
-    it('should handle cancellation during tool execution', async () => {
+    it('should return an error if tool execution fails', async () => {
         const request = {
             callId: 'call4',
             name: 'testTool',
@@ -132,34 +123,66 @@ describe('executeToolCall', () => {
             isClientInitiated: false,
             prompt_id: 'prompt-id-4',
         };
-        const cancellationError = new Error('Operation cancelled');
+        const executionErrorResult = {
+            llmContent: 'Error: Execution failed',
+            returnDisplay: 'Execution failed',
+            error: {
+                message: 'Execution failed',
+                type: ToolErrorType.EXECUTION_FAILED,
+            },
+        };
         vi.mocked(mockToolRegistry.getTool).mockReturnValue(mockTool);
-        vi.mocked(mockTool.execute).mockImplementation(async (_args, signal) => {
-            if (signal?.aborted) {
-                return Promise.reject(cancellationError);
-            }
-            return new Promise((_resolve, reject) => {
-                signal?.addEventListener('abort', () => {
-                    reject(cancellationError);
-                });
-                // Simulate work that might happen if not aborted immediately
-                const timeoutId = setTimeout(() => reject(new Error('Should have been cancelled if not aborted prior')), 100);
-                signal?.addEventListener('abort', () => clearTimeout(timeoutId));
-            });
+        vi.spyOn(mockTool, 'validateBuildAndExecute').mockResolvedValue(executionErrorResult);
+        const response = await executeToolCall(mockConfig, request, mockToolRegistry, abortController.signal);
+        expect(response).toStrictEqual({
+            callId: 'call4',
+            error: new Error('Execution failed'),
+            errorType: ToolErrorType.EXECUTION_FAILED,
+            responseParts: {
+                functionResponse: {
+                    id: 'call4',
+                    name: 'testTool',
+                    response: {
+                        output: 'Error: Execution failed',
+                    },
+                },
+            },
+            resultDisplay: 'Execution failed',
         });
-        abortController.abort(); // Abort before calling
+    });
+    it('should return an unhandled exception error if execution throws', async () => {
+        const request = {
+            callId: 'call5',
+            name: 'testTool',
+            args: { param1: 'value1' },
+            isClientInitiated: false,
+            prompt_id: 'prompt-id-5',
+        };
+        const executionError = new Error('Something went very wrong');
+        vi.mocked(mockToolRegistry.getTool).mockReturnValue(mockTool);
+        vi.spyOn(mockTool, 'validateBuildAndExecute').mockRejectedValue(executionError);
         const response = await executeToolCall(mockConfig, request, mockToolRegistry, abortController.signal);
-        expect(response.callId).toBe('call4');
-        expect(response.error?.message).toBe(cancellationError.message);
-        expect(response.resultDisplay).toBe('Operation cancelled');
+        expect(response.callId).toBe('call5');
+        expect(response.error).toBe(executionError);
+        expect(response.errorType).toBe(ToolErrorType.UNHANDLED_EXCEPTION);
+        expect(response.resultDisplay).toBe('Something went very wrong');
+        expect(response.responseParts).toEqual([
+            {
+                functionResponse: {
+                    name: 'testTool',
+                    id: 'call5',
+                    response: { error: 'Something went very wrong' },
+                },
+            },
+        ]);
     });
     it('should correctly format llmContent with inlineData', async () => {
         const request = {
-            callId: 'call5',
+            callId: 'call6',
             name: 'testTool',
             args: {},
             isClientInitiated: false,
-            prompt_id: 'prompt-id-5',
+            prompt_id: 'prompt-id-6',
         };
         const imageDataPart = {
             inlineData: { mimeType: 'image/png', data: 'base64data' },
@@ -169,14 +192,14 @@ describe('executeToolCall', () => {
             returnDisplay: 'Image processed',
         };
         vi.mocked(mockToolRegistry.getTool).mockReturnValue(mockTool);
-        vi.mocked(mockTool.execute).mockResolvedValue(toolResult);
+        vi.spyOn(mockTool, 'validateBuildAndExecute').mockResolvedValue(toolResult);
         const response = await executeToolCall(mockConfig, request, mockToolRegistry, abortController.signal);
         expect(response.resultDisplay).toBe('Image processed');
         expect(response.responseParts).toEqual([
             {
                 functionResponse: {
                     name: 'testTool',
-                    id: 'call5',
+                    id: 'call6',
                     response: {
                         output: 'Binary content of type image/png was processed.',
                     },

package/dist/src/core/nonInteractiveToolExecutor.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"nonInteractiveToolExecutor.test.js","sourceRoot":"","sources":["../../../src/core/nonInteractiveToolExecutor.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAOL,IAAI,GACL,MAAM,aAAa,CAAC;AACrB,OAAO,EAAQ,IAAI,EAAE,MAAM,eAAe,CAAC;AAE3C,MAAM,UAAU,GAAG;IACjB,YAAY,EAAE,GAAG,EAAE,CAAC,iBAAiB;IACrC,yBAAyB,EAAE,GAAG,EAAE,CAAC,IAAI;IACrC,YAAY,EAAE,GAAG,EAAE,CAAC,KAAK;CACL,CAAC;AAEvB,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,IAAI,gBAA8B,CAAC;IACnC,IAAI,QAAc,CAAC;IACnB,IAAI,eAAgC,CAAC;IAErC,UAAU,CAAC,GAAG,EAAE;QACd,QAAQ,GAAG;YACT,IAAI,EAAE,UAAU;YAChB,WAAW,EAAE,WAAW;YACxB,WAAW,EAAE,oBAAoB;YACjC,IAAI,EAAE,IAAI,CAAC,MAAM;YACjB,MAAM,EAAE;gBACN,IAAI,EAAE,UAAU;gBAChB,WAAW,EAAE,oBAAoB;gBACjC,UAAU,EAAE;oBACV,IAAI,EAAE,IAAI,CAAC,MAAM;oBACjB,UAAU,EAAE;wBACV,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE;qBAC9B;oBACD,QAAQ,EAAE,CAAC,QAAQ,CAAC;iBACrB;aACF;YACD,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE;YAChB,kBAAkB,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;YACrC,oBAAoB,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAC/B,OAAO,CAAC,OAAO,CAAC,KAA4C,CAAC,CAC9D;YACD,gBAAgB,EAAE,KAAK;YACvB,eAAe,EAAE,KAAK;YACtB,cAAc,EAAE,EAAE,CAAC,EAAE,EAAE;YACvB,aAAa,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC;SAC/B,CAAC;QAEF,gBAAgB,GAAG;YACjB,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE;YAChB,wEAAwE;SAC9C,CAAC;QAE7B,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oCAAoC,EAAE,KAAK,IAAI,EAAE;QAClD,MAAM,OAAO,GAAwB;YACnC,MAAM,EAAE,OAAO;YACf,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE;YAC1B,iBAAiB,EAAE,KAAK;YACxB,SAAS,EAAE,aAAa;SACzB,CAAC;QACF,MAAM,UAAU,GAAe;YAC7B,UAAU,EAAE,4BAA4B;YACxC,aAAa,EAAE,UAAU;SAC1B,CAAC;QACF,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QAC9D,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;QAE1D,MAAM,QAAQ,GAAG,MAAM,eAAe,CACpC,UAAU,EACV,OAAO,EACP,gBAAgB,EAChB,eAAe,CAAC,MAAM,CACvB,CAAC;QAEF,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;QAClE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,oBAAoB,CAC3C,OAAO,CAAC,IAAI,EACZ,eAAe,CAAC,MAAM,CACvB,CAAC;QACF,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACtC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,aAAa,EAAE,CAAC;QACvC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAChD,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC;YACrC,gBAAgB,EAAE;gBAChB,IAAI,EAAE,UAAU;gBAChB,EAAE,EAAE,OAAO;gBACX,QAAQ,EAAE,EAAE,MAAM,EAAE,4BAA4B,EAAE;aACnD;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;QAC3D,MAAM,OAAO,GAAwB;YACnC,MAAM,EAAE,OAAO;YACf,IAAI,EAAE,iBAAiB;YACvB,IAAI,EAAE,EAAE;YACR,iBAAiB,EAAE,KAAK;YACxB,SAAS,EAAE,aAAa;SACzB,CAAC;QACF,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAE/D,MAAM,QAAQ,GAAG,MAAM,eAAe,CACpC,UAAU,EACV,OAAO,EACP,gBAAgB,EAChB,eAAe,CAAC,MAAM,CACvB,CAAC;QAEF,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACtC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAC7C,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,IAAI,CAClC,+CAA+C,CAChD,CAAC;QACF,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,IAAI,CACjC,+CAA+C,CAChD,CAAC;QACF,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC;YACrC;gBACE,gBAAgB,EAAE;oBAChB,IAAI,EAAE,iBAAiB;oBACvB,EAAE,EAAE,OAAO;oBACX,QAAQ,EAAE,EAAE,KAAK,EAAE,+CAA+C,EAAE;iBACrE;aACF;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gDAAgD,EAAE,KAAK,IAAI,EAAE;QAC9D,MAAM,OAAO,GAAwB;YACnC,MAAM,EAAE,OAAO;YACf,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE;YAC1B,iBAAiB,EAAE,KAAK;YACxB,SAAS,EAAE,aAAa;SACzB,CAAC;QACF,MAAM,cAAc,GAAG,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAC1D,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QAC9D,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;QAE9D,MAAM,QAAQ,GAAG,MAAM,eAAe,CACpC,UAAU,EACV,OAAO,EACP,gBAAgB,EAChB,eAAe,CAAC,MAAM,CACvB,CAAC;QAEF,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACtC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC5C,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;QAC7D,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC;YACrC;gBACE,gBAAgB,EAAE;oBAChB,IAAI,EAAE,UAAU;oBAChB,EAAE,EAAE,OAAO;oBACX,QAAQ,EAAE,EAAE,KAAK,EAAE,uBAAuB,EAAE;iBAC7C;aACF;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kDAAkD,EAAE,KAAK,IAAI,EAAE;QAChE,MAAM,OAAO,GAAwB;YACnC,MAAM,EAAE,OAAO;YACf,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE;YAC1B,iBAAiB,EAAE,KAAK;YACxB,SAAS,EAAE,aAAa;SACzB,CAAC;QACF,MAAM,iBAAiB,GAAG,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;QAC3D,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QAE9D,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,kBAAkB,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;YACrE,IAAI,MAAM,EAAE,OAAO,EAAE,CAAC;gBACpB,OAAO,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;YAC3C,CAAC;YACD,OAAO,IAAI,OAAO,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE;gBACtC,MAAM,EAAE,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE;oBACrC,MAAM,CAAC,iBAAiB,CAAC,CAAC;gBAC5B,CAAC,CAAC,CAAC;gBACH,6DAA6D;gBAC7D,MAAM,SAAS,GAAG,UAAU,CAC1B,GAAG,EAAE,CACH,MAAM,CACJ,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAC7D,EACH,GAAG,CACJ,CAAC;gBACF,MAAM,EAAE,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC;YACnE,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,eAAe,CAAC,KAAK,EAAE,CAAC,CAAC,uBAAuB;QAChD,MAAM,QAAQ,GAAG,MAAM,eAAe,CACpC,UAAU,EACV,OAAO,EACP,gBAAgB,EAChB,eAAe,CAAC,MAAM,CACvB,CAAC;QAEF,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACtC,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAChE,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;QAClE,MAAM,OAAO,GAAwB;YACnC,MAAM,EAAE,OAAO;YACf,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,EAAE;YACR,iBAAiB,EAAE,KAAK;YACxB,SAAS,EAAE,aAAa;SACzB,CAAC;QACF,MAAM,aAAa,GAAS;YAC1B,UAAU,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,YAAY,EAAE;SAC1D,CAAC;QACF,MAAM,UAAU,GAAe;YAC7B,UAAU,EAAE,CAAC,aAAa,CAAC;YAC3B,aAAa,EAAE,iBAAiB;SACjC,CAAC;QACF,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QAC9D,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;QAE1D,MAAM,QAAQ,GAAG,MAAM,eAAe,CACpC,UAAU,EACV,OAAO,EACP,gBAAgB,EAChB,eAAe,CAAC,MAAM,CACvB,CAAC;QAEF,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACvD,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC;YACrC;gBACE,gBAAgB,EAAE;oBAChB,IAAI,EAAE,UAAU;oBAChB,EAAE,EAAE,OAAO;oBACX,QAAQ,EAAE;wBACR,MAAM,EAAE,iDAAiD;qBAC1D;iBACF;aACF;YACD,aAAa;SACd,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"nonInteractiveToolExecutor.test.js","sourceRoot":"","sources":["../../../src/core/nonInteractiveToolExecutor.test.ts"],"names":[],"mappings":"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"}

package/dist/src/core/prompts.js

@@ -22,7 +22,7 @@ export function getCoreSystemPrompt(userMemory) {
     // default path is .gemini/system.md but can be modified via custom path in GEMINI_SYSTEM_MD
     let systemMdEnabled = false;
     let systemMdPath = path.resolve(path.join(GEMINI_CONFIG_DIR, 'system.md'));
-    const systemMdVar = process.env.GEMINI_SYSTEM_MD;
+    const systemMdVar = process.env['GEMINI_SYSTEM_MD'];
     if (systemMdVar) {
         const systemMdVarLower = systemMdVar.toLowerCase();
         if (!['0', 'false'].includes(systemMdVarLower)) {
@@ -120,8 +120,8 @@ When requested to perform tasks like fixing bugs, adding features, refactoring,
 
 ${(function () {
             // Determine sandbox status based on environment variables
-            const isSandboxExec = process.env.SANDBOX === 'sandbox-exec';
-            const isGenericSandbox = !!process.env.SANDBOX; // Check if SANDBOX is set to any non-empty value
+            const isSandboxExec = process.env['SANDBOX'] === 'sandbox-exec';
+            const isGenericSandbox = !!process.env['SANDBOX']; // Check if SANDBOX is set to any non-empty value
             if (isSandboxExec) {
                 return `
 # macOS Seatbelt
@@ -265,7 +265,7 @@ To help you check their settings, I can read their contents. Which one would you
 Your core function is efficient and safe assistance. Balance extreme conciseness with the crucial need for clarity, especially regarding safety and potential system modifications. Always prioritize user control and project conventions. Never make assumptions about the contents of files; instead use '${ReadFileTool.Name}' or '${ReadManyFilesTool.Name}' to ensure you aren't making broad assumptions. Finally, you are an agent - please keep going until the user's query is completely resolved.
 `.trim();
     // if GEMINI_WRITE_SYSTEM_MD is set (and not 0|false), write base system prompt to file
-    const writeSystemMdVar = process.env.GEMINI_WRITE_SYSTEM_MD;
+    const writeSystemMdVar = process.env['GEMINI_WRITE_SYSTEM_MD'];
     if (writeSystemMdVar) {
         const writeSystemMdVarLower = writeSystemMdVar.toLowerCase();
         if (!['0', 'false'].includes(writeSystemMdVarLower)) {

package/dist/src/core/prompts.js.map

@@ -1 +1 @@
-{"version":3,"file":"prompts.js","sourceRoot":"","sources":["../../../src/core/prompts.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAEvE,MAAM,UAAU,mBAAmB,CAAC,UAAmB;IACrD,iFAAiF;IACjF,4FAA4F;IAC5F,IAAI,eAAe,GAAG,KAAK,CAAC;IAC5B,IAAI,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC,CAAC;IAC3E,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC;IACjD,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,gBAAgB,GAAG,WAAW,CAAC,WAAW,EAAE,CAAC;QACnD,IAAI,CAAC,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC;YAC/C,eAAe,GAAG,IAAI,CAAC,CAAC,gCAAgC;YACxD,IAAI,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC;gBAC9C,IAAI,UAAU,GAAG,WAAW,CAAC;gBAC7B,IAAI,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;oBAChC,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC5D,CAAC;qBAAM,IAAI,UAAU,KAAK,GAAG,EAAE,CAAC;oBAC9B,UAAU,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;gBAC5B,CAAC;gBACD,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,wCAAwC;YACnF,CAAC;YACD,iDAAiD;YACjD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;gBACjC,MAAM,IAAI,KAAK,CAAC,+BAA+B,YAAY,GAAG,CAAC,CAAC;YAClE,CAAC;QACH,CAAC;IACH,CAAC;IACD,MAAM,UAAU,GAAG,eAAe;QAChC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC;QACvC,CAAC,CAAC;;;;;;;;;;;;;oEAa8D,YAAY,CAAC,IAAI,SAAS,aAAa,CAAC,IAAI;;;;;;;4FAOpB,QAAQ,CAAC,IAAI,UAAU,QAAQ,CAAC,IAAI,wIAAwI,YAAY,CAAC,IAAI,UAAU,iBAAiB,CAAC,IAAI;;oDAErQ,QAAQ,CAAC,IAAI,OAAO,aAAa,CAAC,IAAI,MAAM,SAAS,CAAC,IAAI;;;;;;uOAMyH,aAAa,CAAC,IAAI,OAAO,QAAQ,CAAC,IAAI,UAAU,SAAS,CAAC,IAAI;;;;;;;;;;;;;8LAavG,SAAS,CAAC,IAAI;;;;;;;;;;;;;;;;mEAgBzI,SAAS,CAAC,IAAI;;;;uFAIM,YAAY,CAAC,IAAI,SAAS,aAAa,CAAC,IAAI;;oCAE/F,SAAS,CAAC,IAAI;;;oCAGd,UAAU,CAAC,IAAI;;;;;;;EAOjD,CAAC;YACD,0DAA0D;YAC1D,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,KAAK,cAAc,CAAC;YAC7D,MAAM,gBAAgB,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,iDAAiD;YAEjG,IAAI,aAAa,EAAE,CAAC;gBAClB,OAAO;;;CAGV,CAAC;YACA,CAAC;iBAAM,IAAI,gBAAgB,EAAE,CAAC;gBAC5B,OAAO;;;CAGV,CAAC;YACA,CAAC;iBAAM,CAAC;gBACN,OAAO;;;CAGV,CAAC;YACA,CAAC;QACH,CAAC,CAAC,EAAE;;EAEF,CAAC;YACD,IAAI,eAAe,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC;gBACnC,OAAO;;;;;;;;;;;;;;;CAeV,CAAC;YACA,CAAC;YACD,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC,EAAE;;;;;;;;;;;;;;;qBAeiB,MAAM,CAAC,IAAI;;;;;qBAKX,SAAS,CAAC,IAAI;;;;;;;cAOrB,QAAQ,CAAC,IAAI;cACb,YAAY,CAAC,IAAI;;;;cAIjB,YAAY,CAAC,IAAI;;;;;;;;;;;;;cAajB,aAAa,CAAC,IAAI,OAAO,QAAQ,CAAC,IAAI;;cAEtC,SAAS,CAAC,IAAI;;;EAG1B,CAAC;YACD,IAAI,eAAe,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC;gBACnC,OAAO,uEAAuE,CAAC;YACjF,CAAC;YACD,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC,EAAE;;;;;;;;;;;;cAYU,YAAY,CAAC,IAAI,oDAAoD,QAAQ,CAAC,IAAI;;cAElF,iBAAiB,CAAC,IAAI;;cAEtB,aAAa,CAAC,IAAI;;cAElB,SAAS,CAAC,IAAI;;;;;;;cAOd,QAAQ,CAAC,IAAI;;;cAGb,YAAY,CAAC,IAAI;;;;;;;;cAQjB,QAAQ,CAAC,IAAI;;;;;;;;;+SASoR,YAAY,CAAC,IAAI,SAAS,iBAAiB,CAAC,IAAI;CAC9V,CAAC,IAAI,EAAE,CAAC;IAEP,uFAAuF;IACvF,MAAM,gBAAgB,GAAG,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC;IAC5D,IAAI,gBAAgB,EAAE,CAAC;QACrB,MAAM,qBAAqB,GAAG,gBAAgB,CAAC,WAAW,EAAE,CAAC;QAC7D,IAAI,CAAC,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,qBAAqB,CAAC,EAAE,CAAC;YACpD,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,qBAAqB,CAAC,EAAE,CAAC;gBAClD,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC9D,EAAE,CAAC,aAAa,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC,CAAC,8DAA8D;YAC5G,CAAC;iBAAM,CAAC;gBACN,IAAI,UAAU,GAAG,gBAAgB,CAAC;gBAClC,IAAI,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;oBAChC,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC5D,CAAC;qBAAM,IAAI,UAAU,KAAK,GAAG,EAAE,CAAC;oBAC9B,UAAU,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;gBAC5B,CAAC;gBACD,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;gBAC9C,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC9D,EAAE,CAAC,aAAa,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC,CAAC,mDAAmD;YACjG,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,YAAY,GAChB,UAAU,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC;QACxC,CAAC,CAAC,cAAc,UAAU,CAAC,IAAI,EAAE,EAAE;QACnC,CAAC,CAAC,EAAE,CAAC;IAET,OAAO,GAAG,UAAU,GAAG,YAAY,EAAE,CAAC;AACxC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,oBAAoB;IAClC,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwDR,CAAC,IAAI,EAAE,CAAC;AACT,CAAC"}
+{"version":3,"file":"prompts.js","sourceRoot":"","sources":["../../../src/core/prompts.ts"],"names":[],"mappings":"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"}

package/dist/src/core/subagent.d.ts

@@ -0,0 +1,230 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { Config } from '../config/config.js';
+import { Content, FunctionDeclaration } from '@google/genai';
+/**
+ * @fileoverview Defines the configuration interfaces for a subagent.
+ *
+ * These interfaces specify the structure for defining the subagent's prompt,
+ * the model parameters, and the execution settings.
+ */
+/**
+ * Describes the possible termination modes for a subagent.
+ * This enum provides a clear indication of why a subagent's execution might have ended.
+ */
+export declare enum SubagentTerminateMode {
+    /**
+     * Indicates that the subagent's execution terminated due to an unrecoverable error.
+     */
+    ERROR = "ERROR",
+    /**
+     * Indicates that the subagent's execution terminated because it exceeded the maximum allowed working time.
+     */
+    TIMEOUT = "TIMEOUT",
+    /**
+     * Indicates that the subagent's execution successfully completed all its defined goals.
+     */
+    GOAL = "GOAL",
+    /**
+     * Indicates that the subagent's execution terminated because it exceeded the maximum number of turns.
+     */
+    MAX_TURNS = "MAX_TURNS"
+}
+/**
+ * Represents the output structure of a subagent's execution.
+ * This interface defines the data that a subagent will return upon completion,
+ * including any emitted variables and the reason for its termination.
+ */
+export interface OutputObject {
+    /**
+     * A record of key-value pairs representing variables emitted by the subagent
+     * during its execution. These variables can be used by the calling agent.
+     */
+    emitted_vars: Record<string, string>;
+    /**
+     * The reason for the subagent's termination, indicating whether it completed
+     * successfully, timed out, or encountered an error.
+     */
+    terminate_reason: SubagentTerminateMode;
+}
+/**
+ * Configures the initial prompt for the subagent.
+ */
+export interface PromptConfig {
+    /**
+     * A single system prompt string that defines the subagent's persona and instructions.
+     * Note: You should use either `systemPrompt` or `initialMessages`, but not both.
+     */
+    systemPrompt?: string;
+    /**
+     * An array of user/model content pairs to seed the chat history for few-shot prompting.
+     * Note: You should use either `systemPrompt` or `initialMessages`, but not both.
+     */
+    initialMessages?: Content[];
+}
+/**
+ * Configures the tools available to the subagent during its execution.
+ */
+export interface ToolConfig {
+    /**
+     * A list of tool names (from the tool registry) or full function declarations
+     * that the subagent is permitted to use.
+     */
+    tools: Array<string | FunctionDeclaration>;
+}
+/**
+ * Configures the expected outputs for the subagent.
+ */
+export interface OutputConfig {
+    /**
+     * A record describing the variables the subagent is expected to emit.
+     * The subagent will be prompted to generate these values before terminating.
+     */
+    outputs: Record<string, string>;
+}
+/**
+ * Configures the generative model parameters for the subagent.
+ * This interface specifies the model to be used and its associated generation settings,
+ * such as temperature and top-p values, which influence the creativity and diversity of the model's output.
+ */
+export interface ModelConfig {
+    /**
+     * The name or identifier of the model to be used (e.g., 'gemini-2.5-pro').
+     *
+     * TODO: In the future, this needs to support 'auto' or some other string to support routing use cases.
+     */
+    model: string;
+    /**
+     * The temperature for the model's sampling process.
+     */
+    temp: number;
+    /**
+     * The top-p value for nucleus sampling.
+     */
+    top_p: number;
+}
+/**
+ * Configures the execution environment and constraints for the subagent.
+ * This interface defines parameters that control the subagent's runtime behavior,
+ * such as maximum execution time, to prevent infinite loops or excessive resource consumption.
+ *
+ * TODO: Consider adding max_tokens as a form of budgeting.
+ */
+export interface RunConfig {
+    /** The maximum execution time for the subagent in minutes. */
+    max_time_minutes: number;
+    /**
+     * The maximum number of conversational turns (a user message + model response)
+     * before the execution is terminated. Helps prevent infinite loops.
+     */
+    max_turns?: number;
+}
+/**
+ * Manages the runtime context state for the subagent.
+ * This class provides a mechanism to store and retrieve key-value pairs
+ * that represent the dynamic state and variables accessible to the subagent
+ * during its execution.
+ */
+export declare class ContextState {
+    private state;
+    /**
+     * Retrieves a value from the context state.
+     *
+     * @param key - The key of the value to retrieve.
+     * @returns The value associated with the key, or undefined if the key is not found.
+     */
+    get(key: string): unknown;
+    /**
+     * Sets a value in the context state.
+     *
+     * @param key - The key to set the value under.
+     * @param value - The value to set.
+     */
+    set(key: string, value: unknown): void;
+    /**
+     * Retrieves all keys in the context state.
+     *
+     * @returns An array of all keys in the context state.
+     */
+    get_keys(): string[];
+}
+/**
+ * Represents the scope and execution environment for a subagent.
+ * This class orchestrates the subagent's lifecycle, managing its chat interactions,
+ * runtime context, and the collection of its outputs.
+ */
+export declare class SubAgentScope {
+    readonly name: string;
+    readonly runtimeContext: Config;
+    private readonly promptConfig;
+    private readonly modelConfig;
+    private readonly runConfig;
+    private readonly toolConfig?;
+    private readonly outputConfig?;
+    output: OutputObject;
+    private readonly subagentId;
+    /**
+     * Constructs a new SubAgentScope instance.
+     * @param name - The name for the subagent, used for logging and identification.
+     * @param runtimeContext - The shared runtime configuration and services.
+     * @param promptConfig - Configuration for the subagent's prompt and behavior.
+     * @param modelConfig - Configuration for the generative model parameters.
+     * @param runConfig - Configuration for the subagent's execution environment.
+     * @param toolConfig - Optional configuration for tools available to the subagent.
+     * @param outputConfig - Optional configuration for the subagent's expected outputs.
+     */
+    private constructor();
+    /**
+     * Creates and validates a new SubAgentScope instance.
+     * This factory method ensures that all tools provided in the prompt configuration
+     * are valid for non-interactive use before creating the subagent instance.
+     * @param {string} name - The name of the subagent.
+     * @param {Config} runtimeContext - The shared runtime configuration and services.
+     * @param {PromptConfig} promptConfig - Configuration for the subagent's prompt and behavior.
+     * @param {ModelConfig} modelConfig - Configuration for the generative model parameters.
+     * @param {RunConfig} runConfig - Configuration for the subagent's execution environment.
+     * @param {ToolConfig} [toolConfig] - Optional configuration for tools.
+     * @param {OutputConfig} [outputConfig] - Optional configuration for expected outputs.
+     * @returns {Promise<SubAgentScope>} A promise that resolves to a valid SubAgentScope instance.
+     * @throws {Error} If any tool requires user confirmation.
+     */
+    static create(name: string, runtimeContext: Config, promptConfig: PromptConfig, modelConfig: ModelConfig, runConfig: RunConfig, toolConfig?: ToolConfig, outputConfig?: OutputConfig): Promise<SubAgentScope>;
+    /**
+     * Runs the subagent in a non-interactive mode.
+     * This method orchestrates the subagent's execution loop, including prompt templating,
+     * tool execution, and termination conditions.
+     * @param {ContextState} context - The current context state containing variables for prompt templating.
+     * @returns {Promise<void>} A promise that resolves when the subagent has completed its execution.
+     */
+    runNonInteractive(context: ContextState): Promise<void>;
+    /**
+     * Processes a list of function calls, executing each one and collecting their responses.
+     * This method iterates through the provided function calls, executes them using the
+     * `executeToolCall` function (or handles `self.emitvalue` internally), and aggregates
+     * their results. It also manages error reporting for failed tool executions.
+     * @param {FunctionCall[]} functionCalls - An array of `FunctionCall` objects to process.
+     * @param {ToolRegistry} toolRegistry - The tool registry to look up and execute tools.
+     * @param {AbortController} abortController - An `AbortController` to signal cancellation of tool executions.
+     * @returns {Promise<Content[]>} A promise that resolves to an array of `Content` parts representing the tool responses,
+     *          which are then used to update the chat history.
+     */
+    private processFunctionCalls;
+    private createChatObject;
+    /**
+     * Returns an array of FunctionDeclaration objects for tools that are local to the subagent's scope.
+     * Currently, this includes the `self.emitvalue` tool for emitting variables.
+     * @returns An array of `FunctionDeclaration` objects.
+     */
+    private getScopeLocalFuncDefs;
+    /**
+     * Builds the system prompt for the chat based on the provided configurations.
+     * It templates the base system prompt and appends instructions for emitting
+     * variables if an `OutputConfig` is provided.
+     * @param {ContextState} context - The context for templating.
+     * @returns {string} The complete system prompt.
+     */
+    private buildChatSystemPrompt;
+}