@google/gemini-cli-a2a-server 0.44.0 → 0.45.0-preview.0

package/dist/a2a-server.mjs

@@ -69002,23 +69002,12 @@ import fs11 from "node:fs";
 import path9 from "node:path";
 import { spawn, spawnSync } from "node:child_process";
 import * as readline from "node:readline";
-function stripHupGuard(command) {
-  const trimmed2 = command.trimStart();
-  const prefix = `${BASH_HUP_GUARD} `;
-  if (trimmed2.startsWith(prefix)) {
-    return trimmed2.slice(prefix.length);
-  }
-  if (trimmed2 === BASH_HUP_GUARD) {
-    return "";
-  }
-  return command;
-}
 async function getCommandName(command, args2) {
   await initializeShellParsers();
   const fullCmd = [command, ...args2].join(" ");
   const stripped = stripShellWrapper(fullCmd);
   const roots = getCommandRoots(stripped).filter((r4) => r4 !== "shopt" && r4 !== "set");
-  if (roots.length === 1) {
+  if (roots.length > 0) {
     return roots[0];
   }
   return path9.basename(command);
@@ -69482,17 +69471,14 @@ function getCommandRoots(command) {
 function stripShellWrapper(command) {
   const pattern = /^\s*(?:(?:(?:\S+\/)?(?:sh|bash|zsh))\s+-c|cmd\.exe\s+\/c|powershell(?:\.exe)?\s+(?:-NoProfile\s+)?-Command|pwsh(?:\.exe)?\s+(?:-NoProfile\s+)?-Command)\s+/i;
   const match2 = command.match(pattern);
-  let result2;
   if (match2) {
     let newCommand = command.substring(match2[0].length).trim();
     if (newCommand.startsWith('"') && newCommand.endsWith('"') || newCommand.startsWith("'") && newCommand.endsWith("'")) {
       newCommand = newCommand.substring(1, newCommand.length - 1);
     }
-    result2 = newCommand;
-  } else {
-    result2 = command.trim();
+    return newCommand;
   }
-  return stripHupGuard(result2);
+  return command.trim();
 }
 async function* execStreaming(command, args2, options) {
   const sandboxManager = options?.sandboxManager ?? new NoopSandboxManager();
@@ -69692,7 +69678,7 @@ function detectPowerShellSubstitution(command) {
   }
   return false;
 }
-var import_shell_quote, BASH_HUP_GUARD, SHELL_TOOL_NAMES, bashLanguage, treeSitterInitialization, treeSitterInitializationError, ShellParserInitializationError, POWERSHELL_COMMAND_ENV, PARSE_TIMEOUT_MICROS, POWERSHELL_PARSER_SCRIPT, REDIRECTION_NAMES, isWindows, spawnAsync, POWERSHELL_KEYWORD_RE;
+var import_shell_quote, SHELL_TOOL_NAMES, bashLanguage, treeSitterInitialization, treeSitterInitializationError, ShellParserInitializationError, POWERSHELL_COMMAND_ENV, PARSE_TIMEOUT_MICROS, POWERSHELL_PARSER_SCRIPT, REDIRECTION_NAMES, isWindows, spawnAsync, POWERSHELL_KEYWORD_RE;
 var init_shell_utils = __esm({
   "packages/core/dist/src/utils/shell-utils.js"() {
     "use strict";
@@ -69701,7 +69687,6 @@ var init_shell_utils = __esm({
     init_fileUtils();
     init_debugLogger();
     init_sandboxManager();
-    BASH_HUP_GUARD = `trap '' HUP;`;
     SHELL_TOOL_NAMES = ["run_shell_command", "ShellTool"];
     bashLanguage = null;
     treeSitterInitialization = null;
@@ -70492,7 +70477,7 @@ async function getCommandName2(req) {
   const fullCmd = [req.command, ...req.args].join(" ");
   const stripped = stripShellWrapper(fullCmd);
   const roots = getCommandRoots(stripped).filter((r4) => r4 !== "shopt" && r4 !== "set");
-  if (roots.length === 1) {
+  if (roots.length > 0) {
     return roots[0];
   }
   return path12.basename(req.command);
@@ -130343,16 +130328,15 @@ var init_types8 = __esm({
 
 // packages/core/dist/src/config/models.js
 function getAutoModelDescription(hasAccessToPreview, useGemini3_1 = false) {
-  const proModel = hasAccessToPreview ? useGemini3_1 ? "gemini-3.1-pro" : "gemini-3-pro" : "gemini-2.5-pro";
-  const flashModel = hasAccessToPreview ? "gemini-3-flash" : "gemini-2.5-flash";
+  const proModel = hasAccessToPreview ? useGemini3_1 ? PREVIEW_GEMINI_3_1_MODEL : PREVIEW_GEMINI_MODEL : DEFAULT_GEMINI_MODEL;
+  const flashModel = hasAccessToPreview ? PREVIEW_GEMINI_FLASH_MODEL : DEFAULT_GEMINI_FLASH_MODEL;
   return `Let Gemini CLI decide the best model for the task: ${proModel}, ${flashModel}`;
 }
-function resolveModel(requestedModel, useGemini3_1 = false, useGemini3_1FlashLite = false, useCustomToolModel = false, hasAccessToPreview = true, config3) {
+function resolveModel(requestedModel, useGemini3_1 = false, useCustomToolModel = false, hasAccessToPreview = true, config3) {
   const normalizedModel = Array.isArray(requestedModel) ? String(requestedModel.at(-1) ?? "").trim() || "" : typeof requestedModel !== "string" ? String(requestedModel ?? "").trim() || "" : requestedModel.trim() || "";
   if (config3?.getExperimentalDynamicModelConfiguration?.() === true) {
     const resolved2 = config3.modelConfigService.resolveModelId(normalizedModel, {
       useGemini3_1,
-      useGemini3_1FlashLite,
       useCustomTools: useCustomToolModel,
       hasAccessToPreview
     });
@@ -130394,7 +130378,7 @@ function resolveModel(requestedModel, useGemini3_1 = false, useGemini3_1FlashLit
       break;
     }
     case GEMINI_MODEL_ALIAS_FLASH_LITE: {
-      resolved = useGemini3_1FlashLite ? PREVIEW_GEMINI_3_1_FLASH_LITE_MODEL : DEFAULT_GEMINI_FLASH_LITE_MODEL;
+      resolved = DEFAULT_GEMINI_FLASH_LITE_MODEL;
       break;
     }
     default: {
@@ -130402,12 +130386,13 @@ function resolveModel(requestedModel, useGemini3_1 = false, useGemini3_1FlashLit
       break;
     }
   }
+  if (resolved === "none") {
+    return DEFAULT_GEMINI_FLASH_LITE_MODEL;
+  }
   if (!hasAccessToPreview && isPreviewModel(resolved)) {
     switch (resolved) {
       case PREVIEW_GEMINI_FLASH_MODEL:
         return DEFAULT_GEMINI_FLASH_MODEL;
-      case PREVIEW_GEMINI_3_1_FLASH_LITE_MODEL:
-        return DEFAULT_GEMINI_FLASH_LITE_MODEL;
       case PREVIEW_GEMINI_MODEL:
       case PREVIEW_GEMINI_3_1_MODEL:
       case PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL:
@@ -130424,11 +130409,10 @@ function resolveModel(requestedModel, useGemini3_1 = false, useGemini3_1FlashLit
   }
   return resolved;
 }
-function resolveClassifierModel(requestedModel, modelAlias, useGemini3_1 = false, useGemini3_1FlashLite = false, useCustomToolModel = false, hasAccessToPreview = true, config3) {
+function resolveClassifierModel(requestedModel, modelAlias, useGemini3_1 = false, useCustomToolModel = false, hasAccessToPreview = true, config3) {
   if (config3?.getExperimentalDynamicModelConfiguration?.() === true) {
     return config3.modelConfigService.resolveClassifierModelId(modelAlias, requestedModel, {
       useGemini3_1,
-      useGemini3_1FlashLite,
       useCustomTools: useCustomToolModel,
       hasAccessToPreview
     });
@@ -130440,9 +130424,9 @@ function resolveClassifierModel(requestedModel, modelAlias, useGemini3_1 = false
     if (requestedModel === PREVIEW_GEMINI_MODEL_AUTO || requestedModel === PREVIEW_GEMINI_MODEL || requestedModel === GEMINI_MODEL_ALIAS_AUTO) {
       return hasAccessToPreview ? PREVIEW_GEMINI_FLASH_MODEL : DEFAULT_GEMINI_FLASH_MODEL;
     }
-    return resolveModel(GEMINI_MODEL_ALIAS_FLASH, false, false, false, hasAccessToPreview);
+    return resolveModel(GEMINI_MODEL_ALIAS_FLASH, false, false, hasAccessToPreview);
   }
-  return resolveModel(requestedModel, useGemini3_1, useGemini3_1FlashLite, useCustomToolModel, hasAccessToPreview);
+  return resolveModel(requestedModel, useGemini3_1, useCustomToolModel, hasAccessToPreview, config3);
 }
 function getDisplayString(model, config3) {
   if (config3?.getExperimentalDynamicModelConfiguration?.() === true) {
@@ -130468,17 +130452,20 @@ function getDisplayString(model, config3) {
       return PREVIEW_GEMINI_FLASH_MODEL;
     case PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL:
       return PREVIEW_GEMINI_3_1_MODEL;
-    case PREVIEW_GEMINI_3_1_FLASH_LITE_MODEL:
-      return PREVIEW_GEMINI_3_1_FLASH_LITE_MODEL;
+    case PREVIEW_GEMINI_FLASH_LITE_MODEL:
+      return PREVIEW_GEMINI_FLASH_LITE_MODEL;
     default:
       return model;
   }
 }
 function isPreviewModel(model, config3) {
+  if (model === "none") {
+    return false;
+  }
   if (config3?.getExperimentalDynamicModelConfiguration?.() === true) {
     return config3.modelConfigService.getModelDefinition(model)?.isPreview === true;
   }
-  return model === PREVIEW_GEMINI_MODEL || model === PREVIEW_GEMINI_3_1_MODEL || model === PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL || model === PREVIEW_GEMINI_FLASH_MODEL || model === PREVIEW_GEMINI_MODEL_AUTO || model === GEMINI_MODEL_ALIAS_AUTO || model === PREVIEW_GEMINI_3_1_FLASH_LITE_MODEL;
+  return model === PREVIEW_GEMINI_MODEL || model === PREVIEW_GEMINI_3_1_MODEL || model === PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL || model === PREVIEW_GEMINI_FLASH_MODEL || model === PREVIEW_GEMINI_MODEL_AUTO || model === GEMINI_MODEL_ALIAS_AUTO || model === PREVIEW_GEMINI_FLASH_LITE_MODEL;
 }
 function isProModel(model, config3) {
   if (config3?.getExperimentalDynamicModelConfiguration?.() === true) {
@@ -130488,7 +130475,7 @@ function isProModel(model, config3) {
 }
 function isGemini3Model(model, config3) {
   if (config3?.getExperimentalDynamicModelConfiguration?.() === true) {
-    const resolved2 = resolveModel(model, false, false, false, true, config3);
+    const resolved2 = resolveModel(model, false, false, true, config3);
     return config3.modelConfigService.getModelDefinition(resolved2)?.family === "gemini-3";
   }
   const resolved = resolveModel(model);
@@ -130499,7 +130486,7 @@ function isGemini2Model(model) {
 }
 function isCustomModel(model, config3) {
   if (config3?.getExperimentalDynamicModelConfiguration?.() === true) {
-    const resolved2 = resolveModel(model, false, false, false, true, config3);
+    const resolved2 = resolveModel(model, false, false, true, config3);
     return config3.modelConfigService.getModelDefinition(resolved2)?.tier === "custom" || !resolved2.startsWith("gemini-");
   }
   const resolved = resolveModel(model);
@@ -130522,7 +130509,7 @@ function supportsMultimodalFunctionResponse(model, config3) {
   }
   return model.startsWith("gemini-3-");
 }
-var PREVIEW_GEMINI_MODEL, PREVIEW_GEMINI_3_1_MODEL, PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL, PREVIEW_GEMINI_FLASH_MODEL, PREVIEW_GEMINI_3_1_FLASH_LITE_MODEL, DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_FLASH_LITE_MODEL, GEMMA_4_31B_IT_MODEL, GEMMA_4_26B_A4B_IT_MODEL, PREVIEW_GEMINI_MODEL_AUTO, DEFAULT_GEMINI_MODEL_AUTO, GEMINI_MODEL_ALIAS_AUTO, GEMINI_MODEL_ALIAS_PRO, GEMINI_MODEL_ALIAS_FLASH, GEMINI_MODEL_ALIAS_FLASH_LITE, DEFAULT_GEMINI_EMBEDDING_MODEL, DEFAULT_THINKING_MODE;
+var PREVIEW_GEMINI_MODEL, PREVIEW_GEMINI_3_1_MODEL, PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL, PREVIEW_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_FLASH_LITE_MODEL, PREVIEW_GEMINI_FLASH_LITE_MODEL, GEMMA_4_31B_IT_MODEL, GEMMA_4_26B_A4B_IT_MODEL, PREVIEW_GEMINI_MODEL_AUTO, DEFAULT_GEMINI_MODEL_AUTO, GEMINI_MODEL_ALIAS_AUTO, GEMINI_MODEL_ALIAS_PRO, GEMINI_MODEL_ALIAS_FLASH, GEMINI_MODEL_ALIAS_FLASH_LITE, DEFAULT_GEMINI_EMBEDDING_MODEL, DEFAULT_THINKING_MODE;
 var init_models = __esm({
   "packages/core/dist/src/config/models.js"() {
     "use strict";
@@ -130530,10 +130517,10 @@ var init_models = __esm({
     PREVIEW_GEMINI_3_1_MODEL = "gemini-3.1-pro-preview";
     PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL = "gemini-3.1-pro-preview-customtools";
     PREVIEW_GEMINI_FLASH_MODEL = "gemini-3-flash-preview";
-    PREVIEW_GEMINI_3_1_FLASH_LITE_MODEL = "gemini-3.1-flash-lite-preview";
     DEFAULT_GEMINI_MODEL = "gemini-2.5-pro";
     DEFAULT_GEMINI_FLASH_MODEL = "gemini-2.5-flash";
-    DEFAULT_GEMINI_FLASH_LITE_MODEL = "gemini-2.5-flash-lite";
+    DEFAULT_GEMINI_FLASH_LITE_MODEL = "gemini-3.1-flash-lite";
+    PREVIEW_GEMINI_FLASH_LITE_MODEL = "none";
     GEMMA_4_31B_IT_MODEL = "gemma-4-31b-it";
     GEMMA_4_26B_A4B_IT_MODEL = "gemma-4-26b-a4b-it";
     PREVIEW_GEMINI_MODEL_AUTO = "auto-gemini-3";
@@ -211651,8 +211638,8 @@ var GIT_COMMIT_INFO, CLI_VERSION;
 var init_git_commit = __esm({
   "packages/core/dist/src/generated/git-commit.js"() {
     "use strict";
-    GIT_COMMIT_INFO = "b82ca5f8d";
-    CLI_VERSION = "0.44.0";
+    GIT_COMMIT_INFO = "5cac7c10f";
+    CLI_VERSION = "0.45.0-preview.0";
   }
 });
 
@@ -332677,7 +332664,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname4);
-    return "0.44.0";
+    return "0.45.0-preview.0";
   })();
   return versionPromise;
 }
@@ -333516,7 +333503,7 @@ var init_errorClassification = __esm({
 function getModelPolicyChain(options) {
   const isAuto = options.isAutoSelection ?? false;
   if (options.previewEnabled) {
-    const proModel = resolveModel(PREVIEW_GEMINI_MODEL, options.useGemini31, options.useGemini31FlashLite, options.useCustomToolModel);
+    const proModel = resolveModel(PREVIEW_GEMINI_MODEL, options.useGemini31, options.useCustomToolModel);
     return [
       definePolicy({
         model: proModel,
@@ -333642,18 +333629,16 @@ function resolvePolicyChain(config3, preferredModel, wrapsAround = false) {
   const configuredModel = normalizeModelId(config3.getModel());
   let chain2;
   const useGemini31 = config3.getGemini31LaunchedSync?.() ?? false;
-  const useGemini31FlashLite = config3.getGemini31FlashLiteLaunchedSync?.() ?? false;
   const useCustomToolModel = config3.getUseCustomToolModelSync?.() ?? false;
   const hasAccessToPreview = config3.getHasAccessToPreviewModel?.() ?? false;
   const isOriginallyGemini3 = isGemini3Model(modelFromConfig, config3);
-  const resolvedModel = normalizeModelId(resolveModel(modelFromConfig, useGemini31, useGemini31FlashLite, useCustomToolModel, hasAccessToPreview, config3));
+  const resolvedModel = normalizeModelId(resolveModel(modelFromConfig, useGemini31, useCustomToolModel, hasAccessToPreview, config3));
   const isAutoPreferred = normalizedPreferredModel ? isAutoModel(normalizedPreferredModel, config3) : false;
   const isAutoConfigured = isAutoModel(configuredModel, config3);
   const effectiveWrapsAround = wrapsAround || isAutoPreferred || isAutoConfigured || isOriginallyGemini3;
   if (config3.getExperimentalDynamicModelConfiguration?.() === true) {
     const context2 = {
       useGemini3_1: useGemini31,
-      useGemini3_1FlashLite: useGemini31FlashLite,
       useCustomTools: useCustomToolModel
     };
     if (resolvedModel === DEFAULT_GEMINI_FLASH_LITE_MODEL) {
@@ -333686,7 +333671,6 @@ function resolvePolicyChain(config3, preferredModel, wrapsAround = false) {
           isAutoSelection,
           userTier: config3.getUserTier(),
           useGemini31,
-          useGemini31FlashLite,
           useCustomToolModel
         });
       } else {
@@ -333695,7 +333679,6 @@ function resolvePolicyChain(config3, preferredModel, wrapsAround = false) {
           isAutoSelection,
           userTier: config3.getUserTier(),
           useGemini31,
-          useGemini31FlashLite,
           useCustomToolModel
         });
       }
@@ -337764,7 +337747,7 @@ async function createContentGenerator(config3, gcConfig, sessionId) {
       return new LoggingContentGenerator(fakeGenerator, gcConfig);
     }
     const version4 = await getVersion();
-    const model = resolveModel(gcConfig.getModel(), config3.authType === AuthType2.USE_GEMINI || config3.authType === AuthType2.USE_VERTEX_AI || (await gcConfig.getGemini31Launched?.() ?? false), config3.authType === AuthType2.USE_GEMINI || config3.authType === AuthType2.USE_VERTEX_AI || (await gcConfig.getGemini31FlashLiteLaunched?.() ?? false), false, gcConfig.getHasAccessToPreviewModel?.() ?? true, gcConfig);
+    const model = resolveModel(gcConfig.getModel(), config3.authType === AuthType2.USE_GEMINI || config3.authType === AuthType2.USE_VERTEX_AI || (await gcConfig.getGemini31Launched?.() ?? false), false, gcConfig.getHasAccessToPreviewModel?.() ?? true, gcConfig);
     const customHeadersEnv = process.env["GEMINI_CLI_CUSTOM_HEADERS"] || void 0;
     const clientName = gcConfig.getClientName();
     const surface = determineSurface2();
@@ -353026,17 +353009,6 @@ function injectUtf8CodepageForPty(command, shell, isWindows2, usingPty) {
   }
   return command;
 }
-function ensureHupIgnored(command, shell) {
-  if (shell !== "bash") {
-    return command;
-  }
-  const trimmed2 = command.trimStart();
-  const prefix = `${BASH_HUP_GUARD} `;
-  if (trimmed2.startsWith(prefix) || trimmed2 === BASH_HUP_GUARD) {
-    return command;
-  }
-  return `${BASH_HUP_GUARD} ${command}`;
-}
 var import_headless2, Terminal, MAX_CHILD_PROCESS_BUFFER_SIZE, GEMINI_CLI_IDENTIFICATION_ENV_VAR, GEMINI_CLI_IDENTIFICATION_ENV_VAR_VALUE, SCROLLBACK_LIMIT, BASH_SHOPT_OPTIONS, BASH_SHOPT_GUARD, findLastContentLine, getFullBufferText, writeBufferToLogStream, ShellExecutionService;
 var init_shellExecutionService = __esm({
   "packages/core/dist/src/services/shellExecutionService.js"() {
@@ -353226,9 +353198,8 @@ ${truncated}`;
           executable = "cmd.exe";
         }
         const resolvedExecutable = resolveExecutable(executable) ?? executable;
-        const promptGuarded = ensurePromptvarsDisabled(commandToExecute, shell);
-        const hupGuarded = !isWindows2 ? ensureHupIgnored(promptGuarded, shell) : promptGuarded;
-        const finalCommand = injectUtf8CodepageForPty(hupGuarded, shell, isWindows2, usingPty);
+        const guardedCommand = ensurePromptvarsDisabled(commandToExecute, shell);
+        const finalCommand = injectUtf8CodepageForPty(guardedCommand, shell, isWindows2, usingPty);
         const spawnArgs = [...argsPrefix, finalCommand];
         const gitConfigKeys = [];
         if (!isInteractive) {
@@ -354006,8 +353977,9 @@ ${truncated}`;
           } catch (e3) {
             const err2 = e3;
             const isEsrch = err2.code === "ESRCH";
+            const isEbadf = err2.code === "EBADF" || err2.message?.includes("EBADF");
             const isWindowsPtyError = err2.message?.includes("Cannot resize a pty that has already exited");
-            if (isEsrch || isWindowsPtyError) {
+            if (isEsrch || isEbadf || isWindowsPtyError) {
             } else {
               throw e3;
             }
@@ -362271,11 +362243,10 @@ var init_geminiChat = __esm({
         const initialActiveModel = this.context.config.getActiveModel();
         const apiCall = async () => {
           const useGemini3_1 = await this.context.config.getGemini31Launched?.() ?? false;
-          const useGemini3_1FlashLite = await this.context.config.getGemini31FlashLiteLaunched?.() ?? false;
           const hasAccessToPreview = this.context.config.getHasAccessToPreviewModel?.() ?? true;
-          let modelToUse = resolveModel(lastModelToUse, useGemini3_1, useGemini3_1FlashLite, false, hasAccessToPreview, this.context.config);
+          let modelToUse = resolveModel(lastModelToUse, useGemini3_1, false, hasAccessToPreview, this.context.config);
           if (this.context.config.getActiveModel() !== initialActiveModel) {
-            modelToUse = resolveModel(this.context.config.getActiveModel(), useGemini3_1, useGemini3_1FlashLite, false, hasAccessToPreview, this.context.config);
+            modelToUse = resolveModel(this.context.config.getActiveModel(), useGemini3_1, false, hasAccessToPreview, this.context.config);
           }
           if (modelToUse !== lastModelToUse) {
             const { generateContentConfig: newConfig } = this.context.config.modelConfigService.getResolvedConfig({
@@ -362314,7 +362285,7 @@ var init_geminiChat = __esm({
               throw new AgentExecutionBlockedError(beforeModelResult.reason || "Model call blocked by hook", syntheticResponse);
             }
             if (beforeModelResult.modifiedModel) {
-              modelToUse = resolveModel(beforeModelResult.modifiedModel, useGemini3_1, useGemini3_1FlashLite, false, hasAccessToPreview, this.context.config);
+              modelToUse = resolveModel(beforeModelResult.modifiedModel, useGemini3_1, false, hasAccessToPreview, this.context.config);
               lastModelToUse = modelToUse;
               contentsToUse = supportsModernFeatures(modelToUse) ? [...contentsForPreviewModel] : [...requestContents];
             }
@@ -364712,7 +364683,7 @@ var init_promptProvider = __esm({
         const isTopicUpdateNarrationEnabled = topicUpdateNarrationOverride ?? context2.config.isTopicUpdateNarrationEnabled();
         const enabledToolNames = new Set(toolNames);
         const approvedPlanPath = context2.config.getApprovedPlanPath();
-        const desiredModel = resolveModel(context2.config.getActiveModel(), context2.config.getGemini31LaunchedSync?.() ?? false, context2.config.getGemini31FlashLiteLaunchedSync?.() ?? false, false, context2.config.getHasAccessToPreviewModel?.() ?? true, context2.config);
+        const desiredModel = resolveModel(context2.config.getActiveModel(), context2.config.getGemini31LaunchedSync?.() ?? false, false, context2.config.getHasAccessToPreviewModel?.() ?? true, context2.config);
         const isModernModel = supportsModernFeatures(desiredModel);
         const activeSnippets = isModernModel ? snippets_exports : snippets_legacy_exports;
         const contextFilenames = getAllGeminiMdFilenames();
@@ -364830,7 +364801,7 @@ var init_promptProvider = __esm({
         return sanitizedPrompt;
       }
       getCompressionPrompt(context2) {
-        const desiredModel = resolveModel(context2.config.getActiveModel(), context2.config.getGemini31LaunchedSync?.() ?? false, context2.config.getGemini31FlashLiteLaunchedSync?.() ?? false, false, context2.config.getHasAccessToPreviewModel?.() ?? true, context2.config);
+        const desiredModel = resolveModel(context2.config.getActiveModel(), context2.config.getGemini31LaunchedSync?.() ?? false, false, context2.config.getHasAccessToPreviewModel?.() ?? true, context2.config);
         const isModernModel = supportsModernFeatures(desiredModel);
         const activeSnippets = isModernModel ? snippets_exports : snippets_legacy_exports;
         return activeSnippets.getCompressionPrompt(context2.config.getApprovedPlanPath());
@@ -365456,14 +365427,16 @@ function modelStringToModelConfigAlias(model) {
       return "chat-compression-3-pro";
     case PREVIEW_GEMINI_FLASH_MODEL:
       return "chat-compression-3-flash";
-    case PREVIEW_GEMINI_3_1_FLASH_LITE_MODEL:
+    case PREVIEW_GEMINI_FLASH_LITE_MODEL:
+    // fallthrough
+    case DEFAULT_GEMINI_FLASH_LITE_MODEL:
       return "chat-compression-3.1-flash-lite";
+    case "gemini-2.5-flash-lite":
+      return "chat-compression-2.5-flash-lite";
     case DEFAULT_GEMINI_MODEL:
       return "chat-compression-2.5-pro";
     case DEFAULT_GEMINI_FLASH_MODEL:
       return "chat-compression-2.5-flash";
-    case DEFAULT_GEMINI_FLASH_LITE_MODEL:
-      return "chat-compression-2.5-flash-lite";
     default:
       return "chat-compression-default";
   }
@@ -374179,7 +374152,6 @@ var init_modelConfigService = __esm({
         const definitions = this.config.modelDefinitions ?? {};
         const shouldShowPreviewModels = context2.hasAccessToPreview ?? false;
         const useGemini31 = context2.useGemini3_1 ?? false;
-        const useGemini31FlashLite = context2.useGemini3_1FlashLite ?? false;
         const mainOptions = Object.entries(definitions).filter(([_3, m3]) => {
           if (m3.isVisible !== true)
             return false;
@@ -374213,14 +374185,11 @@ var init_modelConfigService = __esm({
             return false;
           if (id === PREVIEW_GEMINI_3_1_MODEL && !useGemini31)
             return false;
-          if (id === PREVIEW_GEMINI_3_1_FLASH_LITE_MODEL && !useGemini31FlashLite)
-            return false;
           return true;
         }).map(([id, m3]) => {
           const resolvedId = this.resolveModelId(id, context2);
           const titleId = this.resolveModelId(id, {
-            useGemini3_1: useGemini31,
-            useGemini3_1FlashLite: useGemini31FlashLite
+            useGemini3_1: useGemini31
           });
           return {
             modelId: resolvedId,
@@ -378315,7 +378284,7 @@ function resolveProcessorOptions(config3, id, defaultOptions3) {
   }
   return defaultOptions3;
 }
-var generalistProfile, stressTestProfile;
+var generalistProfile, stressTestProfile, powerUserProfile;
 var init_profiles = __esm({
   "packages/core/dist/src/context/config/profiles.js"() {
     "use strict";
@@ -378428,6 +378397,86 @@ var init_profiles = __esm({
       buildPipelines: generalistProfile.buildPipelines,
       buildAsyncPipelines: generalistProfile.buildAsyncPipelines
     };
+    powerUserProfile = {
+      name: "Power User (Experimental)",
+      sentinels: generalistProfile.sentinels,
+      config: {
+        budget: {
+          retainedTokens: 65e3,
+          normalizedTokens: 1e5,
+          maxTokens: 15e4,
+          coalescingThresholdTokens: 5e3
+        },
+        gcStrategy: "incremental"
+      },
+      buildPipelines: (env, config3) => [
+        {
+          name: "Immediate Sanitization",
+          triggers: ["new_message"],
+          processors: [
+            createToolMaskingProcessor("ToolMasking", env, resolveProcessorOptions(config3, "ToolMasking", {
+              stringLengthThresholdTokens: 8e3
+            })),
+            createBlobDegradationProcessor("BlobDegradation", env),
+            createNodeDistillationProcessor("ImmediateNodeDistillation", env, resolveProcessorOptions(config3, "ImmediateNodeDistillation", {
+              nodeThresholdTokens: 15e3
+            }))
+          ]
+        },
+        {
+          name: "Normalization",
+          triggers: ["retained_exceeded"],
+          processors: [
+            createNodeDistillationProcessor("NodeDistillation", env, resolveProcessorOptions(config3, "NodeDistillation", {
+              nodeThresholdTokens: 3e3
+            })),
+            createNodeTruncationProcessor("NodeTruncation", env, resolveProcessorOptions(config3, "NodeTruncation", {
+              maxTokensPerNode: 4e3
+            }))
+          ]
+        },
+        {
+          name: "Archiving",
+          triggers: ["normalized_exceeded"],
+          processors: [
+            createNodeDistillationProcessor("ArchiveNodeDistillation", env, resolveProcessorOptions(config3, "ArchiveNodeDistillation", {
+              nodeThresholdTokens: 1e3
+            })),
+            createNodeTruncationProcessor("ArchiveNodeTruncation", env, resolveProcessorOptions(config3, "ArchiveNodeTruncation", {
+              maxTokensPerNode: 1500
+            }))
+          ]
+        },
+        {
+          name: "Emergency Backstop",
+          triggers: ["gc_backstop"],
+          processors: [
+            createStateSnapshotProcessor("StateSnapshotSync", env, resolveProcessorOptions(config3, "StateSnapshotSync", {
+              target: "max",
+              maxStateTokens: 2e3,
+              maxSummaryTurns: 10
+            })),
+            // If we STILL exceed max tokens, aggressively truncate
+            createNodeTruncationProcessor("EmergencyNodeTruncation", env, resolveProcessorOptions(config3, "EmergencyNodeTruncation", {
+              maxTokensPerNode: 500
+            }))
+          ]
+        }
+      ],
+      buildAsyncPipelines: (env, config3) => [
+        {
+          name: "Async Background GC",
+          triggers: ["nodes_aged_out"],
+          processors: [
+            createStateSnapshotAsyncProcessor("StateSnapshotAsync", env, resolveProcessorOptions(config3, "StateSnapshotAsync", {
+              type: "accumulate",
+              maxStateTokens: 4e3,
+              maxSummaryTurns: 5
+            }))
+          ]
+        }
+      ]
+    };
   }
 });
 
@@ -378509,6 +378558,9 @@ async function loadContextManagementConfig(sidecarPath, registry2) {
   if (sidecarPath === "stressTestProfile") {
     return stressTestProfile;
   }
+  if (sidecarPath === "powerUserProfile") {
+    return powerUserProfile;
+  }
   if (sidecarPath === "generalistProfile") {
     return generalistProfile;
   }
@@ -378638,6 +378690,12 @@ var init_eventBus = __esm({
       onConsolidationNeeded(listener) {
         this.on("BUDGET_RETAINED_CROSSED", listener);
       }
+      emitNormalizeNeeded(event) {
+        this.emit("BUDGET_NORMALIZED_CROSSED", event);
+      }
+      onNormalizeNeeded(listener) {
+        this.on("BUDGET_NORMALIZED_CROSSED", listener);
+      }
       emitProcessorResult(event) {
         this.emit("PROCESSOR_RESULT", event);
       }
@@ -378792,13 +378850,13 @@ var init_toGraph = __esm({
           const msg = turn.content;
           if (!msg.parts)
             continue;
-          const turnSalt = turn.id;
+          const hasEnvHeader = msg.parts?.some((p3) => isTextPart2(p3) && p3.text.trim().startsWith("<session_context>"));
+          const turnSalt = hasEnvHeader && turnIdx === 0 ? deriveStableId(["environment-context"]) : turn.id;
           const turnId = turnSalt.startsWith("turn_") ? turnSalt : `turn_${turnSalt}`;
           if (msg.role === "user") {
             for (let partIdx = 0; partIdx < msg.parts.length; partIdx++) {
               const part = msg.parts[partIdx];
-              const envTurnId = deriveStableId(["environment-context"]);
-              if (isTextPart2(part) && part.text.trim().startsWith("<session_context>") && turnSalt !== envTurnId) {
+              if (isTextPart2(part) && part.text.trim().startsWith("<session_context>") && turnIdx > 0) {
                 debugLogger.log("[ContextGraphBuilder] Skipping legacy environment header turn from graph.");
                 continue;
               }
@@ -379242,13 +379300,13 @@ var init_orchestrator = __esm({
       isNodeAllowed(node, triggerTargets, protectedTurnIds = /* @__PURE__ */ new Set()) {
         return triggerTargets.has(node.id) && !protectedTurnIds.has(node.id) && !protectedTurnIds.has(node.turnId);
       }
-      async executeTriggerSync(trigger, nodes, triggerTargets, protectedTurnIds = /* @__PURE__ */ new Set()) {
+      async executeTriggerSync(trigger, buffer, triggerTargets, protectedTurnIds = /* @__PURE__ */ new Set()) {
         this.tracer.logEvent("Orchestrator", "Strategy Intent", {
           trigger,
-          totalNodes: nodes.length,
+          totalNodes: buffer.nodes.length,
           targetNodes: triggerTargets.size
         });
-        let currentBuffer = ContextWorkingBufferImpl.initialize(nodes);
+        let currentBuffer = buffer;
         const triggerPipelines = this.pipelines.filter((p3) => p3.triggers.includes(trigger));
         const inboxSnapshot = new InboxSnapshotImpl(this.env.inbox.getMessages() || []);
         for (const pipeline3 of triggerPipelines) {
@@ -379283,7 +379341,7 @@ var init_orchestrator = __esm({
         }
         void this.executeTriggerAsync(trigger, currentBuffer.nodes, triggerTargets);
         this.env.inbox.drainConsumed(inboxSnapshot.getConsumedIds());
-        return currentBuffer.nodes;
+        return currentBuffer;
       }
       async executeTriggerAsync(trigger, nodes, triggerTargets) {
         const asyncPipelines = this.asyncPipelines.filter((p3) => p3.triggers.includes(trigger));
@@ -379455,7 +379513,15 @@ async function render2(nodes, orchestrator, sidecar, tracer, env, advancedTokenC
     const nodeTokens = env.tokenCalculator.calculateConcreteListTokens([node]);
     rollingTokens += nodeTokens;
     if (priorTokens > sidecar.config.budget.retainedTokens) {
-      agedOutNodes.add(node.id);
+      if (sidecar.config.gcStrategy === "incremental") {
+        if (priorTokens > maxTokens) {
+          agedOutNodes.add(node.id);
+        } else if (rollingTokens > maxTokens) {
+          agedOutNodes.add(node.id);
+        }
+      } else {
+        agedOutNodes.add(node.id);
+      }
     }
   }
   if (lateBindPrompt && lastTurnId) {
@@ -379465,7 +379531,8 @@ async function render2(nodes, orchestrator, sidecar, tracer, env, advancedTokenC
       }
     }
   }
-  const processedNodes = await orchestrator.executeTriggerSync("gc_backstop", nodes, agedOutNodes, protectedIds);
+  const processedBuffer = await orchestrator.executeTriggerSync("gc_backstop", ContextWorkingBufferImpl.initialize(nodes), agedOutNodes, protectedIds);
+  const processedNodes = processedBuffer.nodes;
   const skipList = /* @__PURE__ */ new Set();
   for (const node of processedNodes) {
     if (node.abstractsIds) {
@@ -379501,6 +379568,7 @@ var init_render = __esm({
     "use strict";
     init_debugLogger();
     init_tokenCalibration();
+    init_contextWorkingBuffer();
   }
 });
 
@@ -379561,6 +379629,7 @@ var init_contextManager = __esm({
       evaluatedNodeIds = /* @__PURE__ */ new Set();
       // Hysteresis tracking to prevent utility call churn
       lastTriggeredDeficit = 0;
+      lastTriggeredNormalizeDeficit = 0;
       // Cache for Anomaly 3 (Redundant Renders)
       lastRenderCache;
       hasPerformedHotStart = false;
@@ -379575,107 +379644,14 @@ var init_contextManager = __esm({
         this.orchestrator = orchestrator;
         this.orchestrator.setNodeProvider(() => this.buffer.nodes);
         this.eventBus.onProcessorResult((event) => {
-          const currentIds = new Set(this.buffer.nodes.map((n2) => n2.id));
-          const allTargetsPresent = event.targets.every((t4) => currentIds.has(t4.id));
-          if (!allTargetsPresent) {
-            debugLogger.log(`[ContextManager] Dropping stale processor result from ${event.processorId}. One or more targets were already removed.`);
+          const bufferIds = new Set(this.buffer.nodes.map((n2) => n2.id));
+          if (!event.targets.every((t4) => bufferIds.has(t4.id))) {
+            debugLogger.warn(`[ContextManager] Dropping processor result from ${event.processorId}: targets no longer in buffer.`);
             return;
           }
           this.buffer = this.buffer.applyProcessorResult(event.processorId, event.targets, event.returnedNodes);
         });
       }
-      /**
-       * Returns a promise that resolves when all currently executing async pipelines have finished.
-       */
-      async waitForPipelines() {
-        return this.orchestrator.waitForPipelines();
-      }
-      /**
-       * Safely stops background async pipelines and clears event listeners.
-       */
-      shutdown() {
-        this.orchestrator.shutdown();
-      }
-      /**
-       * Evaluates if the current working buffer exceeds configured budget thresholds,
-       * firing consolidation events if necessary.
-       */
-      async evaluateTriggers(newNodes) {
-        if (!this.sidecar.config.budget)
-          return;
-        if (newNodes.size > 0) {
-          await this.orchestrator.executeTriggerSync("new_message", this.buffer.nodes, newNodes);
-        }
-        const currentTokens = this.env.tokenCalculator.calculateConcreteListTokens(this.buffer.nodes);
-        if (currentTokens > this.sidecar.config.budget.retainedTokens) {
-          const agedOutNodes = /* @__PURE__ */ new Set();
-          let rollingTokens = 0;
-          const protectedIds = this.getProtectedNodeIds(this.buffer.nodes);
-          for (let i4 = this.buffer.nodes.length - 1; i4 >= 0; i4--) {
-            const node = this.buffer.nodes[i4];
-            const priorTokens = rollingTokens;
-            rollingTokens += this.env.tokenCalculator.calculateConcreteListTokens([
-              node
-            ]);
-            if (priorTokens > this.sidecar.config.budget.retainedTokens) {
-              if (!protectedIds.has(node.id)) {
-                agedOutNodes.add(node.id);
-              }
-            }
-          }
-          if (agedOutNodes.size > 0) {
-            const targetDeficit = currentTokens - this.sidecar.config.budget.retainedTokens;
-            if (targetDeficit < this.lastTriggeredDeficit) {
-              this.lastTriggeredDeficit = targetDeficit;
-            }
-            const threshold = this.sidecar.config.budget.coalescingThresholdTokens || 0;
-            const growthSinceLast = targetDeficit - this.lastTriggeredDeficit;
-            if (targetDeficit >= threshold && (growthSinceLast >= threshold || this.lastTriggeredDeficit === 0)) {
-              this.lastTriggeredDeficit = targetDeficit;
-              this.env.tokenCalculator.garbageCollectCache(new Set(this.buffer.nodes.map((n2) => n2.id)));
-              await this.orchestrator.executeTriggerSync("nodes_aged_out", this.buffer.nodes, agedOutNodes, new Set(protectedIds.keys()));
-            }
-          } else {
-            this.lastTriggeredDeficit = 0;
-          }
-        }
-      }
-      getProtectedNodeIds(nodes, extraProtectedIds = /* @__PURE__ */ new Set()) {
-        const protectionMap = /* @__PURE__ */ new Map();
-        if (nodes.length === 0)
-          return protectionMap;
-        const lastNode = nodes[nodes.length - 1];
-        const lastTurnId = lastNode.turnId;
-        const envTurnId = `turn_${deriveStableId(["environment-context"])}`;
-        for (const node of nodes) {
-          if (node.turnId === lastTurnId) {
-            protectionMap.set(node.id, "recent_turn");
-          } else if (node.turnId === envTurnId) {
-            protectionMap.set(node.id, "environment_context");
-          }
-        }
-        for (const id of extraProtectedIds) {
-          protectionMap.set(id, "external_active_task");
-        }
-        return protectionMap;
-      }
-      getPristineGraph() {
-        const pristineSet = /* @__PURE__ */ new Map();
-        for (const node of this.buffer.nodes) {
-          const roots = this.buffer.getPristineNodes(node.id);
-          for (const root of roots) {
-            pristineSet.set(root.id, root);
-          }
-        }
-        return Array.from(pristineSet.values()).sort((a, b3) => a.timestamp - b3.timestamp);
-      }
-      getNodes() {
-        return [...this.buffer.nodes];
-      }
-      /**
-       * Generates a virtual view of the pristine graph, substituting in variants
-       * up to the configured token budget.
-       */
       async renderHistory(pendingRequest, activeTaskIds = /* @__PURE__ */ new Set(), abortSignal) {
         this.tracer.logEvent("ContextManager", "Starting rendering of LLM context");
         const currentHistory = this.chatHistory.get();
@@ -379690,11 +379666,12 @@ var init_contextManager = __esm({
         }
         let previewNodes = [];
         if (pendingRequest) {
-          previewNodes = this.env.graphMapper.sync([pendingRequest]);
-          const previewNodeIds2 = new Set(previewNodes.map((n2) => n2.id));
-          previewNodes = await this.orchestrator.executeTriggerSync("new_message", previewNodes, previewNodeIds2);
+          const syncedNodes = this.env.graphMapper.sync([pendingRequest]);
+          const previewNodeIds2 = new Set(syncedNodes.map((n2) => n2.id));
+          const previewBuffer = ContextWorkingBufferImpl.initialize(syncedNodes);
+          const processedPreviewBuffer = await this.orchestrator.executeTriggerSync("new_message", previewBuffer, previewNodeIds2);
+          previewNodes = processedPreviewBuffer.nodes;
         }
-        await this.evaluateTriggers(newPrimalNodes);
         const hotStartPromise = (async () => {
           if (!this.hasPerformedHotStart) {
             this.hasPerformedHotStart = true;
@@ -379708,17 +379685,20 @@ var init_contextManager = __esm({
         let nodes = this.buffer.nodes;
         const previewNodeIds = /* @__PURE__ */ new Set();
         if (previewNodes.length > 0) {
-          for (const n2 of previewNodes) {
-            previewNodeIds.add(n2.id);
-          }
           nodes = [...nodes, ...previewNodes];
+          for (const node of previewNodes) {
+            previewNodeIds.add(node.id);
+          }
         }
+        await this.evaluateTriggers(nodes, newPrimalNodes, activeTaskIds);
+        nodes = [...this.buffer.nodes, ...previewNodes];
         const header = this.headerProvider ? await this.headerProvider() : void 0;
-        const graphHash = nodes.map((n2) => n2.id).join("|");
-        const headerHash = header ? JSON.stringify(header.parts) : "no-header";
-        const totalHash = `${graphHash}::${headerHash}`;
-        if (this.lastRenderCache?.nodesHash === totalHash) {
-          debugLogger.log("[ContextManager] Render cache hit. Skipping redundant render.");
+        const nodesHash = deriveStableId([
+          ...nodes.map((n2) => n2.id),
+          header ? JSON.stringify(header.parts) : "no-header"
+        ]);
+        if (this.lastRenderCache?.nodesHash === nodesHash) {
+          this.tracer.logEvent("ContextManager", "Render Cache Hit", { nodesHash });
           return this.lastRenderCache.result;
         }
         const protectionReasons = this.getProtectedNodeIds(nodes, activeTaskIds);
@@ -379729,41 +379709,168 @@ var init_contextManager = __esm({
         });
         const { history: renderedHistory, pendingHistory, didApplyManagement, baseUnits, processedNodes } = renderResult;
         if (didApplyManagement) {
-          this.buffer = this.buffer.applyProcessorResult("sync_backstop", this.buffer.nodes, processedNodes.filter((n2) => !previewNodeIds.has(n2.id)));
+          const masterIdsInResult = new Set(this.buffer.nodes.map((n2) => n2.id));
+          const processedMasterNodes = processedNodes.filter((n2) => !previewNodeIds.has(n2.id) || masterIdsInResult.has(n2.id));
+          this.buffer = this.buffer.applyProcessorResult("sync_backstop", this.buffer.nodes, processedMasterNodes);
         }
         checkContextInvariants(this.buffer.nodes, "RenderHistory");
-        this.tracer.logEvent("ContextManager", "Finished rendering");
-        const allHistory = [...renderedHistory, ...pendingHistory];
-        const hardenedAllHistory = hardenHistory(allHistory, {
+        const fullHistoryToHarden = [...renderedHistory, ...pendingHistory];
+        const hardenedFullHistory = hardenHistory(fullHistoryToHarden, {
           sentinels: this.sidecar.sentinels
         });
-        const firstPendingId = pendingHistory[0]?.id;
-        let splitIndex = renderedHistory.length;
-        if (firstPendingId) {
-          const foundIndex = hardenedAllHistory.findIndex((h3) => h3.id === firstPendingId);
-          if (foundIndex !== -1) {
-            splitIndex = foundIndex;
+        const envContextId = deriveStableId(["environment-context"]);
+        const pendingIds = new Set(pendingHistory.map((t4) => t4.id));
+        const resultHistory = [];
+        const resultPending = [];
+        let foundPending = false;
+        for (const turn of hardenedFullHistory) {
+          if (!foundPending && (pendingIds.has(turn.id) || turn.id.startsWith("turn_") && pendingIds.has(turn.id.substring(5))) && turn.id !== envContextId && turn.id !== `turn_${envContextId}`) {
+            foundPending = true;
+          }
+          if (foundPending) {
+            resultPending.push(turn);
+          } else {
+            resultHistory.push(turn);
           }
         }
-        const apiHistory = hardenedAllHistory.slice(0, splitIndex).map((h3) => h3.content);
-        const pendingApiHistory = hardenedAllHistory.slice(splitIndex).map((h3) => h3.content);
-        if (header) {
-          apiHistory.unshift(header);
-        }
         const result2 = {
           history: renderedHistory,
-          apiHistory,
-          pendingApiHistory,
+          apiHistory: resultHistory.map((h3) => h3.content),
+          pendingApiHistory: resultPending.map((h3) => h3.content),
           didApplyManagement,
           baseUnits,
           processedNodes
         };
-        this.lastRenderCache = {
-          nodesHash: totalHash,
-          result: result2
-        };
+        if (header) {
+          result2.apiHistory.unshift(header);
+        }
+        this.lastRenderCache = { nodesHash, result: result2 };
+        this.tracer.logEvent("ContextManager", "Rendering Complete", {
+          historySize: renderedHistory.length,
+          pendingSize: pendingHistory.length,
+          didApplyManagement
+        });
         return result2;
       }
+      async waitForPipelines() {
+        await this.orchestrator.waitForPipelines();
+      }
+      shutdown() {
+        this.orchestrator.shutdown();
+      }
+      getNodes() {
+        return this.buffer.nodes;
+      }
+      getEnvironment() {
+        return this.env;
+      }
+      getPristineGraph() {
+        const pristineSet = /* @__PURE__ */ new Map();
+        for (const node of this.buffer.nodes) {
+          const roots = this.buffer.getPristineNodes(node.id);
+          for (const root of roots) {
+            pristineSet.set(root.id, root);
+          }
+        }
+        return Array.from(pristineSet.values()).sort((a, b3) => a.timestamp - b3.timestamp);
+      }
+      async evaluateTriggers(nodes, newPrimalNodes, activeTaskIds) {
+        if (newPrimalNodes.size > 0) {
+          this.buffer = await this.orchestrator.executeTriggerSync("nodes_added", this.buffer, newPrimalNodes);
+        }
+        const bufferIds = new Set(this.buffer.nodes.map((n2) => n2.id));
+        const previewNodes = nodes.filter((n2) => !bufferIds.has(n2.id));
+        const currentNodes = [...this.buffer.nodes, ...previewNodes];
+        const currentTokens = this.env.tokenCalculator.calculateConcreteListTokens(currentNodes);
+        if (currentTokens > this.sidecar.config.budget.retainedTokens) {
+          const agedOutRetainedNodes = /* @__PURE__ */ new Set();
+          const agedOutNormalizedNodes = /* @__PURE__ */ new Set();
+          const protectionMap = this.getProtectedNodeIds(currentNodes, activeTaskIds);
+          const protectedIds = new Set(protectionMap.keys());
+          const envTurnId = `turn_${deriveStableId(["environment-context"])}`;
+          const turn0Nodes = currentNodes.filter((n2) => n2.turnId === envTurnId);
+          for (const n2 of turn0Nodes) {
+            protectedIds.add(n2.id);
+          }
+          let rollingTokens = 0;
+          for (let i4 = currentNodes.length - 1; i4 >= 0; i4--) {
+            const node = currentNodes[i4];
+            const priorTokens = rollingTokens;
+            rollingTokens += this.env.tokenCalculator.calculateConcreteListTokens([
+              node
+            ]);
+            if (priorTokens > this.sidecar.config.budget.retainedTokens) {
+              if (!protectedIds.has(node.id)) {
+                const hasNormalizedTier = this.sidecar.config.budget.normalizedTokens !== void 0;
+                if (!hasNormalizedTier || priorTokens <= this.sidecar.config.budget.normalizedTokens) {
+                  agedOutRetainedNodes.add(node.id);
+                }
+                if (hasNormalizedTier && priorTokens > this.sidecar.config.budget.normalizedTokens) {
+                  agedOutNormalizedNodes.add(node.id);
+                }
+              }
+            }
+          }
+          if (agedOutRetainedNodes.size > 0) {
+            const targetDeficit = currentTokens - this.sidecar.config.budget.retainedTokens;
+            const threshold = this.sidecar.config.budget.coalescingThresholdTokens || 0;
+            if (targetDeficit < this.lastTriggeredDeficit) {
+              this.lastTriggeredDeficit = targetDeficit;
+            }
+            if (targetDeficit > this.lastTriggeredDeficit + threshold) {
+              this.lastTriggeredDeficit = targetDeficit;
+              this.eventBus.emitConsolidationNeeded({
+                nodes: this.buffer.nodes,
+                targetDeficit,
+                targetNodeIds: agedOutRetainedNodes
+              });
+              this.env.tokenCalculator.garbageCollectCache(new Set(this.buffer.nodes.map((n2) => n2.id)));
+              this.buffer = await this.orchestrator.executeTriggerSync("nodes_aged_out", this.buffer, agedOutRetainedNodes, protectedIds);
+            }
+          } else {
+            this.lastTriggeredDeficit = 0;
+          }
+          if (agedOutNormalizedNodes.size > 0) {
+            const targetDeficit = currentTokens - this.sidecar.config.budget.normalizedTokens;
+            const threshold = this.sidecar.config.budget.coalescingThresholdTokens || 0;
+            if (targetDeficit < this.lastTriggeredNormalizeDeficit) {
+              this.lastTriggeredNormalizeDeficit = targetDeficit;
+            }
+            if (targetDeficit > this.lastTriggeredNormalizeDeficit + threshold) {
+              this.lastTriggeredNormalizeDeficit = targetDeficit;
+              this.eventBus.emitNormalizeNeeded({
+                nodes: this.buffer.nodes,
+                targetDeficit,
+                targetNodeIds: agedOutNormalizedNodes
+              });
+              this.buffer = await this.orchestrator.executeTriggerSync("normalized_exceeded", this.buffer, agedOutNormalizedNodes, protectedIds);
+            }
+          } else {
+            this.lastTriggeredNormalizeDeficit = 0;
+          }
+        }
+      }
+      getProtectedNodeIds(nodes, extraProtectedIds = /* @__PURE__ */ new Set()) {
+        const protectionMap = /* @__PURE__ */ new Map();
+        if (nodes.length === 0)
+          return protectionMap;
+        const lastNode = nodes[nodes.length - 1];
+        const lastTurnId = lastNode.turnId;
+        const envContextId = deriveStableId(["environment-context"]);
+        const envContextTurnId = `turn_${envContextId}`;
+        for (const node of nodes) {
+          if (node.turnId === envContextTurnId || node.turnId === envContextId) {
+            protectionMap.set(node.id, "environment_context");
+          }
+          if (node.turnId === lastTurnId) {
+            protectionMap.set(node.id, "recent_turn");
+          }
+        }
+        for (const id of extraProtectedIds) {
+          protectionMap.set(id, "external_active_task");
+        }
+        return protectionMap;
+      }
       async performHotStartCalibration(nodes, abortSignal) {
         const history = this.env.graphMapper.fromGraph(nodes);
         const contents = history.map((h3) => h3.content);
@@ -379783,9 +379890,6 @@ var init_contextManager = __esm({
           debugLogger.warn("[ContextManager] Hot start calibration failed", e3);
         }
       }
-      getEnvironment() {
-        return this.env;
-      }
     };
   }
 });
@@ -380686,7 +380790,7 @@ var init_client4 = __esm({
         if (this.currentSequenceModel) {
           return this.currentSequenceModel;
         }
-        return resolveModel(this.config.getActiveModel(), this.config.getGemini31LaunchedSync?.() ?? false, this.config.getGemini31FlashLiteLaunchedSync?.() ?? false, false, this.config.getHasAccessToPreviewModel?.() ?? true, this.config);
+        return resolveModel(this.config.getActiveModel(), this.config.getGemini31LaunchedSync?.() ?? false, false, this.config.getHasAccessToPreviewModel?.() ?? true, this.config);
       }
       async *processTurn(request, signal, prompt_id, boundedTurns, displayContent) {
         let turn = new Turn(this.getChat(), prompt_id);
@@ -381919,6 +382023,9 @@ var init_scheduler = __esm({
         return false;
       }
       _isParallelizable(request) {
+        if (request.name === UPDATE_TOPIC_TOOL_NAME) {
+          return false;
+        }
         if (request.args) {
           const wait = request.args["wait_for_previous"];
           if (typeof wait === "boolean") {
@@ -394580,13 +394687,12 @@ ${formattedHistory}
           const routerResponse = ClassifierResponseSchema.parse(jsonResponse);
           const reasoning = routerResponse.reasoning;
           const latencyMs = Date.now() - startTime;
-          const [useGemini3_1, useGemini3_1FlashLite, useCustomToolModel, hasAccessToPreview] = await Promise.all([
+          const [useGemini3_1, useCustomToolModel, hasAccessToPreview] = await Promise.all([
             config3.getGemini31Launched(),
-            config3.getGemini31FlashLiteLaunched(),
             config3.getUseCustomToolModel(),
-            config3.getHasAccessToPreviewModel?.() ?? true
+            config3.getHasAccessToPreviewModel()
           ]);
-          const selectedModel = resolveClassifierModel(context2.requestedModel ?? config3.getModel(), routerResponse.model_choice, useGemini3_1, useGemini3_1FlashLite, useCustomToolModel, hasAccessToPreview, config3);
+          const selectedModel = resolveClassifierModel(context2.requestedModel ?? config3.getModel(), routerResponse.model_choice, useGemini3_1, useCustomToolModel, hasAccessToPreview, config3);
           return {
             model: selectedModel,
             metadata: {
@@ -394613,7 +394719,7 @@ var init_defaultStrategy = __esm({
     DefaultStrategy = class {
       name = "default";
       async route(_context, config3, _baseLlmClient, _localLiteRtLmClient) {
-        const defaultModel = resolveModel(config3.getModel(), config3.getGemini31LaunchedSync?.() ?? false, config3.getGemini31FlashLiteLaunchedSync?.() ?? false, false, config3.getHasAccessToPreviewModel?.() ?? true, config3);
+        const defaultModel = resolveModel(config3.getModel(), config3.getGemini31LaunchedSync?.() ?? false, false, config3.getHasAccessToPreviewModel?.() ?? true, config3);
         return {
           model: defaultModel,
           metadata: {
@@ -394744,6 +394850,10 @@ Respond *only* in JSON format according to the following schema. Do not include
           if (await config3.getNumericalRoutingEnabled() && isGemini3Model(model, config3)) {
             return null;
           }
+          if (isFunctionResponse(createUserContent(context2.request))) {
+            debugLogger.log("[Routing] Bypassing Classifier: request is FunctionResponse.");
+            return null;
+          }
           const promptId = getPromptIdWithFallback("classifier-router");
           const historySlice = context2.history.slice(-HISTORY_SEARCH_WINDOW2);
           const cleanHistory = historySlice.filter((content) => !isFunctionCall(content) && !isFunctionResponse(content));
@@ -394760,12 +394870,11 @@ Respond *only* in JSON format according to the following schema. Do not include
           const routerResponse = ClassifierResponseSchema2.parse(jsonResponse);
           const reasoning = routerResponse.reasoning;
           const latencyMs = Date.now() - startTime;
-          const [useGemini3_1, useGemini3_1FlashLite, useCustomToolModel] = await Promise.all([
+          const [useGemini3_1, useCustomToolModel] = await Promise.all([
             config3.getGemini31Launched(),
-            config3.getGemini31FlashLiteLaunched(),
             config3.getUseCustomToolModel()
           ]);
-          const selectedModel = normalizeModelId(resolveClassifierModel(normalizeModelId(model), routerResponse.model_choice, useGemini3_1, useGemini3_1FlashLite, useCustomToolModel, config3.getHasAccessToPreviewModel?.() ?? true, config3));
+          const selectedModel = normalizeModelId(resolveClassifierModel(normalizeModelId(model), routerResponse.model_choice, useGemini3_1, useCustomToolModel, config3.getHasAccessToPreviewModel?.() ?? true, config3));
           const service = config3.getModelAvailabilityService();
           const snapshot = service.snapshot(selectedModel);
           if (!snapshot.available) {
@@ -394893,6 +395002,10 @@ Model: {"complexity_reasoning": "High-level architecture and strategic planning.
           }
           const finalHistory = firstTextIndex === -1 ? [] : candidateSlice.slice(firstTextIndex);
           const requestParts = Array.isArray(context2.request) ? context2.request : [context2.request];
+          if (finalHistory.length === 0 && isFunctionResponse(createUserContent(context2.request))) {
+            debugLogger.log("[Routing] Bypassing NumericalClassifier: request is FunctionResponse but history is empty after slicing.");
+            return null;
+          }
           const sanitizedRequest = requestParts.map((part) => {
             if (typeof part === "string") {
               return { text: part };
@@ -394914,12 +395027,11 @@ Model: {"complexity_reasoning": "High-level architecture and strategic planning.
           const routerResponse = ClassifierResponseSchema3.parse(jsonResponse);
           const score = routerResponse.complexity_score;
           const { threshold, groupLabel, modelAlias } = await this.getRoutingDecision(score, config3);
-          const [useGemini3_1, useGemini3_1FlashLite, useCustomToolModel] = await Promise.all([
+          const [useGemini3_1, useCustomToolModel] = await Promise.all([
             config3.getGemini31Launched(),
-            config3.getGemini31FlashLiteLaunched(),
             config3.getUseCustomToolModel()
           ]);
-          const selectedModel = normalizeModelId(resolveClassifierModel(normalizeModelId(model), modelAlias, useGemini3_1, useGemini3_1FlashLite, useCustomToolModel, config3.getHasAccessToPreviewModel?.() ?? true, config3));
+          const selectedModel = normalizeModelId(resolveClassifierModel(normalizeModelId(model), modelAlias, useGemini3_1, useCustomToolModel, config3.getHasAccessToPreviewModel?.() ?? true, config3));
           const service = config3.getModelAvailabilityService();
           const snapshot = service.snapshot(selectedModel);
           if (!snapshot.available) {
@@ -395029,7 +395141,7 @@ var init_fallbackStrategy = __esm({
       name = "fallback";
       async route(context2, config3, _baseLlmClient, _localLiteRtLmClient) {
         const requestedModel = context2.requestedModel ?? config3.getModel();
-        const resolvedModel = resolveModel(requestedModel, config3.getGemini31LaunchedSync?.() ?? false, config3.getGemini31FlashLiteLaunchedSync?.() ?? false, false, config3.getHasAccessToPreviewModel?.() ?? true, config3);
+        const resolvedModel = resolveModel(requestedModel, config3.getGemini31LaunchedSync?.() ?? false, false, config3.getHasAccessToPreviewModel?.() ?? true, config3);
         const service = config3.getModelAvailabilityService();
         const snapshot = service.snapshot(resolvedModel);
         if (snapshot.available) {
@@ -395066,7 +395178,7 @@ var init_overrideStrategy = __esm({
           return null;
         }
         return {
-          model: resolveModel(overrideModel, config3.getGemini31LaunchedSync?.() ?? false, config3.getGemini31FlashLiteLaunchedSync?.() ?? false, false, config3.getHasAccessToPreviewModel?.() ?? true, config3),
+          model: resolveModel(overrideModel, config3.getGemini31LaunchedSync?.() ?? false, false, config3.getHasAccessToPreviewModel?.() ?? true, config3),
           metadata: {
             source: this.name,
             latencyMs: 0,
@@ -395098,14 +395210,13 @@ var init_approvalModeStrategy = __esm({
         const startTime = Date.now();
         const approvalMode = config3.getApprovalMode();
         const approvedPlanPath = config3.getApprovedPlanPath();
-        const [useGemini3_1, useGemini3_1FlashLite, useCustomToolModel, hasAccessToPreview] = await Promise.all([
+        const [useGemini3_1, useCustomToolModel, hasAccessToPreview] = await Promise.all([
           config3.getGemini31Launched(),
-          config3.getGemini31FlashLiteLaunched(),
           config3.getUseCustomToolModel(),
           config3.getHasAccessToPreviewModel()
         ]);
         if (approvalMode === ApprovalMode.PLAN) {
-          const proModel = resolveClassifierModel(model, GEMINI_MODEL_ALIAS_PRO, useGemini3_1, useGemini3_1FlashLite, useCustomToolModel, hasAccessToPreview, config3);
+          const proModel = resolveClassifierModel(model, GEMINI_MODEL_ALIAS_PRO, useGemini3_1, useCustomToolModel, hasAccessToPreview, config3);
           return {
             model: proModel,
             metadata: {
@@ -395115,7 +395226,7 @@ var init_approvalModeStrategy = __esm({
             }
           };
         } else if (approvedPlanPath) {
-          const flashModel = resolveClassifierModel(model, GEMINI_MODEL_ALIAS_FLASH, useGemini3_1, useGemini3_1FlashLite, useCustomToolModel, hasAccessToPreview, config3);
+          const flashModel = resolveClassifierModel(model, GEMINI_MODEL_ALIAS_FLASH, useGemini3_1, useCustomToolModel, hasAccessToPreview, config3);
           return {
             model: flashModel,
             metadata: {
@@ -395335,6 +395446,12 @@ var init_defaultModelConfigs = __esm({
             model: "gemini-2.5-flash-lite"
           }
         },
+        "gemini-3.1-flash-lite": {
+          extends: "chat-base-3",
+          modelConfig: {
+            model: "gemini-3.1-flash-lite"
+          }
+        },
         "gemma-4-31b-it": {
           extends: "chat-base-3",
           modelConfig: {
@@ -395363,7 +395480,7 @@ var init_defaultModelConfigs = __esm({
         classifier: {
           extends: "base",
           modelConfig: {
-            model: "gemini-2.5-flash-lite",
+            model: "flash-lite",
             generateContentConfig: {
               maxOutputTokens: 1024,
               thinkingConfig: {
@@ -395375,7 +395492,7 @@ var init_defaultModelConfigs = __esm({
         "prompt-completion": {
           extends: "base",
           modelConfig: {
-            model: "gemini-2.5-flash-lite",
+            model: "flash-lite",
             generateContentConfig: {
               temperature: 0.3,
               maxOutputTokens: 16e3,
@@ -395388,7 +395505,7 @@ var init_defaultModelConfigs = __esm({
         "fast-ack-helper": {
           extends: "base",
           modelConfig: {
-            model: "gemini-2.5-flash-lite",
+            model: "flash-lite",
             generateContentConfig: {
               temperature: 0.2,
               maxOutputTokens: 120,
@@ -395401,7 +395518,7 @@ var init_defaultModelConfigs = __esm({
         "edit-corrector": {
           extends: "base",
           modelConfig: {
-            model: "gemini-2.5-flash-lite",
+            model: "flash-lite",
             generateContentConfig: {
               thinkingConfig: {
                 thinkingBudget: 0
@@ -395412,7 +395529,7 @@ var init_defaultModelConfigs = __esm({
         "summarizer-default": {
           extends: "base",
           modelConfig: {
-            model: "gemini-2.5-flash-lite",
+            model: "flash-lite",
             generateContentConfig: {
               maxOutputTokens: 2e3
             }
@@ -395421,7 +395538,7 @@ var init_defaultModelConfigs = __esm({
         "summarizer-shell": {
           extends: "base",
           modelConfig: {
-            model: "gemini-2.5-flash-lite",
+            model: "flash-lite",
             generateContentConfig: {
               maxOutputTokens: 2e3
             }
@@ -395491,7 +395608,7 @@ var init_defaultModelConfigs = __esm({
         },
         "chat-compression-3.1-flash-lite": {
           modelConfig: {
-            model: "gemini-3.1-flash-lite-preview"
+            model: "gemini-3.1-flash-lite"
           }
         },
         "chat-compression-2.5-pro": {
@@ -395532,10 +395649,10 @@ var init_defaultModelConfigs = __esm({
       ],
       modelDefinitions: {
         // Concrete Models
-        "gemini-3.1-flash-lite-preview": {
+        "gemini-3.1-flash-lite": {
           tier: "flash-lite",
           family: "gemini-3",
-          isPreview: true,
+          isPreview: false,
           isVisible: true,
           features: { thinking: false, multimodalToolUse: true }
         },
@@ -395717,14 +395834,8 @@ var init_defaultModelConfigs = __esm({
             }
           ]
         },
-        "gemini-3.1-flash-lite-preview": {
-          default: "gemini-3.1-flash-lite-preview",
-          contexts: [
-            {
-              condition: { useGemini3_1FlashLite: false },
-              target: "gemini-2.5-flash-lite"
-            }
-          ]
+        "gemini-3.1-flash-lite": {
+          default: "gemini-3.1-flash-lite"
         },
         flash: {
           default: "gemini-3-flash-preview",
@@ -395736,13 +395847,7 @@ var init_defaultModelConfigs = __esm({
           ]
         },
         "flash-lite": {
-          default: "gemini-2.5-flash-lite",
-          contexts: [
-            {
-              condition: { useGemini3_1FlashLite: true },
-              target: "gemini-3.1-flash-lite-preview"
-            }
-          ]
+          default: "gemini-3.1-flash-lite"
         },
         "auto-gemini-3": {
           default: "gemini-3-pro-preview",
@@ -395939,7 +396044,7 @@ var init_defaultModelConfigs = __esm({
         ],
         lite: [
           {
-            model: "gemini-2.5-flash-lite",
+            model: "flash-lite",
             actions: {
               terminal: "silent",
               transient: "silent",
@@ -399234,7 +399339,6 @@ var init_flagNames = __esm({
       MASKING_PROTECT_LATEST_TURN: 45758819,
       GEMINI_3_1_PRO_LAUNCHED: 45760185,
       PRO_MODEL_NO_ACCESS: 45768879,
-      GEMINI_3_1_FLASH_LITE_LAUNCHED: 45771641,
       DEFAULT_REQUEST_TIMEOUT: 45773134
     };
   }
@@ -410303,7 +410407,7 @@ var init_config4 = __esm({
         if (!isAutoModel(model, this)) {
           return {};
         }
-        const primaryModel = resolveModel(model, this.getGemini31LaunchedSync(), this.getGemini31FlashLiteLaunchedSync(), this.getUseCustomToolModelSync(), this.getHasAccessToPreviewModel(), this);
+        const primaryModel = resolveModel(model, this.getGemini31LaunchedSync(), this.getUseCustomToolModelSync(), this.getHasAccessToPreviewModel(), this);
         const isPreview = isPreviewModel(primaryModel, this);
         const proModel = primaryModel;
         const flashModel = isPreview ? PREVIEW_GEMINI_FLASH_MODEL : DEFAULT_GEMINI_FLASH_MODEL;
@@ -410324,7 +410428,7 @@ var init_config4 = __esm({
         if (pooled.remaining !== void 0) {
           return pooled.remaining;
         }
-        const primaryModel = resolveModel(this.getModel(), this.getGemini31LaunchedSync(), this.getGemini31FlashLiteLaunchedSync(), this.getUseCustomToolModelSync(), this.getHasAccessToPreviewModel(), this);
+        const primaryModel = resolveModel(this.getModel(), this.getGemini31LaunchedSync(), this.getUseCustomToolModelSync(), this.getHasAccessToPreviewModel(), this);
         return this.modelQuotas.get(primaryModel)?.remaining;
       }
       getQuotaLimit() {
@@ -410332,7 +410436,7 @@ var init_config4 = __esm({
         if (pooled.limit !== void 0) {
           return pooled.limit;
         }
-        const primaryModel = resolveModel(this.getModel(), this.getGemini31LaunchedSync(), this.getGemini31FlashLiteLaunchedSync(), this.getUseCustomToolModelSync(), this.getHasAccessToPreviewModel(), this);
+        const primaryModel = resolveModel(this.getModel(), this.getGemini31LaunchedSync(), this.getUseCustomToolModelSync(), this.getHasAccessToPreviewModel(), this);
         return this.modelQuotas.get(primaryModel)?.limit;
       }
       getQuotaResetTime() {
@@ -410340,7 +410444,7 @@ var init_config4 = __esm({
         if (pooled.resetTime !== void 0) {
           return pooled.resetTime;
         }
-        const primaryModel = resolveModel(this.getModel(), this.getGemini31LaunchedSync(), this.getGemini31FlashLiteLaunchedSync(), this.getUseCustomToolModelSync(), this.getHasAccessToPreviewModel(), this);
+        const primaryModel = resolveModel(this.getModel(), this.getGemini31LaunchedSync(), this.getUseCustomToolModelSync(), this.getHasAccessToPreviewModel(), this);
         return this.modelQuotas.get(primaryModel)?.resetTime;
       }
       getEmbeddingModel() {
@@ -411303,14 +411407,6 @@ ${sections.join("\n")}
         await this.ensureExperimentsLoaded();
         return this.getGemini31LaunchedSync();
       }
-      /**
-       * Returns whether Gemini 3.1 Flash Lite has been launched.
-       * This method is async and ensures that experiments are loaded before returning the result.
-       */
-      async getGemini31FlashLiteLaunched() {
-        await this.ensureExperimentsLoaded();
-        return this.getGemini31FlashLiteLaunchedSync();
-      }
       /**
        * Returns whether the custom tool model should be used.
        */
@@ -411359,20 +411455,6 @@ ${sections.join("\n")}
         }
         return void 0;
       }
-      /**
-       * Returns whether Gemini 3.1 Flash Lite has been launched.
-       *
-       * Note: This method should only be called after startup, once experiments have been loaded.
-       * If you need to call this during startup or from an async context, use
-       * getGemini31FlashLiteLaunched instead.
-       */
-      getGemini31FlashLiteLaunchedSync() {
-        const authType = this.contentGeneratorConfig?.authType;
-        if (this.isGemini31LaunchedForAuthType(authType)) {
-          return true;
-        }
-        return this.experiments?.flags[ExperimentFlags.GEMINI_3_1_FLASH_LITE_LAUNCHED]?.boolValue ?? false;
-      }
       /**
        * Returns the client version.
        */
@@ -433887,6 +433969,7 @@ var Task4 = class _Task {
   currentAgentMessageId = v4_default2();
   promptCount = 0;
   autoExecute;
+  usageMetadata;
   get isYoloMatch() {
     return this.autoExecute || this.config.getApprovalMode() === ApprovalMode.YOLO;
   }
@@ -434034,6 +434117,9 @@ var Task4 = class _Task {
     if (traceId) {
       metadata2.traceId = traceId;
     }
+    if (final && this.usageMetadata) {
+      metadata2.usageMetadata = this.usageMetadata;
+    }
     return {
       kind: "status-update",
       taskId: this.id,
@@ -434439,8 +434525,12 @@ var Task4 = class _Task {
         break;
       case GeminiEventType.Finished:
         logger.info(`[Task ${this.id}] Agent finished its turn.`);
+        if (event.value && typeof event.value === "object" && "usageMetadata" in event.value) {
+          this.usageMetadata = event.value.usageMetadata;
+        }
         break;
       case GeminiEventType.ModelInfo:
+        this.usageMetadata = void 0;
         this.modelInfo = event.value;
         break;
       case GeminiEventType.Retry: