@machina.ai/cell-cli-core 1.19.4-rc3 → 1.22.5-rc1

package/dist/src/fallback/handler.js

@@ -4,76 +4,80 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { AuthType } from '../core/contentGenerator.js';
-import { DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_MODEL, PREVIEW_GEMINI_MODEL, } from '../config/models.js';
-import { logFlashFallback, FlashFallbackEvent } from '../telemetry/index.js';
-import { coreEvents } from '../utils/events.js';
 import { openBrowserSecurely } from '../utils/secure-browser-launcher.js';
 import { debugLogger } from '../utils/debugLogger.js';
 import { getErrorMessage } from '../utils/errors.js';
-import { ModelNotFoundError } from '../utils/httpErrors.js';
-import { TerminalQuotaError } from '../utils/googleQuotaErrors.js';
+import { classifyFailureKind } from '../availability/errorClassification.js';
+import { buildFallbackPolicyContext, resolvePolicyChain, resolvePolicyAction, applyAvailabilityTransition, } from '../availability/policyHelpers.js';
 const UPGRADE_URL_PAGE = 'https://goo.gle/set-up-gemini-code-assist';
 export async function handleFallback(config, failedModel, authType, error) {
-    // Applicability Checks
-    if (authType !== AuthType.LOGIN_WITH_GOOGLE)
-        return null;
-    // Guardrail: If it's a ModelNotFoundError but NOT the preview model, do not handle it.
-    if (error instanceof ModelNotFoundError &&
-        failedModel !== PREVIEW_GEMINI_MODEL) {
+    return handlePolicyDrivenFallback(config, failedModel, authType, error);
+}
+/**
+ * New fallback logic using the ModelAvailabilityService
+ */
+async function handlePolicyDrivenFallback(config, failedModel, authType, error) {
+    if (authType !== AuthType.LOGIN_WITH_GOOGLE) {
         return null;
     }
-    const shouldActivatePreviewFallback = failedModel === PREVIEW_GEMINI_MODEL &&
-        !(error instanceof TerminalQuotaError);
-    // Preview Model Specific Logic
-    if (shouldActivatePreviewFallback) {
-        // Always set bypass mode for the immediate retry, for non-TerminalQuotaErrors.
-        // This ensures the next attempt uses 2.5 Pro.
-        config.setPreviewModelBypassMode(true);
-        // If we are already in Preview Model fallback mode (user previously said "Always"),
-        // we silently retry (which will use 2.5 Pro due to bypass mode).
-        if (config.isPreviewModelFallbackMode()) {
-            return true;
+    const chain = resolvePolicyChain(config);
+    const { failedPolicy, candidates } = buildFallbackPolicyContext(chain, failedModel);
+    const failureKind = classifyFailureKind(error);
+    const availability = config.getModelAvailabilityService();
+    const getAvailabilityContext = () => {
+        if (!failedPolicy)
+            return undefined;
+        return { service: availability, policy: failedPolicy };
+    };
+    let fallbackModel;
+    if (!candidates.length) {
+        fallbackModel = failedModel;
+    }
+    else {
+        const selection = availability.selectFirstAvailable(candidates.map((policy) => policy.model));
+        const lastResortPolicy = candidates.find((policy) => policy.isLastResort);
+        const selectedFallbackModel = selection.selectedModel ?? lastResortPolicy?.model;
+        const selectedPolicy = candidates.find((policy) => policy.model === selectedFallbackModel);
+        if (!selectedFallbackModel ||
+            selectedFallbackModel === failedModel ||
+            !selectedPolicy) {
+            return null;
+        }
+        fallbackModel = selectedFallbackModel;
+        // failureKind is already declared and calculated above
+        const action = resolvePolicyAction(failureKind, selectedPolicy);
+        if (action === 'silent') {
+            applyAvailabilityTransition(getAvailabilityContext, failureKind);
+            return processIntent(config, 'retry_always', fallbackModel);
         }
+        // This will be used in the future when FallbackRecommendation is passed through UI
+        const recommendation = {
+            ...selection,
+            selectedModel: fallbackModel,
+            action,
+            failureKind,
+            failedPolicy,
+            selectedPolicy,
+        };
+        void recommendation;
     }
-    const fallbackModel = shouldActivatePreviewFallback
-        ? DEFAULT_GEMINI_MODEL
-        : DEFAULT_GEMINI_FLASH_MODEL;
-    // Consult UI Handler for Intent
-    const fallbackModelHandler = config.fallbackModelHandler;
-    if (typeof fallbackModelHandler !== 'function')
+    const handler = config.getFallbackModelHandler();
+    if (typeof handler !== 'function') {
         return null;
+    }
     try {
-        // Pass the specific failed model to the UI handler.
-        const intent = await fallbackModelHandler(failedModel, fallbackModel, error);
-        // Process Intent and Update State
-        switch (intent) {
-            case 'retry_always':
-                // If the error is non-retryable, e.g. TerminalQuota Error, trigger a regular fallback to flash.
-                // For all other errors, activate previewModel fallback.
-                if (shouldActivatePreviewFallback) {
-                    activatePreviewModelFallbackMode(config);
-                }
-                else {
-                    activateFallbackMode(config, authType);
-                }
-                return true; // Signal retryWithBackoff to continue.
-            case 'retry_once':
-                // Just retry this time, do NOT set sticky fallback mode.
-                return true;
-            case 'stop':
-                activateFallbackMode(config, authType);
-                return false;
-            case 'retry_later':
-                return false;
-            case 'upgrade':
-                await handleUpgrade();
-                return false;
-            default:
-                throw new Error(`Unexpected fallback intent received from fallbackModelHandler: "${intent}"`);
+        const intent = await handler(failedModel, fallbackModel, error);
+        // If the user chose to switch/retry, we apply the availability transition
+        // to the failed model (e.g. marking it terminal if it had a quota error).
+        // We DO NOT apply it if the user chose 'stop' or 'retry_later', allowing
+        // them to try again later with the same model state.
+        if (intent === 'retry_always' || intent === 'retry_once') {
+            applyAvailabilityTransition(getAvailabilityContext, failureKind);
         }
+        return await processIntent(config, intent, fallbackModel);
     }
     catch (handlerError) {
-        debugLogger.error('Fallback UI handler failed:', handlerError);
+        debugLogger.error('Fallback handler failed:', handlerError);
         return null;
     }
 }
@@ -85,19 +89,28 @@ async function handleUpgrade() {
         debugLogger.warn('Failed to open browser automatically:', getErrorMessage(error));
     }
 }
-function activateFallbackMode(config, authType) {
-    if (!config.isInFallbackMode()) {
-        config.setFallbackMode(true);
-        coreEvents.emitFallbackModeChanged(true);
-        if (authType) {
-            logFlashFallback(config, new FlashFallbackEvent(authType));
-        }
-    }
-}
-function activatePreviewModelFallbackMode(config) {
-    if (!config.isPreviewModelFallbackMode()) {
-        config.setPreviewModelFallbackMode(true);
-        // We might want a specific event for Preview Model fallback, but for now we just set the mode.
+async function processIntent(config, intent, fallbackModel) {
+    switch (intent) {
+        case 'retry_always':
+            // TODO(telemetry): Implement generic fallback event logging. Existing
+            // logFlashFallback is specific to a single Model.
+            config.setActiveModel(fallbackModel);
+            return true;
+        case 'retry_once':
+            // For distinct retry (retry_once), we do NOT set the active model permanently.
+            // The FallbackStrategy will handle routing to the available model for this turn
+            // based on the availability service state (which is updated before this).
+            return true;
+        case 'stop':
+            // Do not switch model on stop. User wants to stay on current model (and stop).
+            return false;
+        case 'retry_later':
+            return false;
+        case 'upgrade':
+            await handleUpgrade();
+            return false;
+        default:
+            throw new Error(`Unexpected fallback intent received from fallbackModelHandler: "${intent}"`);
     }
 }
 //# sourceMappingURL=handler.js.map

package/dist/src/fallback/handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/fallback/handler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/fallback/handler.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAC7E,OAAO,EACL,0BAA0B,EAC1B,kBAAkB,EAClB,mBAAmB,EACnB,2BAA2B,GAC5B,MAAM,kCAAkC,CAAC;AAE1C,MAAM,gBAAgB,GAAG,2CAA2C,CAAC;AAErE,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,MAAc,EACd,WAAmB,EACnB,QAAiB,EACjB,KAAe;IAEf,OAAO,0BAA0B,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;AAC1E,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,0BAA0B,CACvC,MAAc,EACd,WAAmB,EACnB,QAAiB,EACjB,KAAe;IAEf,IAAI,QAAQ,KAAK,QAAQ,CAAC,iBAAiB,EAAE,CAAC;QAC5C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,KAAK,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;IACzC,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,0BAA0B,CAC7D,KAAK,EACL,WAAW,CACZ,CAAC;IAEF,MAAM,WAAW,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;IAC/C,MAAM,YAAY,GAAG,MAAM,CAAC,2BAA2B,EAAE,CAAC;IAC1D,MAAM,sBAAsB,GAAG,GAAG,EAAE;QAClC,IAAI,CAAC,YAAY;YAAE,OAAO,SAAS,CAAC;QACpC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC;IACzD,CAAC,CAAC;IAEF,IAAI,aAAqB,CAAC;IAC1B,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;QACvB,aAAa,GAAG,WAAW,CAAC;IAC9B,CAAC;SAAM,CAAC;QACN,MAAM,SAAS,GAAG,YAAY,CAAC,oBAAoB,CACjD,UAAU,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CACzC,CAAC;QAEF,MAAM,gBAAgB,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAC1E,MAAM,qBAAqB,GACzB,SAAS,CAAC,aAAa,IAAI,gBAAgB,EAAE,KAAK,CAAC;QACrD,MAAM,cAAc,GAAG,UAAU,CAAC,IAAI,CACpC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,KAAK,qBAAqB,CACnD,CAAC;QAEF,IACE,CAAC,qBAAqB;YACtB,qBAAqB,KAAK,WAAW;YACrC,CAAC,cAAc,EACf,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,aAAa,GAAG,qBAAqB,CAAC;QAEtC,uDAAuD;QACvD,MAAM,MAAM,GAAG,mBAAmB,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;QAEhE,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;YACxB,2BAA2B,CAAC,sBAAsB,EAAE,WAAW,CAAC,CAAC;YACjE,OAAO,aAAa,CAAC,MAAM,EAAE,cAAc,EAAE,aAAa,CAAC,CAAC;QAC9D,CAAC;QAED,mFAAmF;QACnF,MAAM,cAAc,GAA2B;YAC7C,GAAG,SAAS;YACZ,aAAa,EAAE,aAAa;YAC5B,MAAM;YACN,WAAW;YACX,YAAY;YACZ,cAAc;SACf,CAAC;QACF,KAAK,cAAc,CAAC;IACtB,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,CAAC,uBAAuB,EAAE,CAAC;IACjD,IAAI,OAAO,OAAO,KAAK,UAAU,EAAE,CAAC;QAClC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,WAAW,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC;QAEhE,0EAA0E;QAC1E,0EAA0E;QAC1E,yEAAyE;QACzE,qDAAqD;QACrD,IAAI,MAAM,KAAK,cAAc,IAAI,MAAM,KAAK,YAAY,EAAE,CAAC;YACzD,2BAA2B,CAAC,sBAAsB,EAAE,WAAW,CAAC,CAAC;QACnE,CAAC;QAED,OAAO,MAAM,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;IAC5D,CAAC;IAAC,OAAO,YAAY,EAAE,CAAC;QACtB,WAAW,CAAC,KAAK,CAAC,0BAA0B,EAAE,YAAY,CAAC,CAAC;QAC5D,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,KAAK,UAAU,aAAa;IAC1B,IAAI,CAAC;QACH,MAAM,mBAAmB,CAAC,gBAAgB,CAAC,CAAC;IAC9C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,WAAW,CAAC,IAAI,CACd,uCAAuC,EACvC,eAAe,CAAC,KAAK,CAAC,CACvB,CAAC;IACJ,CAAC;AACH,CAAC;AAED,KAAK,UAAU,aAAa,CAC1B,MAAc,EACd,MAA6B,EAC7B,aAAqB;IAErB,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,cAAc;YACjB,sEAAsE;YACtE,kDAAkD;YAClD,MAAM,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;YACrC,OAAO,IAAI,CAAC;QAEd,KAAK,YAAY;YACf,+EAA+E;YAC/E,gFAAgF;YAChF,0EAA0E;YAC1E,OAAO,IAAI,CAAC;QAEd,KAAK,MAAM;YACT,+EAA+E;YAC/E,OAAO,KAAK,CAAC;QAEf,KAAK,aAAa;YAChB,OAAO,KAAK,CAAC;QAEf,KAAK,SAAS;YACZ,MAAM,aAAa,EAAE,CAAC;YACtB,OAAO,KAAK,CAAC;QAEf;YACE,MAAM,IAAI,KAAK,CACb,mEAAmE,MAAM,GAAG,CAC7E,CAAC;IACN,CAAC;AACH,CAAC"}