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

package/bundle/{chunk-SIXPHUVZ.js → chunk-CWAXEILN.js}

@@ -250887,18 +250887,6 @@ async function saveTruncatedToolOutput(content, toolName, id, projectTempDir, se
 }
 
 // packages/core/src/utils/shell-utils.ts
-var BASH_HUP_GUARD = `trap '' HUP;`;
-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(" ");
@@ -250906,7 +250894,7 @@ async function getCommandName(command, args2) {
   const roots = getCommandRoots(stripped).filter(
     (r3) => r3 !== "shopt" && r3 !== "set"
   );
-  if (roots.length === 1) {
+  if (roots.length > 0) {
     return roots[0];
   }
   return path8.basename(command);
@@ -251464,17 +251452,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();
 }
 var spawnAsync = async (command, args2, options) => {
   const sandboxManager = options?.sandboxManager ?? new NoopSandboxManager();
@@ -252388,7 +252373,7 @@ async function getCommandName2(req) {
   const roots = getCommandRoots(stripped).filter(
     (r3) => r3 !== "shopt" && r3 !== "set"
   );
-  if (roots.length === 1) {
+  if (roots.length > 0) {
     return roots[0];
   }
   return path11.basename(req.command);
@@ -276249,10 +276234,10 @@ var PREVIEW_GEMINI_MODEL = "gemini-3-pro-preview";
 var PREVIEW_GEMINI_3_1_MODEL = "gemini-3.1-pro-preview";
 var PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL = "gemini-3.1-pro-preview-customtools";
 var PREVIEW_GEMINI_FLASH_MODEL = "gemini-3-flash-preview";
-var PREVIEW_GEMINI_3_1_FLASH_LITE_MODEL = "gemini-3.1-flash-lite-preview";
 var DEFAULT_GEMINI_MODEL = "gemini-2.5-pro";
 var DEFAULT_GEMINI_FLASH_MODEL = "gemini-2.5-flash";
-var DEFAULT_GEMINI_FLASH_LITE_MODEL = "gemini-2.5-flash-lite";
+var DEFAULT_GEMINI_FLASH_LITE_MODEL = "gemini-3.1-flash-lite";
+var PREVIEW_GEMINI_FLASH_LITE_MODEL = "none";
 var GEMMA_4_31B_IT_MODEL = "gemma-4-31b-it";
 var GEMMA_4_26B_A4B_IT_MODEL = "gemma-4-26b-a4b-it";
 var VALID_GEMINI_MODELS = /* @__PURE__ */ new Set([
@@ -276260,7 +276245,7 @@ var VALID_GEMINI_MODELS = /* @__PURE__ */ new Set([
   PREVIEW_GEMINI_3_1_MODEL,
   PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL,
   PREVIEW_GEMINI_FLASH_MODEL,
-  PREVIEW_GEMINI_3_1_FLASH_LITE_MODEL,
+  PREVIEW_GEMINI_FLASH_LITE_MODEL,
   DEFAULT_GEMINI_MODEL,
   DEFAULT_GEMINI_FLASH_MODEL,
   DEFAULT_GEMINI_FLASH_LITE_MODEL,
@@ -276276,16 +276261,15 @@ var GEMINI_MODEL_ALIAS_FLASH_LITE = "flash-lite";
 var DEFAULT_GEMINI_EMBEDDING_MODEL = "gemini-embedding-001";
 var DEFAULT_THINKING_MODE = 8192;
 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, config2) {
+function resolveModel(requestedModel, useGemini3_1 = false, useCustomToolModel = false, hasAccessToPreview = true, config2) {
   const normalizedModel = Array.isArray(requestedModel) ? String(requestedModel.at(-1) ?? "").trim() || "" : typeof requestedModel !== "string" ? String(requestedModel ?? "").trim() || "" : requestedModel.trim() || "";
   if (config2?.getExperimentalDynamicModelConfiguration?.() === true) {
     const resolved2 = config2.modelConfigService.resolveModelId(normalizedModel, {
       useGemini3_1,
-      useGemini3_1FlashLite,
       useCustomTools: useCustomToolModel,
       hasAccessToPreview
     });
@@ -276327,7 +276311,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: {
@@ -276335,12 +276319,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:
@@ -276357,14 +276342,13 @@ function resolveModel(requestedModel, useGemini3_1 = false, useGemini3_1FlashLit
   }
   return resolved;
 }
-function resolveClassifierModel(requestedModel, modelAlias, useGemini3_1 = false, useGemini3_1FlashLite = false, useCustomToolModel = false, hasAccessToPreview = true, config2) {
+function resolveClassifierModel(requestedModel, modelAlias, useGemini3_1 = false, useCustomToolModel = false, hasAccessToPreview = true, config2) {
   if (config2?.getExperimentalDynamicModelConfiguration?.() === true) {
     return config2.modelConfigService.resolveClassifierModelId(
       modelAlias,
       requestedModel,
       {
         useGemini3_1,
-        useGemini3_1FlashLite,
         useCustomTools: useCustomToolModel,
         hasAccessToPreview
       }
@@ -276381,16 +276365,15 @@ function resolveClassifierModel(requestedModel, modelAlias, useGemini3_1 = false
       GEMINI_MODEL_ALIAS_FLASH,
       false,
       false,
-      false,
       hasAccessToPreview
     );
   }
   return resolveModel(
     requestedModel,
     useGemini3_1,
-    useGemini3_1FlashLite,
     useCustomToolModel,
-    hasAccessToPreview
+    hasAccessToPreview,
+    config2
   );
 }
 function getDisplayString(model, config2) {
@@ -276417,17 +276400,20 @@ function getDisplayString(model, config2) {
       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, config2) {
+  if (model === "none") {
+    return false;
+  }
   if (config2?.getExperimentalDynamicModelConfiguration?.() === true) {
     return config2.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, config2) {
   if (config2?.getExperimentalDynamicModelConfiguration?.() === true) {
@@ -276437,7 +276423,7 @@ function isProModel(model, config2) {
 }
 function isGemini3Model(model, config2) {
   if (config2?.getExperimentalDynamicModelConfiguration?.() === true) {
-    const resolved2 = resolveModel(model, false, false, false, true, config2);
+    const resolved2 = resolveModel(model, false, false, true, config2);
     return config2.modelConfigService.getModelDefinition(resolved2)?.family === "gemini-3";
   }
   const resolved = resolveModel(model);
@@ -276448,7 +276434,7 @@ function isGemini2Model(model) {
 }
 function isCustomModel(model, config2) {
   if (config2?.getExperimentalDynamicModelConfiguration?.() === true) {
-    const resolved2 = resolveModel(model, false, false, false, true, config2);
+    const resolved2 = resolveModel(model, false, false, true, config2);
     return config2.modelConfigService.getModelDefinition(resolved2)?.tier === "custom" || !resolved2.startsWith("gemini-");
   }
   const resolved = resolveModel(model);
@@ -276470,15 +276456,15 @@ function supportsMultimodalFunctionResponse(model, config2) {
   }
   return model.startsWith("gemini-3-");
 }
-function isActiveModel(model, useGemini3_1 = false, useGemini3_1FlashLite = false, useCustomToolModel = false, experimentalGemma = true) {
-  if (!VALID_GEMINI_MODELS.has(model)) {
+function isActiveModel(model, useGemini3_1 = false, useCustomToolModel = false, experimentalGemma = true) {
+  if (!VALID_GEMINI_MODELS.has(model) || model === "none") {
     return false;
   }
   if (model === GEMMA_4_31B_IT_MODEL || model === GEMMA_4_26B_A4B_IT_MODEL) {
     return experimentalGemma;
   }
-  if (model === PREVIEW_GEMINI_3_1_FLASH_LITE_MODEL) {
-    return useGemini3_1FlashLite;
+  if (model === PREVIEW_GEMINI_FLASH_LITE_MODEL) {
+    return false;
   }
   if (useGemini3_1) {
     if (model === PREVIEW_GEMINI_MODEL) {
@@ -279549,8 +279535,8 @@ function isValidToolName(name3, options = {}) {
 }
 
 // packages/core/src/generated/git-commit.ts
-var GIT_COMMIT_INFO = "b82ca5f8d";
-var CLI_VERSION = "0.44.0-preview.0";
+var GIT_COMMIT_INFO = "5cac7c10f";
+var CLI_VERSION = "0.45.0-nightly.20260521.g854f811be";
 
 // packages/core/src/ide/detect-ide.ts
 var IDE_DEFINITIONS = {
@@ -304019,7 +304005,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname4);
-    return "0.44.0-preview.0";
+    return "0.45.0-nightly.20260521.g854f811be";
   })();
   return versionPromise;
 }
@@ -304982,7 +304968,6 @@ function getModelPolicyChain(options) {
     const proModel = resolveModel(
       PREVIEW_GEMINI_MODEL,
       options.useGemini31,
-      options.useGemini31FlashLite,
       options.useCustomToolModel
     );
     return [
@@ -305059,7 +305044,6 @@ function resolvePolicyChain(config2, preferredModel, wrapsAround = false) {
   const configuredModel = normalizeModelId(config2.getModel());
   let chain2;
   const useGemini31 = config2.getGemini31LaunchedSync?.() ?? false;
-  const useGemini31FlashLite = config2.getGemini31FlashLiteLaunchedSync?.() ?? false;
   const useCustomToolModel = config2.getUseCustomToolModelSync?.() ?? false;
   const hasAccessToPreview = config2.getHasAccessToPreviewModel?.() ?? false;
   const isOriginallyGemini3 = isGemini3Model(modelFromConfig, config2);
@@ -305067,7 +305051,6 @@ function resolvePolicyChain(config2, preferredModel, wrapsAround = false) {
     resolveModel(
       modelFromConfig,
       useGemini31,
-      useGemini31FlashLite,
       useCustomToolModel,
       hasAccessToPreview,
       config2
@@ -305079,7 +305062,6 @@ function resolvePolicyChain(config2, preferredModel, wrapsAround = false) {
   if (config2.getExperimentalDynamicModelConfiguration?.() === true) {
     const context2 = {
       useGemini3_1: useGemini31,
-      useGemini3_1FlashLite: useGemini31FlashLite,
       useCustomTools: useCustomToolModel
     };
     if (resolvedModel === DEFAULT_GEMINI_FLASH_LITE_MODEL) {
@@ -305118,7 +305100,6 @@ function resolvePolicyChain(config2, preferredModel, wrapsAround = false) {
           isAutoSelection,
           userTier: config2.getUserTier(),
           useGemini31,
-          useGemini31FlashLite,
           useCustomToolModel
         });
       } else {
@@ -305127,7 +305108,6 @@ function resolvePolicyChain(config2, preferredModel, wrapsAround = false) {
           isAutoSelection,
           userTier: config2.getUserTier(),
           useGemini31,
-          useGemini31FlashLite,
           useCustomToolModel
         });
       }
@@ -309630,7 +309610,6 @@ async function createContentGenerator(config2, gcConfig, sessionId) {
     const model = resolveModel(
       gcConfig.getModel(),
       config2.authType === "gemini-api-key" /* USE_GEMINI */ || config2.authType === "vertex-ai" /* USE_VERTEX_AI */ || (await gcConfig.getGemini31Launched?.() ?? false),
-      config2.authType === "gemini-api-key" /* USE_GEMINI */ || config2.authType === "vertex-ai" /* USE_VERTEX_AI */ || (await gcConfig.getGemini31FlashLiteLaunched?.() ?? false),
       false,
       gcConfig.getHasAccessToPreviewModel?.() ?? true,
       gcConfig
@@ -321138,17 +321117,6 @@ function injectUtf8CodepageForPty(command, shell, isWindows3, 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 findLastContentLine = (buffer, startLine) => {
   const lineCount = buffer.length;
   for (let i4 = lineCount - 1; i4 >= startLine; i4--) {
@@ -321326,10 +321294,9 @@ ${truncated}`;
       executable = "cmd.exe";
     }
     const resolvedExecutable = resolveExecutable(executable) ?? executable;
-    const promptGuarded = ensurePromptvarsDisabled(commandToExecute, shell);
-    const hupGuarded = !isWindows3 ? ensureHupIgnored(promptGuarded, shell) : promptGuarded;
+    const guardedCommand = ensurePromptvarsDisabled(commandToExecute, shell);
     const finalCommand = injectUtf8CodepageForPty(
-      hupGuarded,
+      guardedCommand,
       shell,
       isWindows3,
       usingPty
@@ -322180,10 +322147,11 @@ ${truncated}`;
       } catch (e2) {
         const err2 = e2;
         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 e2;
         }
@@ -329852,7 +329820,8 @@ function convertSessionToClientHistory(messages) {
     }
     if (msg.type === "user") {
       const contentString = partListUnionToString(msg.content);
-      if (contentString.trim().startsWith("/") || contentString.trim().startsWith("?")) {
+      const trimmedContent = contentString.trim();
+      if (trimmedContent.startsWith("/") || trimmedContent.startsWith("?") || trimmedContent.startsWith("<session_context>") || trimmedContent.startsWith("<hook_context>")) {
         continue;
       }
       clientHistory.push({
@@ -330364,12 +330333,10 @@ var GeminiChat = class {
     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
@@ -330378,7 +330345,6 @@ var GeminiChat = class {
         modelToUse = resolveModel(
           this.context.config.getActiveModel(),
           useGemini3_1,
-          useGemini3_1FlashLite,
           false,
           hasAccessToPreview,
           this.context.config
@@ -330429,7 +330395,6 @@ var GeminiChat = class {
           modelToUse = resolveModel(
             beforeModelResult.modifiedModel,
             useGemini3_1,
-            useGemini3_1FlashLite,
             false,
             hasAccessToPreview,
             this.context.config
@@ -332871,7 +332836,6 @@ var PromptProvider = class {
     const desiredModel = resolveModel(
       context2.config.getActiveModel(),
       context2.config.getGemini31LaunchedSync?.() ?? false,
-      context2.config.getGemini31FlashLiteLaunchedSync?.() ?? false,
       false,
       context2.config.getHasAccessToPreviewModel?.() ?? true,
       context2.config
@@ -333048,7 +333012,6 @@ var PromptProvider = class {
     const desiredModel = resolveModel(
       context2.config.getActiveModel(),
       context2.config.getGemini31LaunchedSync?.() ?? false,
-      context2.config.getGemini31FlashLiteLaunchedSync?.() ?? false,
       false,
       context2.config.getHasAccessToPreviewModel?.() ?? true,
       context2.config
@@ -333704,14 +333667,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";
   }
@@ -338358,7 +338323,7 @@ var A2AAuthProviderFactory = class _A2AAuthProviderFactory {
         return provider;
       }
       case "oauth2": {
-        const { OAuth2AuthProvider } = await import("./oauth2-provider-7JOVY727.js");
+        const { OAuth2AuthProvider } = await import("./oauth2-provider-WS7LUQ5V.js");
         const provider = new OAuth2AuthProvider(
           authConfig,
           options.agentName ?? "unknown",
@@ -338529,7 +338494,6 @@ var ModelConfigService = class _ModelConfigService {
     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(([_2, m]) => {
       if (m.isVisible !== true) return false;
       if (m.isPreview && !shouldShowPreviewModels) return false;
@@ -338559,14 +338523,11 @@ var ModelConfigService = class _ModelConfigService {
       if (context2.hasAccessToProModel === false && isProModel(id))
         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, m]) => {
       const resolvedId = this.resolveModelId(id, context2);
       const titleId = this.resolveModelId(id, {
-        useGemini3_1: useGemini31,
-        useGemini3_1FlashLite: useGemini31FlashLite
+        useGemini3_1: useGemini31
       });
       return {
         modelId: resolvedId,
@@ -343001,6 +342962,122 @@ var stressTestProfile = {
   buildPipelines: generalistProfile.buildPipelines,
   buildAsyncPipelines: generalistProfile.buildAsyncPipelines
 };
+var powerUserProfile = {
+  name: "Power User (Experimental)",
+  sentinels: generalistProfile.sentinels,
+  config: {
+    budget: {
+      retainedTokens: 65e3,
+      normalizedTokens: 1e5,
+      maxTokens: 15e4,
+      coalescingThresholdTokens: 5e3
+    },
+    gcStrategy: "incremental"
+  },
+  buildPipelines: (env2, config2) => [
+    {
+      name: "Immediate Sanitization",
+      triggers: ["new_message"],
+      processors: [
+        createToolMaskingProcessor(
+          "ToolMasking",
+          env2,
+          resolveProcessorOptions(config2, "ToolMasking", {
+            stringLengthThresholdTokens: 8e3
+          })
+        ),
+        createBlobDegradationProcessor("BlobDegradation", env2),
+        createNodeDistillationProcessor(
+          "ImmediateNodeDistillation",
+          env2,
+          resolveProcessorOptions(config2, "ImmediateNodeDistillation", {
+            nodeThresholdTokens: 15e3
+          })
+        )
+      ]
+    },
+    {
+      name: "Normalization",
+      triggers: ["retained_exceeded"],
+      processors: [
+        createNodeDistillationProcessor(
+          "NodeDistillation",
+          env2,
+          resolveProcessorOptions(config2, "NodeDistillation", {
+            nodeThresholdTokens: 3e3
+          })
+        ),
+        createNodeTruncationProcessor(
+          "NodeTruncation",
+          env2,
+          resolveProcessorOptions(config2, "NodeTruncation", {
+            maxTokensPerNode: 4e3
+          })
+        )
+      ]
+    },
+    {
+      name: "Archiving",
+      triggers: ["normalized_exceeded"],
+      processors: [
+        createNodeDistillationProcessor(
+          "ArchiveNodeDistillation",
+          env2,
+          resolveProcessorOptions(config2, "ArchiveNodeDistillation", {
+            nodeThresholdTokens: 1e3
+          })
+        ),
+        createNodeTruncationProcessor(
+          "ArchiveNodeTruncation",
+          env2,
+          resolveProcessorOptions(config2, "ArchiveNodeTruncation", {
+            maxTokensPerNode: 1500
+          })
+        )
+      ]
+    },
+    {
+      name: "Emergency Backstop",
+      triggers: ["gc_backstop"],
+      processors: [
+        createStateSnapshotProcessor(
+          "StateSnapshotSync",
+          env2,
+          resolveProcessorOptions(config2, "StateSnapshotSync", {
+            target: "max",
+            maxStateTokens: 2e3,
+            maxSummaryTurns: 10
+          })
+        ),
+        // If we STILL exceed max tokens, aggressively truncate
+        createNodeTruncationProcessor(
+          "EmergencyNodeTruncation",
+          env2,
+          resolveProcessorOptions(config2, "EmergencyNodeTruncation", {
+            maxTokensPerNode: 500
+          })
+        )
+      ]
+    }
+  ],
+  buildAsyncPipelines: (env2, config2) => [
+    {
+      name: "Async Background GC",
+      triggers: ["nodes_aged_out"],
+      processors: [
+        createStateSnapshotAsyncProcessor(
+          "StateSnapshotAsync",
+          env2,
+          resolveProcessorOptions(config2, "StateSnapshotAsync", {
+            type: "accumulate",
+            maxStateTokens: 4e3,
+            maxSummaryTurns: 5
+          })
+        )
+      ]
+    }
+  ]
+};
 
 // packages/core/src/context/config/schema.ts
 function getContextManagementConfigSchema(registry2) {
@@ -343082,6 +343159,9 @@ async function loadContextManagementConfig(sidecarPath, registry2) {
   if (sidecarPath === "stressTestProfile") {
     return stressTestProfile;
   }
+  if (sidecarPath === "powerUserProfile") {
+    return powerUserProfile;
+  }
   if (sidecarPath === "generalistProfile") {
     return generalistProfile;
   }
@@ -343193,6 +343273,12 @@ var ContextEventBus = class extends EventEmitter5 {
   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);
   }
@@ -343335,13 +343421,15 @@ var ContextGraphBuilder = class {
       const turn = history[turnIdx];
       const msg = turn.content;
       if (!msg.parts) continue;
-      const turnSalt = turn.id;
+      const hasEnvHeader = msg.parts?.some(
+        (p2) => isTextPart3(p2) && p2.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 (isTextPart3(part) && part.text.trim().startsWith("<session_context>") && turnSalt !== envTurnId) {
+          if (isTextPart3(part) && part.text.trim().startsWith("<session_context>") && turnIdx > 0) {
             debugLogger.log(
               "[ContextGraphBuilder] Skipping legacy environment header turn from graph."
             );
@@ -343746,13 +343834,13 @@ var PipelineOrchestrator = class {
   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(
       (p2) => p2.triggers.includes(trigger)
     );
@@ -343808,7 +343896,7 @@ var PipelineOrchestrator = class {
     }
     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(
@@ -343988,7 +344076,15 @@ async function render2(nodes, orchestrator, sidecar, tracer, env2, advancedToken
     const nodeTokens = env2.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) {
@@ -343998,12 +344094,13 @@ async function render2(nodes, orchestrator, sidecar, tracer, env2, advancedToken
       }
     }
   }
-  const processedNodes = await orchestrator.executeTriggerSync(
+  const processedBuffer = await orchestrator.executeTriggerSync(
     "gc_backstop",
-    nodes,
+    ContextWorkingBufferImpl.initialize(nodes),
     agedOutNodes,
     protectedIds
   );
+  const processedNodes = processedBuffer.nodes;
   const skipList = /* @__PURE__ */ new Set();
   for (const node of processedNodes) {
     if (node.abstractsIds) {
@@ -344080,13 +344177,10 @@ var ContextManager = class {
     this.orchestrator = orchestrator;
     this.orchestrator.setNodeProvider(() => this.buffer.nodes);
     this.eventBus.onProcessorResult((event) => {
-      const currentIds = new Set(this.buffer.nodes.map((n3) => n3.id));
-      const allTargetsPresent = event.targets.every(
-        (t3) => currentIds.has(t3.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((n3) => n3.id));
+      if (!event.targets.every((t3) => bufferIds.has(t3.id))) {
+        debugLogger.warn(
+          `[ContextManager] Dropping processor result from ${event.processorId}: targets no longer in buffer.`
         );
         return;
       }
@@ -344105,114 +344199,10 @@ var ContextManager = class {
   evaluatedNodeIds = /* @__PURE__ */ new Set();
   // Hysteresis tracking to prevent utility call churn
   lastTriggeredDeficit = 0;
+  lastTriggeredNormalizeDeficit = 0;
   // Cache for Anomaly 3 (Redundant Renders)
   lastRenderCache;
   hasPerformedHotStart = false;
-  /**
-   * 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((n3) => n3.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(
-      (a2, b2) => a2.timestamp - b2.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();
@@ -344227,15 +344217,16 @@ var ContextManager = class {
     }
     let previewNodes = [];
     if (pendingRequest) {
-      previewNodes = this.env.graphMapper.sync([pendingRequest]);
-      const previewNodeIds2 = new Set(previewNodes.map((n3) => n3.id));
-      previewNodes = await this.orchestrator.executeTriggerSync(
+      const syncedNodes = this.env.graphMapper.sync([pendingRequest]);
+      const previewNodeIds2 = new Set(syncedNodes.map((n3) => n3.id));
+      const previewBuffer = ContextWorkingBufferImpl.initialize(syncedNodes);
+      const processedPreviewBuffer = await this.orchestrator.executeTriggerSync(
         "new_message",
-        previewNodes,
+        previewBuffer,
         previewNodeIds2
       );
+      previewNodes = processedPreviewBuffer.nodes;
     }
-    await this.evaluateTriggers(newPrimalNodes);
     const hotStartPromise = (async () => {
       if (!this.hasPerformedHotStart) {
         this.hasPerformedHotStart = true;
@@ -344249,19 +344240,20 @@ var ContextManager = class {
     let nodes = this.buffer.nodes;
     const previewNodeIds = /* @__PURE__ */ new Set();
     if (previewNodes.length > 0) {
-      for (const n3 of previewNodes) {
-        previewNodeIds.add(n3.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((n3) => n3.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((n3) => n3.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);
@@ -344286,47 +344278,194 @@ var ContextManager = class {
       processedNodes
     } = renderResult;
     if (didApplyManagement) {
+      const masterIdsInResult = new Set(this.buffer.nodes.map((n3) => n3.id));
+      const processedMasterNodes = processedNodes.filter(
+        (n3) => !previewNodeIds.has(n3.id) || masterIdsInResult.has(n3.id)
+      );
       this.buffer = this.buffer.applyProcessorResult(
         "sync_backstop",
         this.buffer.nodes,
-        processedNodes.filter((n3) => !previewNodeIds.has(n3.id))
+        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((t3) => t3.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(
+      (a2, b2) => a2.timestamp - b2.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((n3) => n3.id));
+    const previewNodes = nodes.filter((n3) => !bufferIds.has(n3.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((n3) => n3.turnId === envTurnId);
+      for (const n3 of turn0Nodes) {
+        protectedIds.add(n3.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((n3) => n3.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);
@@ -344346,9 +344485,6 @@ var ContextManager = class {
       debugLogger.warn("[ContextManager] Hot start calibration failed", e2);
     }
   }
-  getEnvironment() {
-    return this.env;
-  }
 };
 
 // packages/core/src/context/processors/historyTruncationProcessor.ts
@@ -345231,7 +345367,6 @@ var GeminiClient = class {
     return resolveModel(
       this.config.getActiveModel(),
       this.config.getGemini31LaunchedSync?.() ?? false,
-      this.config.getGemini31FlashLiteLaunchedSync?.() ?? false,
       false,
       this.config.getHasAccessToPreviewModel?.() ?? true,
       this.config
@@ -346710,6 +346845,9 @@ var Scheduler = class {
     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") {
@@ -359851,22 +359989,15 @@ ${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([
         config2.getGemini31Launched(),
-        config2.getGemini31FlashLiteLaunched(),
         config2.getUseCustomToolModel(),
-        config2.getHasAccessToPreviewModel?.() ?? true
+        config2.getHasAccessToPreviewModel()
       ]);
       const selectedModel = resolveClassifierModel(
         context2.requestedModel ?? config2.getModel(),
         routerResponse.model_choice,
         useGemini3_1,
-        useGemini3_1FlashLite,
         useCustomToolModel,
         hasAccessToPreview,
         config2
@@ -359893,7 +360024,6 @@ var DefaultStrategy = class {
     const defaultModel = resolveModel(
       config2.getModel(),
       config2.getGemini31LaunchedSync?.() ?? false,
-      config2.getGemini31FlashLiteLaunchedSync?.() ?? false,
       false,
       config2.getHasAccessToPreviewModel?.() ?? true,
       config2
@@ -360014,6 +360144,12 @@ var ClassifierStrategy = class {
       if (await config2.getNumericalRoutingEnabled() && isGemini3Model(model, config2)) {
         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(
@@ -360032,9 +360168,8 @@ var ClassifierStrategy = class {
       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([
         config2.getGemini31Launched(),
-        config2.getGemini31FlashLiteLaunched(),
         config2.getUseCustomToolModel()
       ]);
       const selectedModel = normalizeModelId(
@@ -360042,7 +360177,6 @@ var ClassifierStrategy = class {
           normalizeModelId(model),
           routerResponse.model_choice,
           useGemini3_1,
-          useGemini3_1FlashLite,
           useCustomToolModel,
           config2.getHasAccessToPreviewModel?.() ?? true,
           config2
@@ -360163,6 +360297,12 @@ var NumericalClassifierStrategy = class {
       }
       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 };
@@ -360184,9 +360324,8 @@ var NumericalClassifierStrategy = class {
       const routerResponse = ClassifierResponseSchema3.parse(jsonResponse);
       const score = routerResponse.complexity_score;
       const { threshold, groupLabel, modelAlias } = await this.getRoutingDecision(score, config2);
-      const [useGemini3_1, useGemini3_1FlashLite, useCustomToolModel] = await Promise.all([
+      const [useGemini3_1, useCustomToolModel] = await Promise.all([
         config2.getGemini31Launched(),
-        config2.getGemini31FlashLiteLaunched(),
         config2.getUseCustomToolModel()
       ]);
       const selectedModel = normalizeModelId(
@@ -360194,7 +360333,6 @@ var NumericalClassifierStrategy = class {
           normalizeModelId(model),
           modelAlias,
           useGemini3_1,
-          useGemini3_1FlashLite,
           useCustomToolModel,
           config2.getHasAccessToPreviewModel?.() ?? true,
           config2
@@ -360318,7 +360456,6 @@ var FallbackStrategy = class {
     const resolvedModel = resolveModel(
       requestedModel,
       config2.getGemini31LaunchedSync?.() ?? false,
-      config2.getGemini31FlashLiteLaunchedSync?.() ?? false,
       false,
       config2.getHasAccessToPreviewModel?.() ?? true,
       config2
@@ -360355,7 +360492,6 @@ var OverrideStrategy = class {
       model: resolveModel(
         overrideModel,
         config2.getGemini31LaunchedSync?.() ?? false,
-        config2.getGemini31FlashLiteLaunchedSync?.() ?? false,
         false,
         config2.getHasAccessToPreviewModel?.() ?? true,
         config2
@@ -360383,14 +360519,8 @@ var ApprovalModeStrategy = class {
     const startTime = Date.now();
     const approvalMode = config2.getApprovalMode();
     const approvedPlanPath = config2.getApprovedPlanPath();
-    const [
-      useGemini3_1,
-      useGemini3_1FlashLite,
-      useCustomToolModel,
-      hasAccessToPreview
-    ] = await Promise.all([
+    const [useGemini3_1, useCustomToolModel, hasAccessToPreview] = await Promise.all([
       config2.getGemini31Launched(),
-      config2.getGemini31FlashLiteLaunched(),
       config2.getUseCustomToolModel(),
       config2.getHasAccessToPreviewModel()
     ]);
@@ -360399,7 +360529,6 @@ var ApprovalModeStrategy = class {
         model,
         GEMINI_MODEL_ALIAS_PRO,
         useGemini3_1,
-        useGemini3_1FlashLite,
         useCustomToolModel,
         hasAccessToPreview,
         config2
@@ -360417,7 +360546,6 @@ var ApprovalModeStrategy = class {
         model,
         GEMINI_MODEL_ALIAS_FLASH,
         useGemini3_1,
-        useGemini3_1FlashLite,
         useCustomToolModel,
         hasAccessToPreview,
         config2
@@ -360634,6 +360762,12 @@ var DEFAULT_MODEL_CONFIGS = {
         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: {
@@ -360662,7 +360796,7 @@ var DEFAULT_MODEL_CONFIGS = {
     classifier: {
       extends: "base",
       modelConfig: {
-        model: "gemini-2.5-flash-lite",
+        model: "flash-lite",
         generateContentConfig: {
           maxOutputTokens: 1024,
           thinkingConfig: {
@@ -360674,7 +360808,7 @@ var DEFAULT_MODEL_CONFIGS = {
     "prompt-completion": {
       extends: "base",
       modelConfig: {
-        model: "gemini-2.5-flash-lite",
+        model: "flash-lite",
         generateContentConfig: {
           temperature: 0.3,
           maxOutputTokens: 16e3,
@@ -360687,7 +360821,7 @@ var DEFAULT_MODEL_CONFIGS = {
     "fast-ack-helper": {
       extends: "base",
       modelConfig: {
-        model: "gemini-2.5-flash-lite",
+        model: "flash-lite",
         generateContentConfig: {
           temperature: 0.2,
           maxOutputTokens: 120,
@@ -360700,7 +360834,7 @@ var DEFAULT_MODEL_CONFIGS = {
     "edit-corrector": {
       extends: "base",
       modelConfig: {
-        model: "gemini-2.5-flash-lite",
+        model: "flash-lite",
         generateContentConfig: {
           thinkingConfig: {
             thinkingBudget: 0
@@ -360711,7 +360845,7 @@ var DEFAULT_MODEL_CONFIGS = {
     "summarizer-default": {
       extends: "base",
       modelConfig: {
-        model: "gemini-2.5-flash-lite",
+        model: "flash-lite",
         generateContentConfig: {
           maxOutputTokens: 2e3
         }
@@ -360720,7 +360854,7 @@ var DEFAULT_MODEL_CONFIGS = {
     "summarizer-shell": {
       extends: "base",
       modelConfig: {
-        model: "gemini-2.5-flash-lite",
+        model: "flash-lite",
         generateContentConfig: {
           maxOutputTokens: 2e3
         }
@@ -360790,7 +360924,7 @@ var DEFAULT_MODEL_CONFIGS = {
     },
     "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": {
@@ -360831,10 +360965,10 @@ var DEFAULT_MODEL_CONFIGS = {
   ],
   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 }
     },
@@ -361016,14 +361150,8 @@ var DEFAULT_MODEL_CONFIGS = {
         }
       ]
     },
-    "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",
@@ -361035,13 +361163,7 @@ var DEFAULT_MODEL_CONFIGS = {
       ]
     },
     "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",
@@ -361238,7 +361360,7 @@ var DEFAULT_MODEL_CONFIGS = {
     ],
     lite: [
       {
-        model: "gemini-2.5-flash-lite",
+        model: "flash-lite",
         actions: {
           terminal: "silent",
           transient: "silent",
@@ -364791,7 +364913,6 @@ var ExperimentFlags = {
   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
 };
 
@@ -380103,7 +380224,6 @@ var Config = class {
     const primaryModel = resolveModel(
       model,
       this.getGemini31LaunchedSync(),
-      this.getGemini31FlashLiteLaunchedSync(),
       this.getUseCustomToolModelSync(),
       this.getHasAccessToPreviewModel(),
       this
@@ -380131,7 +380251,6 @@ var Config = class {
     const primaryModel = resolveModel(
       this.getModel(),
       this.getGemini31LaunchedSync(),
-      this.getGemini31FlashLiteLaunchedSync(),
       this.getUseCustomToolModelSync(),
       this.getHasAccessToPreviewModel(),
       this
@@ -380146,7 +380265,6 @@ var Config = class {
     const primaryModel = resolveModel(
       this.getModel(),
       this.getGemini31LaunchedSync(),
-      this.getGemini31FlashLiteLaunchedSync(),
       this.getUseCustomToolModelSync(),
       this.getHasAccessToPreviewModel(),
       this
@@ -380161,7 +380279,6 @@ var Config = class {
     const primaryModel = resolveModel(
       this.getModel(),
       this.getGemini31LaunchedSync(),
-      this.getGemini31FlashLiteLaunchedSync(),
       this.getUseCustomToolModelSync(),
       this.getHasAccessToPreviewModel(),
       this
@@ -381184,14 +381301,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.
    */
@@ -381240,20 +381349,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.
    */
@@ -399423,8 +399518,6 @@ export {
   formatTruncatedToolOutput,
   TOOL_OUTPUTS_DIR,
   saveTruncatedToolOutput,
-  BASH_HUP_GUARD,
-  stripHupGuard,
   getCommandName,
   extractStringFromParseEntry,
   SHELL_TOOL_NAMES,
@@ -399656,10 +399749,10 @@ export {
   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,
+  PREVIEW_GEMINI_FLASH_LITE_MODEL,
   GEMMA_4_31B_IT_MODEL,
   GEMMA_4_26B_A4B_IT_MODEL,
   VALID_GEMINI_MODELS,