@machina.ai/cell-cli-core 1.20.2-rc1 → 1.25.0-rc1

package/dist/src/routing/strategies/fallbackStrategy.js

@@ -3,23 +3,31 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { getEffectiveModel } from '../../config/models.js';
+import { selectModelForAvailability } from '../../availability/policyHelpers.js';
+import { resolveModel } from '../../config/models.js';
 export class FallbackStrategy {
     name = 'fallback';
-    async route(_context, config, _baseLlmClient) {
-        const isInFallbackMode = config.isInFallbackMode();
-        if (!isInFallbackMode) {
+    async route(context, config, _baseLlmClient) {
+        const requestedModel = context.requestedModel ?? config.getModel();
+        const resolvedModel = resolveModel(requestedModel, config.getPreviewFeatures());
+        const service = config.getModelAvailabilityService();
+        const snapshot = service.snapshot(resolvedModel);
+        if (snapshot.available) {
             return null;
         }
-        const effectiveModel = getEffectiveModel(isInFallbackMode, config.getModel(), config.getPreviewFeatures());
-        return {
-            model: effectiveModel,
-            metadata: {
-                source: this.name,
-                latencyMs: 0,
-                reasoning: `In fallback mode. Using: ${effectiveModel}`,
-            },
-        };
+        const selection = selectModelForAvailability(config, requestedModel);
+        if (selection?.selectedModel &&
+            selection.selectedModel !== requestedModel) {
+            return {
+                model: selection.selectedModel,
+                metadata: {
+                    source: this.name,
+                    latencyMs: 0,
+                    reasoning: `Model ${requestedModel} is unavailable (${snapshot.reason}). Using fallback: ${selection.selectedModel}`,
+                },
+            };
+        }
+        return null;
     }
 }
 //# sourceMappingURL=fallbackStrategy.js.map

package/dist/src/routing/strategies/fallbackStrategy.js.map

@@ -1 +1 @@
-{"version":3,"file":"fallbackStrategy.js","sourceRoot":"","sources":["../../../../src/routing/strategies/fallbackStrategy.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAQ3D,MAAM,OAAO,gBAAgB;IAClB,IAAI,GAAG,UAAU,CAAC;IAE3B,KAAK,CAAC,KAAK,CACT,QAAwB,EACxB,MAAc,EACd,cAA6B;QAE7B,MAAM,gBAAgB,GAAY,MAAM,CAAC,gBAAgB,EAAE,CAAC;QAE5D,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACtB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,cAAc,GAAG,iBAAiB,CACtC,gBAAgB,EAChB,MAAM,CAAC,QAAQ,EAAE,EACjB,MAAM,CAAC,kBAAkB,EAAE,CAC5B,CAAC;QACF,OAAO;YACL,KAAK,EAAE,cAAc;YACrB,QAAQ,EAAE;gBACR,MAAM,EAAE,IAAI,CAAC,IAAI;gBACjB,SAAS,EAAE,CAAC;gBACZ,SAAS,EAAE,4BAA4B,cAAc,EAAE;aACxD;SACF,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"fallbackStrategy.js","sourceRoot":"","sources":["../../../../src/routing/strategies/fallbackStrategy.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AAEjF,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAQtD,MAAM,OAAO,gBAAgB;IAClB,IAAI,GAAG,UAAU,CAAC;IAE3B,KAAK,CAAC,KAAK,CACT,OAAuB,EACvB,MAAc,EACd,cAA6B;QAE7B,MAAM,cAAc,GAAG,OAAO,CAAC,cAAc,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QACnE,MAAM,aAAa,GAAG,YAAY,CAChC,cAAc,EACd,MAAM,CAAC,kBAAkB,EAAE,CAC5B,CAAC;QACF,MAAM,OAAO,GAAG,MAAM,CAAC,2BAA2B,EAAE,CAAC;QACrD,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QAEjD,IAAI,QAAQ,CAAC,SAAS,EAAE,CAAC;YACvB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,SAAS,GAAG,0BAA0B,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;QAErE,IACE,SAAS,EAAE,aAAa;YACxB,SAAS,CAAC,aAAa,KAAK,cAAc,EAC1C,CAAC;YACD,OAAO;gBACL,KAAK,EAAE,SAAS,CAAC,aAAa;gBAC9B,QAAQ,EAAE;oBACR,MAAM,EAAE,IAAI,CAAC,IAAI;oBACjB,SAAS,EAAE,CAAC;oBACZ,SAAS,EAAE,SAAS,cAAc,oBAAoB,QAAQ,CAAC,MAAM,sBAAsB,SAAS,CAAC,aAAa,EAAE;iBACrH;aACF,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}

package/dist/src/routing/strategies/fallbackStrategy.test.js

@@ -3,57 +3,94 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { describe, it, expect } from 'vitest';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { FallbackStrategy } from './fallbackStrategy.js';
-import { DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_FLASH_LITE_MODEL, } from '../../config/models.js';
+import { DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_MODEL_AUTO, } from '../../config/models.js';
+import { selectModelForAvailability } from '../../availability/policyHelpers.js';
+vi.mock('../../availability/policyHelpers.js', () => ({
+    selectModelForAvailability: vi.fn(),
+}));
+const createMockConfig = (overrides = {}) => ({
+    getModelAvailabilityService: vi.fn(),
+    getModel: vi.fn().mockReturnValue(DEFAULT_GEMINI_MODEL),
+    getPreviewFeatures: vi.fn().mockReturnValue(false),
+    ...overrides,
+});
 describe('FallbackStrategy', () => {
     const strategy = new FallbackStrategy();
     const mockContext = {};
     const mockClient = {};
-    it('should return null when not in fallback mode', async () => {
-        const mockConfig = {
-            isInFallbackMode: () => false,
-            getModel: () => DEFAULT_GEMINI_MODEL,
-            getPreviewFeatures: () => false,
+    let mockService;
+    let mockConfig;
+    beforeEach(() => {
+        vi.resetAllMocks();
+        mockService = {
+            snapshot: vi.fn(),
         };
+        mockConfig = createMockConfig({
+            getModelAvailabilityService: vi.fn().mockReturnValue(mockService),
+        });
+    });
+    it('should return null if the requested model is available', async () => {
+        // Mock snapshot to return available
+        vi.mocked(mockService.snapshot).mockReturnValue({ available: true });
         const decision = await strategy.route(mockContext, mockConfig, mockClient);
         expect(decision).toBeNull();
+        // Should check availability of the resolved model (DEFAULT_GEMINI_MODEL)
+        expect(mockService.snapshot).toHaveBeenCalledWith(DEFAULT_GEMINI_MODEL);
     });
-    describe('when in fallback mode', () => {
-        it('should downgrade a pro model to the flash model', async () => {
-            const mockConfig = {
-                isInFallbackMode: () => true,
-                getModel: () => DEFAULT_GEMINI_MODEL,
-                getPreviewFeatures: () => false,
-            };
-            const decision = await strategy.route(mockContext, mockConfig, mockClient);
-            expect(decision).not.toBeNull();
-            expect(decision?.model).toBe(DEFAULT_GEMINI_FLASH_MODEL);
-            expect(decision?.metadata.source).toBe('fallback');
-            expect(decision?.metadata.reasoning).toContain('In fallback mode');
+    it('should return null if fallback selection is same as requested model', async () => {
+        // Mock snapshot to return unavailable
+        vi.mocked(mockService.snapshot).mockReturnValue({
+            available: false,
+            reason: 'quota',
+        });
+        // Mock selectModelForAvailability to return the SAME model (no fallback found)
+        vi.mocked(selectModelForAvailability).mockReturnValue({
+            selectedModel: DEFAULT_GEMINI_MODEL,
+            skipped: [],
         });
-        it('should honor a lite model request', async () => {
-            const mockConfig = {
-                isInFallbackMode: () => true,
-                getModel: () => DEFAULT_GEMINI_FLASH_LITE_MODEL,
-                getPreviewFeatures: () => false,
-            };
-            const decision = await strategy.route(mockContext, mockConfig, mockClient);
-            expect(decision).not.toBeNull();
-            expect(decision?.model).toBe(DEFAULT_GEMINI_FLASH_LITE_MODEL);
-            expect(decision?.metadata.source).toBe('fallback');
+        const decision = await strategy.route(mockContext, mockConfig, mockClient);
+        expect(decision).toBeNull();
+    });
+    it('should return fallback decision if model is unavailable and fallback found', async () => {
+        // Mock snapshot to return unavailable
+        vi.mocked(mockService.snapshot).mockReturnValue({
+            available: false,
+            reason: 'quota',
         });
-        it('should use the flash model if flash is requested', async () => {
-            const mockConfig = {
-                isInFallbackMode: () => true,
-                getModel: () => DEFAULT_GEMINI_FLASH_MODEL,
-                getPreviewFeatures: () => false,
-            };
-            const decision = await strategy.route(mockContext, mockConfig, mockClient);
-            expect(decision).not.toBeNull();
-            expect(decision?.model).toBe(DEFAULT_GEMINI_FLASH_MODEL);
-            expect(decision?.metadata.source).toBe('fallback');
+        // Mock selectModelForAvailability to find a fallback (Flash)
+        vi.mocked(selectModelForAvailability).mockReturnValue({
+            selectedModel: DEFAULT_GEMINI_FLASH_MODEL,
+            skipped: [{ model: DEFAULT_GEMINI_MODEL, reason: 'quota' }],
         });
+        const decision = await strategy.route(mockContext, mockConfig, mockClient);
+        expect(decision).not.toBeNull();
+        expect(decision?.model).toBe(DEFAULT_GEMINI_FLASH_MODEL);
+        expect(decision?.metadata.source).toBe('fallback');
+        expect(decision?.metadata.reasoning).toContain(`Model ${DEFAULT_GEMINI_MODEL} is unavailable`);
+    });
+    it('should correctly handle "auto" alias by resolving it before checking availability', async () => {
+        // Mock snapshot to return available for the RESOLVED model
+        vi.mocked(mockService.snapshot).mockReturnValue({ available: true });
+        vi.mocked(mockConfig.getModel).mockReturnValue(DEFAULT_GEMINI_MODEL_AUTO);
+        const decision = await strategy.route(mockContext, mockConfig, mockClient);
+        expect(decision).toBeNull();
+        // Important: check that it queried snapshot with the RESOLVED model, not 'auto'
+        expect(mockService.snapshot).toHaveBeenCalledWith(DEFAULT_GEMINI_MODEL);
+    });
+    it('should respect requestedModel from context', async () => {
+        const requestedModel = 'requested-model';
+        const configModel = 'config-model';
+        vi.mocked(mockConfig.getModel).mockReturnValue(configModel);
+        vi.mocked(mockService.snapshot).mockReturnValue({ available: true });
+        const contextWithRequestedModel = {
+            requestedModel,
+        };
+        const decision = await strategy.route(contextWithRequestedModel, mockConfig, mockClient);
+        expect(decision).toBeNull();
+        // Should check availability of the requested model from context
+        expect(mockService.snapshot).toHaveBeenCalledWith(requestedModel);
     });
 });
 //# sourceMappingURL=fallbackStrategy.test.js.map

package/dist/src/routing/strategies/fallbackStrategy.test.js.map

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

package/dist/src/routing/strategies/overrideStrategy.d.ts

@@ -11,5 +11,5 @@ import type { RoutingContext, RoutingDecision, RoutingStrategy } from '../routin
  */
 export declare class OverrideStrategy implements RoutingStrategy {
     readonly name = "override";
-    route(_context: RoutingContext, config: Config, _baseLlmClient: BaseLlmClient): Promise<RoutingDecision | null>;
+    route(context: RoutingContext, config: Config, _baseLlmClient: BaseLlmClient): Promise<RoutingDecision | null>;
 }

package/dist/src/routing/strategies/overrideStrategy.js

@@ -3,17 +3,18 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { DEFAULT_GEMINI_MODEL_AUTO, resolveModel, } from '../../config/models.js';
+import { isAutoModel, resolveModel } from '../../config/models.js';
 /**
  * Handles cases where the user explicitly specifies a model (override).
  */
 export class OverrideStrategy {
     name = 'override';
-    async route(_context, config, _baseLlmClient) {
-        const overrideModel = config.getModel();
+    async route(context, config, _baseLlmClient) {
+        const overrideModel = context.requestedModel ?? config.getModel();
         // If the model is 'auto' we should pass to the next strategy.
-        if (overrideModel === DEFAULT_GEMINI_MODEL_AUTO)
+        if (isAutoModel(overrideModel)) {
             return null;
+        }
         // Return the overridden model name.
         return {
             model: resolveModel(overrideModel, config.getPreviewFeatures()),

package/dist/src/routing/strategies/overrideStrategy.js.map

@@ -1 +1 @@
-{"version":3,"file":"overrideStrategy.js","sourceRoot":"","sources":["../../../../src/routing/strategies/overrideStrategy.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EACL,yBAAyB,EACzB,YAAY,GACb,MAAM,wBAAwB,CAAC;AAQhC;;GAEG;AACH,MAAM,OAAO,gBAAgB;IAClB,IAAI,GAAG,UAAU,CAAC;IAE3B,KAAK,CAAC,KAAK,CACT,QAAwB,EACxB,MAAc,EACd,cAA6B;QAE7B,MAAM,aAAa,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QAExC,8DAA8D;QAC9D,IAAI,aAAa,KAAK,yBAAyB;YAAE,OAAO,IAAI,CAAC;QAE7D,oCAAoC;QACpC,OAAO;YACL,KAAK,EAAE,YAAY,CAAC,aAAa,EAAE,MAAM,CAAC,kBAAkB,EAAE,CAAC;YAC/D,QAAQ,EAAE;gBACR,MAAM,EAAE,IAAI,CAAC,IAAI;gBACjB,SAAS,EAAE,CAAC;gBACZ,SAAS,EAAE,sDAAsD,aAAa,EAAE;aACjF;SACF,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"overrideStrategy.js","sourceRoot":"","sources":["../../../../src/routing/strategies/overrideStrategy.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAQnE;;GAEG;AACH,MAAM,OAAO,gBAAgB;IAClB,IAAI,GAAG,UAAU,CAAC;IAE3B,KAAK,CAAC,KAAK,CACT,OAAuB,EACvB,MAAc,EACd,cAA6B;QAE7B,MAAM,aAAa,GAAG,OAAO,CAAC,cAAc,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QAElE,8DAA8D;QAC9D,IAAI,WAAW,CAAC,aAAa,CAAC,EAAE,CAAC;YAC/B,OAAO,IAAI,CAAC;QACd,CAAC;QAED,oCAAoC;QACpC,OAAO;YACL,KAAK,EAAE,YAAY,CAAC,aAAa,EAAE,MAAM,CAAC,kBAAkB,EAAE,CAAC;YAC/D,QAAQ,EAAE;gBACR,MAAM,EAAE,IAAI,CAAC,IAAI;gBACjB,SAAS,EAAE,CAAC;gBACZ,SAAS,EAAE,sDAAsD,aAAa,EAAE;aACjF;SACF,CAAC;IACJ,CAAC;CACF"}

package/dist/src/routing/strategies/overrideStrategy.test.js

@@ -41,5 +41,19 @@ describe('OverrideStrategy', () => {
         expect(decision).not.toBeNull();
         expect(decision?.model).toBe(overrideModel);
     });
+    it('should respect requestedModel from context', async () => {
+        const requestedModel = 'requested-model';
+        const configModel = 'config-model';
+        const mockConfig = {
+            getModel: () => configModel,
+            getPreviewFeatures: () => false,
+        };
+        const contextWithRequestedModel = {
+            requestedModel,
+        };
+        const decision = await strategy.route(contextWithRequestedModel, mockConfig, mockClient);
+        expect(decision).not.toBeNull();
+        expect(decision?.model).toBe(requestedModel);
+    });
 });
 //# sourceMappingURL=overrideStrategy.test.js.map

package/dist/src/routing/strategies/overrideStrategy.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"overrideStrategy.test.js","sourceRoot":"","sources":["../../../../src/routing/strategies/overrideStrategy.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAIzD,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AAEnE,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAChC,MAAM,QAAQ,GAAG,IAAI,gBAAgB,EAAE,CAAC;IACxC,MAAM,WAAW,GAAG,EAAoB,CAAC;IACzC,MAAM,UAAU,GAAG,EAAmB,CAAC;IAEvC,EAAE,CAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;QAClE,MAAM,UAAU,GAAG;YACjB,QAAQ,EAAE,GAAG,EAAE,CAAC,yBAAyB;YACzC,kBAAkB,EAAE,GAAG,EAAE,CAAC,KAAK;SACtB,CAAC;QAEZ,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,WAAW,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;QAC3E,MAAM,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wEAAwE,EAAE,KAAK,IAAI,EAAE;QACtF,MAAM,aAAa,GAAG,uBAAuB,CAAC;QAC9C,MAAM,UAAU,GAAG;YACjB,QAAQ,EAAE,GAAG,EAAE,CAAC,aAAa;YAC7B,kBAAkB,EAAE,GAAG,EAAE,CAAC,KAAK;SACtB,CAAC;QAEZ,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,WAAW,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;QAE3E,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;QAChC,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC5C,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACnD,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,SAAS,CAC5C,4CAA4C,CAC7C,CAAC;QACF,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IAChE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;QAC5D,MAAM,aAAa,GAAG,+BAA+B,CAAC;QACtD,MAAM,UAAU,GAAG;YACjB,QAAQ,EAAE,GAAG,EAAE,CAAC,aAAa;YAC7B,kBAAkB,EAAE,GAAG,EAAE,CAAC,KAAK;SACtB,CAAC;QAEZ,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,WAAW,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;QAE3E,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;QAChC,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"overrideStrategy.test.js","sourceRoot":"","sources":["../../../../src/routing/strategies/overrideStrategy.test.ts"],"names":[],"mappings":"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"}

package/dist/src/safety/checker-runner.js

@@ -5,6 +5,21 @@
  */
 import { spawn } from 'node:child_process';
 import { SafetyCheckDecision } from './protocol.js';
+import { z } from 'zod';
+const SafetyCheckResultSchema = z.discriminatedUnion('decision', [
+    z.object({
+        decision: z.literal(SafetyCheckDecision.ALLOW),
+        reason: z.string().optional(),
+    }),
+    z.object({
+        decision: z.literal(SafetyCheckDecision.DENY),
+        reason: z.string().min(1),
+    }),
+    z.object({
+        decision: z.literal(SafetyCheckDecision.ASK_USER),
+        reason: z.string().min(1),
+    }),
+]);
 /**
  * Service for executing safety checker processes.
  */
@@ -135,12 +150,8 @@ export class CheckerRunner {
                 }
                 // Try to parse the output
                 try {
-                    const result = JSON.parse(stdout);
-                    // Validate the result structure
-                    if (!result.decision ||
-                        !Object.values(SafetyCheckDecision).includes(result.decision)) {
-                        throw new Error('Invalid result: missing or invalid "decision" field');
-                    }
+                    const rawResult = JSON.parse(stdout);
+                    const result = SafetyCheckResultSchema.parse(rawResult);
                     resolve(result);
                 }
                 catch (parseError) {

package/dist/src/safety/checker-runner.js.map

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

package/dist/src/scheduler/tool-executor.d.ts

@@ -0,0 +1,22 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { Config, AnsiOutput } from '../index.js';
+import type { CompletedToolCall, ToolCall } from './types.js';
+export interface ToolExecutionContext {
+    call: ToolCall;
+    signal: AbortSignal;
+    outputUpdateHandler?: (callId: string, output: string | AnsiOutput) => void;
+    onUpdateToolCall: (updatedCall: ToolCall) => void;
+}
+export declare class ToolExecutor {
+    private readonly config;
+    constructor(config: Config);
+    execute(context: ToolExecutionContext): Promise<CompletedToolCall>;
+    private createCancelledResult;
+    private createSuccessResult;
+    private createErrorResult;
+    private createErrorResponse;
+}

package/dist/src/scheduler/tool-executor.js

@@ -0,0 +1,198 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { ToolErrorType, ToolOutputTruncatedEvent, logToolOutputTruncated, runInDevTraceSpan, } from '../index.js';
+import { SHELL_TOOL_NAME } from '../tools/tool-names.js';
+import { ShellToolInvocation } from '../tools/shell.js';
+import { executeToolWithHooks } from '../core/coreToolHookTriggers.js';
+import { saveTruncatedContent } from '../utils/fileUtils.js';
+import { convertToFunctionResponse } from '../utils/generateContentResponseUtilities.js';
+export class ToolExecutor {
+    config;
+    constructor(config) {
+        this.config = config;
+    }
+    async execute(context) {
+        const { call, signal, outputUpdateHandler, onUpdateToolCall } = context;
+        const { request } = call;
+        const toolName = request.name;
+        const callId = request.callId;
+        if (!('tool' in call) || !call.tool || !('invocation' in call)) {
+            throw new Error(`Cannot execute tool call ${callId}: Tool or Invocation missing.`);
+        }
+        const { tool, invocation } = call;
+        // Setup live output handling
+        const liveOutputCallback = tool.canUpdateOutput && outputUpdateHandler
+            ? (outputChunk) => {
+                outputUpdateHandler(callId, outputChunk);
+            }
+            : undefined;
+        const shellExecutionConfig = this.config.getShellExecutionConfig();
+        const hooksEnabled = this.config.getEnableHooks();
+        const messageBus = this.config.getMessageBus();
+        return runInDevTraceSpan({
+            name: tool.name,
+            attributes: { type: 'tool-call' },
+        }, async ({ metadata: spanMetadata }) => {
+            spanMetadata.input = { request };
+            try {
+                let promise;
+                if (invocation instanceof ShellToolInvocation) {
+                    const setPidCallback = (pid) => {
+                        const executingCall = {
+                            ...call,
+                            status: 'executing',
+                            tool,
+                            invocation,
+                            pid,
+                            startTime: 'startTime' in call ? call.startTime : undefined,
+                        };
+                        onUpdateToolCall(executingCall);
+                    };
+                    promise = executeToolWithHooks(invocation, toolName, signal, messageBus, hooksEnabled, tool, liveOutputCallback, shellExecutionConfig, setPidCallback, this.config);
+                }
+                else {
+                    promise = executeToolWithHooks(invocation, toolName, signal, messageBus, hooksEnabled, tool, liveOutputCallback, shellExecutionConfig, undefined, this.config);
+                }
+                const toolResult = await promise;
+                spanMetadata.output = toolResult;
+                if (signal.aborted) {
+                    return this.createCancelledResult(call, 'User cancelled tool execution.');
+                }
+                else if (toolResult.error === undefined) {
+                    return await this.createSuccessResult(call, toolResult);
+                }
+                else {
+                    return this.createErrorResult(call, new Error(toolResult.error.message), toolResult.error.type);
+                }
+            }
+            catch (executionError) {
+                spanMetadata.error = executionError;
+                if (signal.aborted) {
+                    return this.createCancelledResult(call, 'User cancelled tool execution.');
+                }
+                const error = executionError instanceof Error
+                    ? executionError
+                    : new Error(String(executionError));
+                return this.createErrorResult(call, error, ToolErrorType.UNHANDLED_EXCEPTION);
+            }
+        });
+    }
+    createCancelledResult(call, reason) {
+        const errorMessage = `[Operation Cancelled] ${reason}`;
+        const startTime = 'startTime' in call ? call.startTime : undefined;
+        if (!('tool' in call) || !('invocation' in call)) {
+            // This should effectively never happen in execution phase, but we handle
+            // it safely
+            throw new Error('Cancelled tool call missing tool/invocation references');
+        }
+        return {
+            status: 'cancelled',
+            request: call.request,
+            response: {
+                callId: call.request.callId,
+                responseParts: [
+                    {
+                        functionResponse: {
+                            id: call.request.callId,
+                            name: call.request.name,
+                            response: { error: errorMessage },
+                        },
+                    },
+                ],
+                resultDisplay: undefined,
+                error: undefined,
+                errorType: undefined,
+                contentLength: errorMessage.length,
+            },
+            tool: call.tool,
+            invocation: call.invocation,
+            durationMs: startTime ? Date.now() - startTime : undefined,
+            outcome: call.outcome,
+        };
+    }
+    async createSuccessResult(call, toolResult) {
+        let content = toolResult.llmContent;
+        let outputFile;
+        const toolName = call.request.name;
+        const callId = call.request.callId;
+        if (typeof content === 'string' &&
+            toolName === SHELL_TOOL_NAME &&
+            this.config.getEnableToolOutputTruncation() &&
+            this.config.getTruncateToolOutputThreshold() > 0 &&
+            this.config.getTruncateToolOutputLines() > 0) {
+            const originalContentLength = content.length;
+            const threshold = this.config.getTruncateToolOutputThreshold();
+            const lines = this.config.getTruncateToolOutputLines();
+            const truncatedResult = await saveTruncatedContent(content, callId, this.config.storage.getProjectTempDir(), threshold, lines);
+            content = truncatedResult.content;
+            outputFile = truncatedResult.outputFile;
+            if (outputFile) {
+                logToolOutputTruncated(this.config, new ToolOutputTruncatedEvent(call.request.prompt_id, {
+                    toolName,
+                    originalContentLength,
+                    truncatedContentLength: content.length,
+                    threshold,
+                    lines,
+                }));
+            }
+        }
+        const response = convertToFunctionResponse(toolName, callId, content, this.config.getActiveModel());
+        const successResponse = {
+            callId,
+            responseParts: response,
+            resultDisplay: toolResult.returnDisplay,
+            error: undefined,
+            errorType: undefined,
+            outputFile,
+            contentLength: typeof content === 'string' ? content.length : undefined,
+        };
+        const startTime = 'startTime' in call ? call.startTime : undefined;
+        // Ensure we have tool and invocation
+        if (!('tool' in call) || !('invocation' in call)) {
+            throw new Error('Successful tool call missing tool or invocation');
+        }
+        return {
+            status: 'success',
+            request: call.request,
+            tool: call.tool,
+            response: successResponse,
+            invocation: call.invocation,
+            durationMs: startTime ? Date.now() - startTime : undefined,
+            outcome: call.outcome,
+        };
+    }
+    createErrorResult(call, error, errorType) {
+        const response = this.createErrorResponse(call.request, error, errorType);
+        const startTime = 'startTime' in call ? call.startTime : undefined;
+        return {
+            status: 'error',
+            request: call.request,
+            response,
+            tool: call.tool,
+            durationMs: startTime ? Date.now() - startTime : undefined,
+            outcome: call.outcome,
+        };
+    }
+    createErrorResponse(request, error, errorType) {
+        return {
+            callId: request.callId,
+            error,
+            responseParts: [
+                {
+                    functionResponse: {
+                        id: request.callId,
+                        name: request.name,
+                        response: { error: error.message },
+                    },
+                },
+            ],
+            resultDisplay: error.message,
+            errorType,
+            contentLength: error.message.length,
+        };
+    }
+}
+//# sourceMappingURL=tool-executor.js.map

package/dist/src/scheduler/tool-executor.js.map

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

package/dist/src/scheduler/tool-executor.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};