@google/gemini-cli-a2a-server 0.19.0-preview.0 → 0.20.0-nightly.20251130.576fda18e

package/dist/a2a-server.mjs

@@ -304821,6 +304821,9 @@ var CodeAssistServer = class {
     };
     return await this.requestPost("listExperiments", req);
   }
+  async retrieveUserQuota(req) {
+    return await this.requestPost("retrieveUserQuota", req);
+  }
   async requestPost(method, req, signal) {
     const res = await this.client.request({
       url: this.getMethodUrl(method),
@@ -306930,6 +306933,7 @@ var ApiResponseEvent = class {
   prompt;
   response;
   usage;
+  finish_reasons;
   constructor(model, duration_ms, prompt_details, response_details, auth_type, usage_data, response_text) {
     this["event.name"] = "api_response";
     this["event.timestamp"] = (/* @__PURE__ */ new Date()).toISOString();
@@ -306948,6 +306952,7 @@ var ApiResponseEvent = class {
       tool_token_count: usage_data?.toolUsePromptTokenCount ?? 0,
       total_token_count: usage_data?.totalTokenCount ?? 0
     };
+    this.finish_reasons = toFinishReasons(this.response.candidates);
   }
   toLogRecord(config3) {
     const attributes = {
@@ -306964,7 +306969,8 @@ var ApiResponseEvent = class {
       total_token_count: this.usage.total_token_count,
       prompt_id: this.prompt.prompt_id,
       auth_type: this.auth_type,
-      status_code: this.status_code
+      status_code: this.status_code,
+      finish_reasons: this.finish_reasons
     };
     if (this.response_text) {
       attributes["response_text"] = this.response_text;
@@ -306986,7 +306992,7 @@ var ApiResponseEvent = class {
       "event.name": EVENT_GEN_AI_OPERATION_DETAILS,
       "event.timestamp": this["event.timestamp"],
       "gen_ai.response.id": this.response.response_id,
-      "gen_ai.response.finish_reasons": toFinishReasons(this.response.candidates),
+      "gen_ai.response.finish_reasons": this.finish_reasons,
       "gen_ai.output.messages": JSON.stringify(toOutputMessages(this.response.candidates)),
       ...toGenerateContentConfigAttributes(this.prompt.generate_content_config),
       ...getConventionAttributes(this)
@@ -307803,8 +307809,8 @@ var Float64Vector = import_vector.default.Float64Vector;
 var PointerVector = import_vector.default.PointerVector;
 
 // packages/core/dist/src/generated/git-commit.js
-var GIT_COMMIT_INFO = "d2a6cff4d";
-var CLI_VERSION = "0.19.0-preview.0";
+var GIT_COMMIT_INFO = "576fda18e";
+var CLI_VERSION = "0.20.0-nightly.20251130.576fda18e";
 
 // packages/core/dist/src/ide/detect-ide.js
 var IDE_DEFINITIONS = {
@@ -310731,7 +310737,7 @@ async function createContentGenerator(config3, gcConfig, sessionId2) {
     if (gcConfig.fakeResponses) {
       return FakeContentGenerator.fromFile(gcConfig.fakeResponses);
     }
-    const version4 = "0.19.0-preview.0";
+    const version4 = "0.20.0-nightly.20251130.576fda18e";
     const customHeadersEnv = process.env["GEMINI_CLI_CUSTOM_HEADERS"] || void 0;
     const userAgent = `GeminiCLI/${version4} (${process.platform}; ${process.arch})`;
     const customHeadersMap = parseCustomHeaders(customHeadersEnv);
@@ -354764,7 +354770,8 @@ var ShellExecutionService = class {
           ...process.env,
           GEMINI_CLI: "1",
           TERM: "xterm-256color",
-          PAGER: "cat"
+          PAGER: "cat",
+          GIT_PAGER: "cat"
         }
       });
       const result = new Promise((resolve14) => {
@@ -354932,7 +354939,8 @@ var ShellExecutionService = class {
           ...process.env,
           GEMINI_CLI: "1",
           TERM: "xterm-256color",
-          PAGER: shellExecutionConfig.pager ?? "cat"
+          PAGER: shellExecutionConfig.pager ?? "cat",
+          GIT_PAGER: shellExecutionConfig.pager ?? "cat"
         },
         handleFlowControl: true
       });
@@ -355301,6 +355309,11 @@ var ShellToolInvocation = class extends BaseToolInvocation {
     const isWindows5 = os16.platform() === "win32";
     const tempFileName = `shell_pgrep_${crypto20.randomBytes(6).toString("hex")}.tmp`;
     const tempFilePath = path43.join(os16.tmpdir(), tempFileName);
+    const timeoutMs = this.config.getShellToolInactivityTimeout();
+    const timeoutController = new AbortController();
+    let timeoutTimer;
+    const combinedController = new AbortController();
+    const onAbort = () => combinedController.abort();
     try {
       const commandToExecute = isWindows5 ? strippedCommand : (() => {
         let command = strippedCommand.trim();
@@ -355312,7 +355325,23 @@ var ShellToolInvocation = class extends BaseToolInvocation {
       let cumulativeOutput = "";
       let lastUpdateTime = Date.now();
       let isBinaryStream = false;
+      const resetTimeout = () => {
+        if (timeoutMs <= 0) {
+          return;
+        }
+        if (timeoutTimer)
+          clearTimeout(timeoutTimer);
+        timeoutTimer = setTimeout(() => {
+          timeoutController.abort();
+        }, timeoutMs);
+      };
+      signal.addEventListener("abort", onAbort, { once: true });
+      timeoutController.signal.addEventListener("abort", onAbort, {
+        once: true
+      });
+      resetTimeout();
       const { result: resultPromise, pid } = await ShellExecutionService.execute(commandToExecute, cwd, (event) => {
+        resetTimeout();
         if (!updateOutput) {
           return;
         }
@@ -355344,7 +355373,7 @@ var ShellToolInvocation = class extends BaseToolInvocation {
           updateOutput(cumulativeOutput);
           lastUpdateTime = Date.now();
         }
-      }, signal, this.config.getEnableInteractiveShell(), shellExecutionConfig ?? {});
+      }, combinedController.signal, this.config.getEnableInteractiveShell(), { ...shellExecutionConfig, pager: "cat" });
       if (pid && setPidCallback) {
         setPidCallback(pid);
       }
@@ -355369,8 +355398,14 @@ var ShellToolInvocation = class extends BaseToolInvocation {
         }
       }
       let llmContent = "";
+      let timeoutMessage = "";
       if (result.aborted) {
-        llmContent = "Command was cancelled by user before it could complete.";
+        if (timeoutController.signal.aborted) {
+          timeoutMessage = `Command was automatically cancelled because it exceeded the timeout of ${(timeoutMs / 6e4).toFixed(1)} minutes without output.`;
+          llmContent = timeoutMessage;
+        } else {
+          llmContent = "Command was cancelled by user before it could complete.";
+        }
         if (result.output.trim()) {
           llmContent += ` Below is the output before it was cancelled:
 ${result.output}`;
@@ -355399,7 +355434,11 @@ ${result.output}`;
           returnDisplayMessage = result.output;
         } else {
           if (result.aborted) {
-            returnDisplayMessage = "Command cancelled by user.";
+            if (timeoutMessage) {
+              returnDisplayMessage = timeoutMessage;
+            } else {
+              returnDisplayMessage = "Command cancelled by user.";
+            }
           } else if (result.signal) {
             returnDisplayMessage = `Command terminated by signal: ${result.signal}`;
           } else if (result.error) {
@@ -355430,6 +355469,10 @@ ${result.output}`;
         ...executionError
       };
     } finally {
+      if (timeoutTimer)
+        clearTimeout(timeoutTimer);
+      signal.removeEventListener("abort", onAbort);
+      timeoutController.signal.removeEventListener("abort", onAbort);
       if (fs41.existsSync(tempFilePath)) {
         fs41.unlinkSync(tempFilePath);
       }
@@ -361453,6 +361496,580 @@ function getResponseTextFromParts(parts2) {
 import * as fs44 from "node:fs/promises";
 import * as path46 from "node:path";
 var import_fast_levenshtein = __toESM(require_levenshtein(), 1);
+
+// packages/core/dist/src/hooks/hookTranslator.js
+var HookTranslator = class {
+};
+function hasTextProperty(value) {
+  return typeof value === "object" && value !== null && "text" in value && typeof value.text === "string";
+}
+function isContentWithParts(content) {
+  return typeof content === "object" && content !== null && "role" in content && "parts" in content;
+}
+function extractGenerationConfig(request3) {
+  if (request3.config && typeof request3.config === "object") {
+    const config3 = request3.config;
+    return {
+      temperature: config3.temperature,
+      maxOutputTokens: config3.maxOutputTokens,
+      topP: config3.topP,
+      topK: config3.topK
+    };
+  }
+  return void 0;
+}
+var HookTranslatorGenAIv1 = class extends HookTranslator {
+  /**
+   * Convert genai SDK GenerateContentParameters to stable LLMRequest
+   *
+   * Note: This implementation intentionally extracts only text content from parts.
+   * Non-text parts (images, function calls, etc.) are filtered out in v1 to provide
+   * a simplified, stable interface for hooks. This allows hooks to focus on text
+   * manipulation without needing to handle complex multimodal content.
+   * Future versions may expose additional content types if needed.
+   */
+  toHookLLMRequest(sdkRequest) {
+    const messages = [];
+    if (sdkRequest.contents) {
+      const contents = Array.isArray(sdkRequest.contents) ? sdkRequest.contents : [sdkRequest.contents];
+      for (const content of contents) {
+        if (typeof content === "string") {
+          messages.push({
+            role: "user",
+            content
+          });
+        } else if (isContentWithParts(content)) {
+          const role = content.role === "model" ? "model" : content.role === "system" ? "system" : "user";
+          const parts2 = Array.isArray(content.parts) ? content.parts : [content.parts];
+          const textContent2 = parts2.filter(hasTextProperty).map((part) => part.text).join("");
+          if (textContent2) {
+            messages.push({
+              role,
+              content: textContent2
+            });
+          }
+        }
+      }
+    }
+    const config3 = extractGenerationConfig(sdkRequest);
+    return {
+      model: sdkRequest.model || DEFAULT_GEMINI_FLASH_MODEL,
+      messages,
+      config: {
+        temperature: config3?.temperature,
+        maxOutputTokens: config3?.maxOutputTokens,
+        topP: config3?.topP,
+        topK: config3?.topK
+      }
+    };
+  }
+  /**
+   * Convert stable LLMRequest to genai SDK GenerateContentParameters
+   */
+  fromHookLLMRequest(hookRequest, baseRequest) {
+    const contents = hookRequest.messages.map((message) => ({
+      role: message.role === "model" ? "model" : message.role,
+      parts: [
+        {
+          text: typeof message.content === "string" ? message.content : String(message.content)
+        }
+      ]
+    }));
+    const result = {
+      ...baseRequest,
+      model: hookRequest.model,
+      contents
+    };
+    if (hookRequest.config) {
+      const baseConfig = baseRequest ? extractGenerationConfig(baseRequest) : void 0;
+      result.config = {
+        ...baseConfig,
+        temperature: hookRequest.config.temperature,
+        maxOutputTokens: hookRequest.config.maxOutputTokens,
+        topP: hookRequest.config.topP,
+        topK: hookRequest.config.topK
+      };
+    }
+    return result;
+  }
+  /**
+   * Convert genai SDK GenerateContentResponse to stable LLMResponse
+   */
+  toHookLLMResponse(sdkResponse) {
+    return {
+      text: sdkResponse.text,
+      candidates: (sdkResponse.candidates || []).map((candidate) => {
+        const textParts = candidate.content?.parts?.filter(hasTextProperty).map((part) => part.text) || [];
+        return {
+          content: {
+            role: "model",
+            parts: textParts
+          },
+          finishReason: candidate.finishReason,
+          index: candidate.index,
+          safetyRatings: candidate.safetyRatings?.map((rating) => ({
+            category: String(rating.category || ""),
+            probability: String(rating.probability || "")
+          }))
+        };
+      }),
+      usageMetadata: sdkResponse.usageMetadata ? {
+        promptTokenCount: sdkResponse.usageMetadata.promptTokenCount,
+        candidatesTokenCount: sdkResponse.usageMetadata.candidatesTokenCount,
+        totalTokenCount: sdkResponse.usageMetadata.totalTokenCount
+      } : void 0
+    };
+  }
+  /**
+   * Convert stable LLMResponse to genai SDK GenerateContentResponse
+   */
+  fromHookLLMResponse(hookResponse) {
+    const response = {
+      text: hookResponse.text,
+      candidates: hookResponse.candidates.map((candidate) => ({
+        content: {
+          role: "model",
+          parts: candidate.content.parts.map((part) => ({
+            text: part
+          }))
+        },
+        finishReason: candidate.finishReason,
+        index: candidate.index,
+        safetyRatings: candidate.safetyRatings
+      })),
+      usageMetadata: hookResponse.usageMetadata
+    };
+    return response;
+  }
+  /**
+   * Convert genai SDK ToolConfig to stable HookToolConfig
+   */
+  toHookToolConfig(sdkToolConfig) {
+    return {
+      mode: sdkToolConfig.functionCallingConfig?.mode,
+      allowedFunctionNames: sdkToolConfig.functionCallingConfig?.allowedFunctionNames
+    };
+  }
+  /**
+   * Convert stable HookToolConfig to genai SDK ToolConfig
+   */
+  fromHookToolConfig(hookToolConfig) {
+    const functionCallingConfig = hookToolConfig.mode || hookToolConfig.allowedFunctionNames ? {
+      mode: hookToolConfig.mode,
+      allowedFunctionNames: hookToolConfig.allowedFunctionNames
+    } : void 0;
+    return {
+      functionCallingConfig
+    };
+  }
+};
+var defaultHookTranslator = new HookTranslatorGenAIv1();
+
+// packages/core/dist/src/hooks/types.js
+var HookEventName;
+(function(HookEventName2) {
+  HookEventName2["BeforeTool"] = "BeforeTool";
+  HookEventName2["AfterTool"] = "AfterTool";
+  HookEventName2["BeforeAgent"] = "BeforeAgent";
+  HookEventName2["Notification"] = "Notification";
+  HookEventName2["AfterAgent"] = "AfterAgent";
+  HookEventName2["SessionStart"] = "SessionStart";
+  HookEventName2["SessionEnd"] = "SessionEnd";
+  HookEventName2["PreCompress"] = "PreCompress";
+  HookEventName2["BeforeModel"] = "BeforeModel";
+  HookEventName2["AfterModel"] = "AfterModel";
+  HookEventName2["BeforeToolSelection"] = "BeforeToolSelection";
+})(HookEventName || (HookEventName = {}));
+var HookType;
+(function(HookType2) {
+  HookType2["Command"] = "command";
+})(HookType || (HookType = {}));
+function createHookOutput(eventName, data) {
+  switch (eventName) {
+    case "BeforeModel":
+      return new BeforeModelHookOutput(data);
+    case "AfterModel":
+      return new AfterModelHookOutput(data);
+    case "BeforeToolSelection":
+      return new BeforeToolSelectionHookOutput(data);
+    default:
+      return new DefaultHookOutput(data);
+  }
+}
+var DefaultHookOutput = class {
+  continue;
+  stopReason;
+  suppressOutput;
+  systemMessage;
+  decision;
+  reason;
+  hookSpecificOutput;
+  constructor(data = {}) {
+    this.continue = data.continue;
+    this.stopReason = data.stopReason;
+    this.suppressOutput = data.suppressOutput;
+    this.systemMessage = data.systemMessage;
+    this.decision = data.decision;
+    this.reason = data.reason;
+    this.hookSpecificOutput = data.hookSpecificOutput;
+  }
+  /**
+   * Check if this output represents a blocking decision
+   */
+  isBlockingDecision() {
+    return this.decision === "block" || this.decision === "deny";
+  }
+  /**
+   * Check if this output requests to stop execution
+   */
+  shouldStopExecution() {
+    return this.continue === false;
+  }
+  /**
+   * Get the effective reason for blocking or stopping
+   */
+  getEffectiveReason() {
+    return this.reason || this.stopReason || "No reason provided";
+  }
+  /**
+   * Apply LLM request modifications (specific method for BeforeModel hooks)
+   */
+  applyLLMRequestModifications(target) {
+    return target;
+  }
+  /**
+   * Apply tool config modifications (specific method for BeforeToolSelection hooks)
+   */
+  applyToolConfigModifications(target) {
+    return target;
+  }
+  /**
+   * Get additional context for adding to responses
+   */
+  getAdditionalContext() {
+    if (this.hookSpecificOutput && "additionalContext" in this.hookSpecificOutput) {
+      const context2 = this.hookSpecificOutput["additionalContext"];
+      return typeof context2 === "string" ? context2 : void 0;
+    }
+    return void 0;
+  }
+  /**
+   * Check if execution should be blocked and return error info
+   */
+  getBlockingError() {
+    if (this.isBlockingDecision()) {
+      return {
+        blocked: true,
+        reason: this.getEffectiveReason()
+      };
+    }
+    return { blocked: false, reason: "" };
+  }
+};
+var BeforeToolHookOutput = class extends DefaultHookOutput {
+  /**
+   * Get the effective blocking reason, considering compatibility fields
+   */
+  getEffectiveReason() {
+    if (this.hookSpecificOutput) {
+      if ("permissionDecisionReason" in this.hookSpecificOutput) {
+        const compatReason = this.hookSpecificOutput["permissionDecisionReason"];
+        if (typeof compatReason === "string") {
+          return compatReason;
+        }
+      }
+    }
+    return super.getEffectiveReason();
+  }
+  /**
+   * Check if this output represents a blocking decision, considering compatibility fields
+   */
+  isBlockingDecision() {
+    if (this.hookSpecificOutput && "permissionDecision" in this.hookSpecificOutput) {
+      const compatDecision = this.hookSpecificOutput["permissionDecision"];
+      if (compatDecision === "block" || compatDecision === "deny") {
+        return true;
+      }
+    }
+    return super.isBlockingDecision();
+  }
+};
+var BeforeModelHookOutput = class extends DefaultHookOutput {
+  /**
+   * Get synthetic LLM response if provided by hook
+   */
+  getSyntheticResponse() {
+    if (this.hookSpecificOutput && "llm_response" in this.hookSpecificOutput) {
+      const hookResponse = this.hookSpecificOutput["llm_response"];
+      if (hookResponse) {
+        return defaultHookTranslator.fromHookLLMResponse(hookResponse);
+      }
+    }
+    return void 0;
+  }
+  /**
+   * Apply modifications to LLM request
+   */
+  applyLLMRequestModifications(target) {
+    if (this.hookSpecificOutput && "llm_request" in this.hookSpecificOutput) {
+      const hookRequest = this.hookSpecificOutput["llm_request"];
+      if (hookRequest) {
+        const sdkRequest = defaultHookTranslator.fromHookLLMRequest(hookRequest, target);
+        return {
+          ...target,
+          ...sdkRequest
+        };
+      }
+    }
+    return target;
+  }
+};
+var BeforeToolSelectionHookOutput = class extends DefaultHookOutput {
+  /**
+   * Apply tool configuration modifications
+   */
+  applyToolConfigModifications(target) {
+    if (this.hookSpecificOutput && "toolConfig" in this.hookSpecificOutput) {
+      const hookToolConfig = this.hookSpecificOutput["toolConfig"];
+      if (hookToolConfig) {
+        const sdkToolConfig = defaultHookTranslator.fromHookToolConfig(hookToolConfig);
+        return {
+          ...target,
+          tools: target.tools || [],
+          toolConfig: sdkToolConfig
+        };
+      }
+    }
+    return target;
+  }
+};
+var AfterModelHookOutput = class extends DefaultHookOutput {
+  /**
+   * Get modified LLM response if provided by hook
+   */
+  getModifiedResponse() {
+    if (this.hookSpecificOutput && "llm_response" in this.hookSpecificOutput) {
+      const hookResponse = this.hookSpecificOutput["llm_response"];
+      if (hookResponse?.candidates?.[0]?.content?.parts?.length) {
+        return defaultHookTranslator.fromHookLLMResponse(hookResponse);
+      }
+    }
+    if (this.shouldStopExecution()) {
+      const stopResponse = {
+        candidates: [
+          {
+            content: {
+              role: "model",
+              parts: [this.getEffectiveReason() || "Execution stopped by hook"]
+            },
+            finishReason: "STOP"
+          }
+        ]
+      };
+      return defaultHookTranslator.fromHookLLMResponse(stopResponse);
+    }
+    return void 0;
+  }
+};
+var NotificationType;
+(function(NotificationType2) {
+  NotificationType2["ToolPermission"] = "ToolPermission";
+})(NotificationType || (NotificationType = {}));
+var SessionStartSource;
+(function(SessionStartSource2) {
+  SessionStartSource2["Startup"] = "startup";
+  SessionStartSource2["Resume"] = "resume";
+  SessionStartSource2["Clear"] = "clear";
+  SessionStartSource2["Compress"] = "compress";
+})(SessionStartSource || (SessionStartSource = {}));
+var SessionEndReason;
+(function(SessionEndReason2) {
+  SessionEndReason2["Exit"] = "exit";
+  SessionEndReason2["Clear"] = "clear";
+  SessionEndReason2["Logout"] = "logout";
+  SessionEndReason2["PromptInputExit"] = "prompt_input_exit";
+  SessionEndReason2["Other"] = "other";
+})(SessionEndReason || (SessionEndReason = {}));
+var PreCompressTrigger;
+(function(PreCompressTrigger2) {
+  PreCompressTrigger2["Manual"] = "manual";
+  PreCompressTrigger2["Auto"] = "auto";
+})(PreCompressTrigger || (PreCompressTrigger = {}));
+
+// packages/core/dist/src/core/coreToolHookTriggers.js
+function toSerializableDetails(details) {
+  const base = {
+    type: details.type,
+    title: details.title
+  };
+  switch (details.type) {
+    case "edit":
+      return {
+        ...base,
+        fileName: details.fileName,
+        filePath: details.filePath,
+        fileDiff: details.fileDiff,
+        originalContent: details.originalContent,
+        newContent: details.newContent,
+        isModifying: details.isModifying
+      };
+    case "exec":
+      return {
+        ...base,
+        command: details.command,
+        rootCommand: details.rootCommand
+      };
+    case "mcp":
+      return {
+        ...base,
+        serverName: details.serverName,
+        toolName: details.toolName,
+        toolDisplayName: details.toolDisplayName
+      };
+    case "info":
+      return {
+        ...base,
+        prompt: details.prompt,
+        urls: details.urls
+      };
+    default:
+      return base;
+  }
+}
+function getNotificationMessage(confirmationDetails) {
+  switch (confirmationDetails.type) {
+    case "edit":
+      return `Tool ${confirmationDetails.title} requires editing`;
+    case "exec":
+      return `Tool ${confirmationDetails.title} requires execution`;
+    case "mcp":
+      return `Tool ${confirmationDetails.title} requires MCP`;
+    case "info":
+      return `Tool ${confirmationDetails.title} requires information`;
+    default:
+      return `Tool requires confirmation`;
+  }
+}
+async function fireToolNotificationHook(messageBus, confirmationDetails) {
+  try {
+    const message = getNotificationMessage(confirmationDetails);
+    const serializedDetails = toSerializableDetails(confirmationDetails);
+    await messageBus.request({
+      type: MessageBusType.HOOK_EXECUTION_REQUEST,
+      eventName: "Notification",
+      input: {
+        notification_type: NotificationType.ToolPermission,
+        message,
+        details: serializedDetails
+      }
+    }, MessageBusType.HOOK_EXECUTION_RESPONSE);
+  } catch (error2) {
+    debugLogger.warn(`Notification hook failed for ${confirmationDetails.title}:`, error2);
+  }
+}
+async function fireBeforeToolHook(messageBus, toolName, toolInput) {
+  try {
+    const response = await messageBus.request({
+      type: MessageBusType.HOOK_EXECUTION_REQUEST,
+      eventName: "BeforeTool",
+      input: {
+        tool_name: toolName,
+        tool_input: toolInput
+      }
+    }, MessageBusType.HOOK_EXECUTION_RESPONSE);
+    return response.output ? createHookOutput("BeforeTool", response.output) : void 0;
+  } catch (error2) {
+    debugLogger.warn(`BeforeTool hook failed for ${toolName}:`, error2);
+    return void 0;
+  }
+}
+async function fireAfterToolHook(messageBus, toolName, toolInput, toolResponse) {
+  try {
+    const response = await messageBus.request({
+      type: MessageBusType.HOOK_EXECUTION_REQUEST,
+      eventName: "AfterTool",
+      input: {
+        tool_name: toolName,
+        tool_input: toolInput,
+        tool_response: toolResponse
+      }
+    }, MessageBusType.HOOK_EXECUTION_RESPONSE);
+    return response.output ? createHookOutput("AfterTool", response.output) : void 0;
+  } catch (error2) {
+    debugLogger.warn(`AfterTool hook failed for ${toolName}:`, error2);
+    return void 0;
+  }
+}
+async function executeToolWithHooks(invocation, toolName, signal, messageBus, hooksEnabled, liveOutputCallback, shellExecutionConfig, setPidCallback) {
+  const toolInput = invocation.params || {};
+  if (hooksEnabled && messageBus) {
+    const beforeOutput = await fireBeforeToolHook(messageBus, toolName, toolInput);
+    const blockingError = beforeOutput?.getBlockingError();
+    if (blockingError?.blocked) {
+      return {
+        llmContent: `Tool execution blocked: ${blockingError.reason}`,
+        returnDisplay: `Tool execution blocked: ${blockingError.reason}`,
+        error: {
+          type: ToolErrorType.EXECUTION_FAILED,
+          message: blockingError.reason
+        }
+      };
+    }
+    if (beforeOutput?.shouldStopExecution()) {
+      const reason = beforeOutput.getEffectiveReason();
+      return {
+        llmContent: `Agent execution stopped by hook: ${reason}`,
+        returnDisplay: `Agent execution stopped by hook: ${reason}`,
+        error: {
+          type: ToolErrorType.EXECUTION_FAILED,
+          message: `Agent execution stopped: ${reason}`
+        }
+      };
+    }
+  }
+  let toolResult;
+  if (setPidCallback && invocation instanceof ShellToolInvocation) {
+    toolResult = await invocation.execute(signal, liveOutputCallback, shellExecutionConfig, setPidCallback);
+  } else {
+    toolResult = await invocation.execute(signal, liveOutputCallback, shellExecutionConfig);
+  }
+  if (hooksEnabled && messageBus) {
+    const afterOutput = await fireAfterToolHook(messageBus, toolName, toolInput, {
+      llmContent: toolResult.llmContent,
+      returnDisplay: toolResult.returnDisplay,
+      error: toolResult.error
+    });
+    if (afterOutput?.shouldStopExecution()) {
+      const reason = afterOutput.getEffectiveReason();
+      return {
+        llmContent: `Agent execution stopped by hook: ${reason}`,
+        returnDisplay: `Agent execution stopped by hook: ${reason}`,
+        error: {
+          type: ToolErrorType.EXECUTION_FAILED,
+          message: `Agent execution stopped: ${reason}`
+        }
+      };
+    }
+    const additionalContext = afterOutput?.getAdditionalContext();
+    if (additionalContext) {
+      if (typeof toolResult.llmContent === "string") {
+        toolResult.llmContent += "\n\n" + additionalContext;
+      } else if (Array.isArray(toolResult.llmContent)) {
+        toolResult.llmContent.push({ text: "\n\n" + additionalContext });
+      } else if (toolResult.llmContent) {
+        toolResult.llmContent = [
+          toolResult.llmContent,
+          { text: "\n\n" + additionalContext }
+        ];
+      } else {
+        toolResult.llmContent = additionalContext;
+      }
+    }
+  }
+  return toolResult;
+}
+
+// packages/core/dist/src/core/coreToolScheduler.js
 function createFunctionResponsePart(callId, toolName, output) {
   return {
     functionResponse: {
@@ -361908,6 +362525,11 @@ var CoreToolScheduler = class _CoreToolScheduler {
             this.setToolCallOutcome(reqInfo.callId, ToolConfirmationOutcome.ProceedAlways);
             this.setStatusInternal(reqInfo.callId, "scheduled", signal);
           } else {
+            const messageBus = this.config.getMessageBus();
+            const hooksEnabled = this.config.getEnableHooks();
+            if (hooksEnabled && messageBus) {
+              await fireToolNotificationHook(messageBus, confirmationDetails);
+            }
             if (confirmationDetails.type === "edit" && confirmationDetails.ideConfirmation) {
               confirmationDetails.ideConfirmation.then((resolution) => {
                 if (resolution.status === "accepted") {
@@ -362017,6 +362639,8 @@ var CoreToolScheduler = class _CoreToolScheduler {
           this.notifyToolCallsUpdate();
         } : void 0;
         const shellExecutionConfig = this.config.getShellExecutionConfig();
+        const hooksEnabled = this.config.getEnableHooks();
+        const messageBus = this.config.getMessageBus();
         await runInDevTraceSpan({
           name: toolCall.tool.name,
           attributes: { type: "tool-call" }
@@ -362030,9 +362654,9 @@ var CoreToolScheduler = class _CoreToolScheduler {
               this.toolCalls = this.toolCalls.map((tc) => tc.request.callId === callId && tc.status === "executing" ? { ...tc, pid } : tc);
               this.notifyToolCallsUpdate();
             };
-            promise = invocation.execute(signal, liveOutputCallback, shellExecutionConfig, setPidCallback);
+            promise = executeToolWithHooks(invocation, toolName, signal, messageBus, hooksEnabled, liveOutputCallback, shellExecutionConfig, setPidCallback);
           } else {
-            promise = invocation.execute(signal, liveOutputCallback, shellExecutionConfig);
+            promise = executeToolWithHooks(invocation, toolName, signal, messageBus, hooksEnabled, liveOutputCallback, shellExecutionConfig);
           }
           try {
             const toolResult = await promise;
@@ -362569,9 +363193,97 @@ async function openBrowserSecurely(url5) {
   }
 }
 
+// packages/core/dist/src/availability/policyCatalog.js
+var DEFAULT_ACTIONS = {
+  terminal: "prompt",
+  transient: "prompt",
+  not_found: "prompt",
+  unknown: "prompt"
+};
+var DEFAULT_STATE = {
+  terminal: "terminal",
+  transient: "terminal",
+  not_found: "terminal",
+  unknown: "terminal"
+};
+var DEFAULT_CHAIN = [
+  definePolicy({ model: DEFAULT_GEMINI_MODEL }),
+  definePolicy({ model: DEFAULT_GEMINI_FLASH_MODEL, isLastResort: true })
+];
+var PREVIEW_CHAIN = [
+  definePolicy({
+    model: PREVIEW_GEMINI_MODEL,
+    stateTransitions: { transient: "sticky_retry" }
+  }),
+  definePolicy({ model: DEFAULT_GEMINI_MODEL }),
+  definePolicy({ model: DEFAULT_GEMINI_FLASH_MODEL, isLastResort: true })
+];
+function getModelPolicyChain(options2) {
+  if (options2.previewEnabled) {
+    return cloneChain(PREVIEW_CHAIN);
+  }
+  return cloneChain(DEFAULT_CHAIN);
+}
+function createDefaultPolicy(model) {
+  return definePolicy({ model });
+}
+function definePolicy(config3) {
+  return {
+    model: config3.model,
+    isLastResort: config3.isLastResort,
+    actions: { ...DEFAULT_ACTIONS, ...config3.actions ?? {} },
+    stateTransitions: {
+      ...DEFAULT_STATE,
+      ...config3.stateTransitions ?? {}
+    }
+  };
+}
+function clonePolicy(policy) {
+  return {
+    ...policy,
+    actions: { ...policy.actions },
+    stateTransitions: { ...policy.stateTransitions }
+  };
+}
+function cloneChain(chain2) {
+  return chain2.map(clonePolicy);
+}
+
+// packages/core/dist/src/availability/policyHelpers.js
+function resolvePolicyChain(config3) {
+  const chain2 = getModelPolicyChain({
+    previewEnabled: !!config3.getPreviewFeatures(),
+    userTier: config3.getUserTier()
+  });
+  const activeModel = getEffectiveModel(config3.isInFallbackMode(), config3.getModel(), config3.getPreviewFeatures());
+  if (chain2.some((policy) => policy.model === activeModel)) {
+    return chain2;
+  }
+  return [createDefaultPolicy(activeModel), ...chain2];
+}
+function buildFallbackPolicyContext(chain2, failedModel) {
+  const index = chain2.findIndex((policy) => policy.model === failedModel);
+  if (index === -1) {
+    return { failedPolicy: void 0, candidates: chain2 };
+  }
+  return {
+    failedPolicy: chain2[index],
+    candidates: chain2.slice(index + 1)
+  };
+}
+function resolvePolicyAction(failureKind, policy) {
+  return policy.actions?.[failureKind] ?? "prompt";
+}
+
 // packages/core/dist/src/fallback/handler.js
 var UPGRADE_URL_PAGE = "https://goo.gle/set-up-gemini-code-assist";
 async function handleFallback(config3, failedModel, authType, error2) {
+  if (config3.isModelAvailabilityServiceEnabled()) {
+    return handlePolicyDrivenFallback(config3, failedModel, authType, error2);
+  }
+  return legacyHandleFallback(config3, failedModel, authType, error2);
+}
+async function legacyHandleFallback(config3, failedModel, authType, error2) {
   if (authType !== AuthType2.LOGIN_WITH_GOOGLE)
     return null;
   if (error2 instanceof ModelNotFoundError && failedModel !== PREVIEW_GEMINI_MODEL) {
@@ -362590,30 +363302,56 @@ async function handleFallback(config3, failedModel, authType, error2) {
     return null;
   try {
     const intent = await fallbackModelHandler(failedModel, fallbackModel, error2);
-    switch (intent) {
-      case "retry_always":
-        if (shouldActivatePreviewFallback) {
-          activatePreviewModelFallbackMode(config3);
-        } else {
-          activateFallbackMode(config3, authType);
-        }
-        return true;
-      // Signal retryWithBackoff to continue.
-      case "retry_once":
-        return true;
-      case "stop":
-        activateFallbackMode(config3, authType);
-        return false;
-      case "retry_later":
-        return false;
-      case "upgrade":
-        await handleUpgrade();
-        return false;
-      default:
-        throw new Error(`Unexpected fallback intent received from fallbackModelHandler: "${intent}"`);
-    }
+    return await processIntent(config3, intent, failedModel, fallbackModel, authType, error2);
+  } catch (handlerError) {
+    console.error("Fallback UI handler failed:", handlerError);
+    return null;
+  }
+}
+async function handlePolicyDrivenFallback(config3, failedModel, authType, error2) {
+  if (authType !== AuthType2.LOGIN_WITH_GOOGLE) {
+    return null;
+  }
+  const chain2 = resolvePolicyChain(config3);
+  const { failedPolicy, candidates } = buildFallbackPolicyContext(chain2, failedModel);
+  if (!candidates.length) {
+    return null;
+  }
+  const availability = config3.getModelAvailabilityService();
+  const selection = availability.selectFirstAvailable(candidates.map((policy) => policy.model));
+  let lastResortPolicy = candidates.find((policy) => policy.isLastResort);
+  if (!lastResortPolicy) {
+    debugLogger.warn("No isLastResort policy found in candidates, using last candidate as fallback.");
+    lastResortPolicy = candidates[candidates.length - 1];
+  }
+  const fallbackModel = selection.selectedModel ?? lastResortPolicy.model;
+  const selectedPolicy = candidates.find((policy) => policy.model === fallbackModel) ?? lastResortPolicy;
+  if (!fallbackModel || fallbackModel === failedModel) {
+    return null;
+  }
+  const failureKind = classifyFailureKind(error2);
+  const action = resolvePolicyAction(failureKind, selectedPolicy);
+  if (action === "silent") {
+    return processIntent(config3, "retry_always", failedModel, fallbackModel, authType, error2);
+  }
+  const recommendation = {
+    ...selection,
+    selectedModel: fallbackModel,
+    action,
+    failureKind,
+    failedPolicy,
+    selectedPolicy
+  };
+  void recommendation;
+  const handler = config3.getFallbackModelHandler();
+  if (typeof handler !== "function") {
+    return null;
+  }
+  try {
+    const intent = await handler(failedModel, fallbackModel, error2);
+    return await processIntent(config3, intent, failedModel, fallbackModel, authType);
   } catch (handlerError) {
-    debugLogger.error("Fallback UI handler failed:", handlerError);
+    debugLogger.error("Fallback handler failed:", handlerError);
     return null;
   }
 }
@@ -362624,6 +363362,29 @@ async function handleUpgrade() {
     debugLogger.warn("Failed to open browser automatically:", getErrorMessage(error2));
   }
 }
+async function processIntent(config3, intent, failedModel, fallbackModel, authType, error2) {
+  switch (intent) {
+    case "retry_always":
+      if (failedModel === PREVIEW_GEMINI_MODEL && !(error2 instanceof TerminalQuotaError)) {
+        activatePreviewModelFallbackMode(config3);
+      } else {
+        activateFallbackMode(config3, authType);
+      }
+      return true;
+    case "retry_once":
+      return true;
+    case "stop":
+      activateFallbackMode(config3, authType);
+      return false;
+    case "retry_later":
+      return false;
+    case "upgrade":
+      await handleUpgrade();
+      return false;
+    default:
+      throw new Error(`Unexpected fallback intent received from fallbackModelHandler: "${intent}"`);
+  }
+}
 function activateFallbackMode(config3, authType) {
   if (!config3.isInFallbackMode()) {
     config3.setFallbackMode(true);
@@ -362638,12 +363399,154 @@ function activatePreviewModelFallbackMode(config3) {
     config3.setPreviewModelFallbackMode(true);
   }
 }
+function classifyFailureKind(error2) {
+  if (error2 instanceof TerminalQuotaError) {
+    return "terminal";
+  }
+  if (error2 instanceof RetryableQuotaError) {
+    return "transient";
+  }
+  if (error2 instanceof ModelNotFoundError) {
+    return "not_found";
+  }
+  return "unknown";
+}
 
 // packages/core/dist/src/core/geminiRequest.js
 function partListUnionToString(value) {
   return partToString(value, { verbose: true });
 }
 
+// packages/core/dist/src/utils/tokenCalculation.js
+var ASCII_TOKENS_PER_CHAR = 0.25;
+var NON_ASCII_TOKENS_PER_CHAR = 1.3;
+function estimateTokenCountSync(parts2) {
+  let totalTokens = 0;
+  for (const part of parts2) {
+    if (typeof part.text === "string") {
+      for (const char of part.text) {
+        if (char.codePointAt(0) <= 127) {
+          totalTokens += ASCII_TOKENS_PER_CHAR;
+        } else {
+          totalTokens += NON_ASCII_TOKENS_PER_CHAR;
+        }
+      }
+    } else {
+      totalTokens += JSON.stringify(part).length / 4;
+    }
+  }
+  return Math.floor(totalTokens);
+}
+async function calculateRequestTokenCount(request3, contentGenerator, model) {
+  const parts2 = Array.isArray(request3) ? request3.map((p) => typeof p === "string" ? { text: p } : p) : typeof request3 === "string" ? [{ text: request3 }] : [request3];
+  const hasMedia = parts2.some((p) => {
+    const isMedia = "inlineData" in p || "fileData" in p;
+    return isMedia;
+  });
+  if (hasMedia) {
+    try {
+      const response = await contentGenerator.countTokens({
+        model,
+        contents: [{ role: "user", parts: parts2 }]
+      });
+      return response.totalTokens ?? 0;
+    } catch {
+      return estimateTokenCountSync(parts2);
+    }
+  }
+  return estimateTokenCountSync(parts2);
+}
+
+// packages/core/dist/src/core/geminiChatHookTriggers.js
+async function fireBeforeModelHook(messageBus, llmRequest) {
+  try {
+    const response = await messageBus.request({
+      type: MessageBusType.HOOK_EXECUTION_REQUEST,
+      eventName: "BeforeModel",
+      input: {
+        llm_request: llmRequest
+      }
+    }, MessageBusType.HOOK_EXECUTION_RESPONSE);
+    const beforeResultFinalOutput = response.output ? createHookOutput("BeforeModel", response.output) : void 0;
+    const hookOutput = beforeResultFinalOutput;
+    const blockingError = hookOutput?.getBlockingError();
+    if (blockingError?.blocked || hookOutput?.shouldStopExecution()) {
+      const beforeModelOutput = hookOutput;
+      const syntheticResponse = beforeModelOutput.getSyntheticResponse();
+      const reason = hookOutput?.getEffectiveReason() || "Model call blocked by hook";
+      return {
+        blocked: true,
+        reason,
+        syntheticResponse
+      };
+    }
+    if (hookOutput) {
+      const beforeModelOutput = hookOutput;
+      const modifiedRequest = beforeModelOutput.applyLLMRequestModifications(llmRequest);
+      return {
+        blocked: false,
+        modifiedConfig: modifiedRequest.config,
+        modifiedContents: modifiedRequest.contents
+      };
+    }
+    return { blocked: false };
+  } catch (error2) {
+    debugLogger.warn(`BeforeModel hook failed:`, error2);
+    return { blocked: false };
+  }
+}
+async function fireBeforeToolSelectionHook(messageBus, llmRequest) {
+  try {
+    const response = await messageBus.request({
+      type: MessageBusType.HOOK_EXECUTION_REQUEST,
+      eventName: "BeforeToolSelection",
+      input: {
+        llm_request: llmRequest
+      }
+    }, MessageBusType.HOOK_EXECUTION_RESPONSE);
+    const toolSelectionResultFinalOutput = response.output ? createHookOutput("BeforeToolSelection", response.output) : void 0;
+    if (toolSelectionResultFinalOutput) {
+      const beforeToolSelectionOutput = toolSelectionResultFinalOutput;
+      const modifiedConfig = beforeToolSelectionOutput.applyToolConfigModifications({
+        toolConfig: llmRequest.config?.toolConfig,
+        tools: llmRequest.config?.tools
+      });
+      return {
+        toolConfig: modifiedConfig.toolConfig,
+        tools: modifiedConfig.tools
+      };
+    }
+    return {};
+  } catch (error2) {
+    debugLogger.warn(`BeforeToolSelection hook failed:`, error2);
+    return {};
+  }
+}
+async function fireAfterModelHook(messageBus, originalRequest, chunk2) {
+  try {
+    const response = await messageBus.request({
+      type: MessageBusType.HOOK_EXECUTION_REQUEST,
+      eventName: "AfterModel",
+      input: {
+        llm_request: originalRequest,
+        llm_response: chunk2
+      }
+    }, MessageBusType.HOOK_EXECUTION_RESPONSE);
+    const afterResultFinalOutput = response.output ? createHookOutput("AfterModel", response.output) : void 0;
+    if (afterResultFinalOutput) {
+      const afterModelOutput = afterResultFinalOutput;
+      const modifiedResponse = afterModelOutput.getModifiedResponse();
+      if (modifiedResponse) {
+        return { response: modifiedResponse };
+      }
+    }
+    return { response: chunk2 };
+  } catch (error2) {
+    debugLogger.warn(`AfterModel hook failed:`, error2);
+    return { response: chunk2 };
+  }
+}
+
 // packages/core/dist/src/core/geminiChat.js
 var StreamEventType;
 (function(StreamEventType2) {
@@ -362746,7 +363649,7 @@ var GeminiChat = class {
     validateHistory2(history);
     this.chatRecordingService = new ChatRecordingService(config3);
     this.chatRecordingService.initialize(resumedSessionData);
-    this.lastPromptTokenCount = Math.ceil(JSON.stringify(this.history).length / 4);
+    this.lastPromptTokenCount = estimateTokenCountSync(this.history.flatMap((c4) => c4.parts || []));
   }
   setSystemInstruction(sysInstr) {
     this.systemInstruction = sysInstr;
@@ -362798,12 +363701,11 @@ var GeminiChat = class {
     }
     this.history.push(userContent);
     const requestContents = this.getHistory(true);
-    const self2 = this;
-    return async function* () {
+    const streamWithRetries = async function* () {
       try {
         let lastError = new Error("Request failed after all retries.");
         let maxAttempts = INVALID_CONTENT_RETRY_OPTIONS.maxAttempts;
-        if (self2.config.isPreviewModelFallbackMode() && model === PREVIEW_GEMINI_MODEL) {
+        if (this.config.isPreviewModelFallbackMode() && model === PREVIEW_GEMINI_MODEL) {
           maxAttempts = 1;
         }
         for (let attempt = 0; attempt < maxAttempts; attempt++) {
@@ -362814,7 +363716,7 @@ var GeminiChat = class {
             if (attempt > 0) {
               generateContentConfig.temperature = 1;
             }
-            const stream3 = await self2.makeApiCallAndProcessStream(model, generateContentConfig, requestContents, prompt_id);
+            const stream3 = await this.makeApiCallAndProcessStream(model, generateContentConfig, requestContents, prompt_id);
             for await (const chunk2 of stream3) {
               yield { type: StreamEventType.CHUNK, value: chunk2 };
             }
@@ -362825,7 +363727,7 @@ var GeminiChat = class {
             const isContentError = error2 instanceof InvalidStreamError;
             if (isContentError && isGemini2Model(model)) {
               if (attempt < maxAttempts - 1) {
-                logContentRetry(self2.config, new ContentRetryEvent(attempt, error2.type, INVALID_CONTENT_RETRY_OPTIONS.initialDelayMs, model));
+                logContentRetry(this.config, new ContentRetryEvent(attempt, error2.type, INVALID_CONTENT_RETRY_OPTIONS.initialDelayMs, model));
                 await new Promise((res) => setTimeout(res, INVALID_CONTENT_RETRY_OPTIONS.initialDelayMs * (attempt + 1)));
                 continue;
               }
@@ -362835,23 +363737,27 @@ var GeminiChat = class {
         }
         if (lastError) {
           if (lastError instanceof InvalidStreamError && isGemini2Model(model)) {
-            logContentRetryFailure(self2.config, new ContentRetryFailureEvent(maxAttempts, lastError.type, model));
+            logContentRetryFailure(this.config, new ContentRetryFailureEvent(maxAttempts, lastError.type, model));
           }
           throw lastError;
         } else {
-          if (model === PREVIEW_GEMINI_MODEL && !self2.config.isPreviewModelBypassMode()) {
-            self2.config.setPreviewModelFallbackMode(false);
+          if (model === PREVIEW_GEMINI_MODEL && !this.config.isPreviewModelBypassMode()) {
+            this.config.setPreviewModelFallbackMode(false);
           }
         }
       } finally {
         streamDoneResolver();
       }
-    }();
+    };
+    return streamWithRetries.call(this);
   }
   async makeApiCallAndProcessStream(model, generateContentConfig, requestContents, prompt_id) {
     let effectiveModel = model;
     const contentsForPreviewModel = this.ensureActiveLoopHasThoughtSignatures(requestContents);
-    const apiCall = () => {
+    let lastModelToUse = model;
+    let lastConfig = generateContentConfig;
+    let lastContentsToUse = requestContents;
+    const apiCall = async () => {
       let modelToUse = getEffectiveModel(this.config.isInFallbackMode(), model, this.config.getPreviewFeatures());
       if (this.config.isPreviewModelBypassMode() && modelToUse === PREVIEW_GEMINI_MODEL) {
         modelToUse = DEFAULT_GEMINI_MODEL;
@@ -362877,9 +363783,49 @@ var GeminiChat = class {
         };
         delete config3.thinkingConfig?.thinkingLevel;
       }
+      let contentsToUse = modelToUse === PREVIEW_GEMINI_MODEL ? contentsForPreviewModel : requestContents;
+      const hooksEnabled = this.config.getEnableHooks();
+      const messageBus = this.config.getMessageBus();
+      if (hooksEnabled && messageBus) {
+        const beforeModelResult = await fireBeforeModelHook(messageBus, {
+          model: modelToUse,
+          config: config3,
+          contents: contentsToUse
+        });
+        if (beforeModelResult.blocked) {
+          const syntheticResponse = beforeModelResult.syntheticResponse;
+          if (syntheticResponse) {
+            return async function* () {
+              yield syntheticResponse;
+            }();
+          }
+          return async function* () {
+          }();
+        }
+        if (beforeModelResult.modifiedConfig) {
+          Object.assign(config3, beforeModelResult.modifiedConfig);
+        }
+        if (beforeModelResult.modifiedContents && Array.isArray(beforeModelResult.modifiedContents)) {
+          contentsToUse = beforeModelResult.modifiedContents;
+        }
+        const toolSelectionResult = await fireBeforeToolSelectionHook(messageBus, {
+          model: modelToUse,
+          config: config3,
+          contents: contentsToUse
+        });
+        if (toolSelectionResult.toolConfig) {
+          config3.toolConfig = toolSelectionResult.toolConfig;
+        }
+        if (toolSelectionResult.tools && Array.isArray(toolSelectionResult.tools)) {
+          config3.tools = toolSelectionResult.tools;
+        }
+      }
+      lastModelToUse = modelToUse;
+      lastConfig = config3;
+      lastContentsToUse = contentsToUse;
       return this.config.getContentGenerator().generateContentStream({
         model: modelToUse,
-        contents: modelToUse === PREVIEW_GEMINI_MODEL ? contentsForPreviewModel : requestContents,
+        contents: contentsToUse,
         config: config3
       }, prompt_id);
     };
@@ -362891,7 +363837,12 @@ var GeminiChat = class {
       signal: generateContentConfig.abortSignal,
       maxAttempts: this.config.isPreviewModelFallbackMode() && model === PREVIEW_GEMINI_MODEL ? 1 : void 0
     });
-    return this.processStreamResponse(effectiveModel, streamResponse);
+    const originalRequest = {
+      model: lastModelToUse,
+      config: lastConfig,
+      contents: lastContentsToUse
+    };
+    return this.processStreamResponse(effectiveModel, streamResponse, originalRequest);
   }
   /**
    * Returns the chat history.
@@ -363015,7 +363966,7 @@ This error was probably caused by cyclic schema references in one of the followi
       }
     }
   }
-  async *processStreamResponse(model, streamResponse) {
+  async *processStreamResponse(model, streamResponse, originalRequest) {
     const modelResponseParts = [];
     let hasToolCall = false;
     let finishReason;
@@ -363042,7 +363993,14 @@ This error was probably caused by cyclic schema references in one of the followi
           this.lastPromptTokenCount = chunk2.usageMetadata.promptTokenCount;
         }
       }
-      yield chunk2;
+      const hooksEnabled = this.config.getEnableHooks();
+      const messageBus = this.config.getMessageBus();
+      if (hooksEnabled && messageBus && originalRequest && chunk2) {
+        const hookResult = await fireAfterModelHook(messageBus, originalRequest, chunk2);
+        yield hookResult.response;
+      } else {
+        yield chunk2;
+      }
     }
     const consolidatedParts = [];
     for (const part of modelResponseParts) {
@@ -363643,15 +364601,18 @@ function getCoreSystemPrompt(config3, userMemory) {
     }
   }
   const desiredModel = getEffectiveModel(config3.isInFallbackMode(), config3.getModel(), config3.getPreviewFeatures());
-  const useChattySystemPrompt = desiredModel === PREVIEW_GEMINI_MODEL;
+  const isGemini3 = desiredModel === PREVIEW_GEMINI_MODEL;
+  const mandatesVariant = isGemini3 ? `
+- **Do not call tools in silence:** You must provide to the user very short and concise natural explanation (one sentence) before calling tools.` : ``;
   const enableCodebaseInvestigator = config3.getToolRegistry().getAllToolNames().includes(CodebaseInvestigatorAgent.name);
   const enableWriteTodosTool = config3.getToolRegistry().getAllToolNames().includes(WriteTodosTool.Name);
+  const interactiveMode = config3.isInteractiveShellEnabled();
   let basePrompt;
   if (systemMdEnabled) {
     basePrompt = fs46.readFileSync(systemMdPath, "utf8");
   } else {
     const promptConfig = {
-      preamble: `You are an interactive CLI agent specializing in software engineering tasks. Your primary goal is to help users safely and efficiently, adhering strictly to the following instructions and utilizing your available tools.`,
+      preamble: `You are ${interactiveMode ? "an interactive " : "a non-interactive "}CLI agent specializing in software engineering tasks. Your primary goal is to help users safely and efficiently, adhering strictly to the following instructions and utilizing your available tools.`,
       coreMandates: `
 # Core Mandates
 
@@ -363661,9 +364622,10 @@ function getCoreSystemPrompt(config3, userMemory) {
 - **Idiomatic Changes:** When editing, understand the local context (imports, functions/classes) to ensure your changes integrate naturally and idiomatically.
 - **Comments:** Add code comments sparingly. Focus on *why* something is done, especially for complex logic, rather than *what* is done. Only add high-value comments if necessary for clarity or if requested by the user. Do not edit comments that are separate from the code you are changing. *NEVER* talk to the user or describe your changes through comments.
 - **Proactiveness:** Fulfill the user's request thoroughly. When adding features or fixing bugs, this includes adding tests to ensure quality. Consider all created files, especially tests, to be permanent artifacts unless the user says otherwise.
-- **Confirm Ambiguity/Expansion:** Do not take significant actions beyond the clear scope of the request without confirming with the user. If asked *how* to do something, explain first, don't just do it.
+- ${interactiveMode ? `**Confirm Ambiguity/Expansion:** Do not take significant actions beyond the clear scope of the request without confirming with the user. If asked *how* to do something, explain first, don't just do it.` : `**Handle Ambiguity/Expansion:** Do not take significant actions beyond the clear scope of the request.`}
 - **Explaining Changes:** After completing a code modification or file operation *do not* provide summaries unless asked.
-- **Do Not revert changes:** Do not revert changes to the codebase unless asked to do so by the user. Only revert changes made by you if they have resulted in an error or if the user has explicitly asked you to revert the changes.`,
+- **Do Not revert changes:** Do not revert changes to the codebase unless asked to do so by the user. Only revert changes made by you if they have resulted in an error or if the user has explicitly asked you to revert the changes.${mandatesVariant}${!interactiveMode ? `
+  - **Continue the work** You are not to interact with the user. Do your best to complete the task at hand, using your best judgement and avoid asking user for any additional information.` : ""}`,
       primaryWorkflows_prefix: `
 # Primary Workflows
 
@@ -363696,14 +364658,14 @@ When requested to perform tasks like fixing bugs, adding features, refactoring,
       primaryWorkflows_suffix: `3. **Implement:** Use the available tools (e.g., '${EDIT_TOOL_NAME}', '${WRITE_FILE_TOOL_NAME}' '${SHELL_TOOL_NAME}' ...) to act on the plan, strictly adhering to the project's established conventions (detailed under 'Core 
 Mandates').
 4. **Verify (Tests):** If applicable and feasible, verify the changes using the project's testing procedures. Identify the correct test commands and frameworks by examining 'README' files, build/package configuration (e.g., 'package.json'), or existing test execution patterns. NEVER assume standard test commands.
-5. **Verify (Standards):** VERY IMPORTANT: After making code changes, execute the project-specific build, linting and type-checking commands (e.g., 'tsc', 'npm run lint', 'ruff check .') that you have identified for this project (or obtained from the user). This ensures code quality and adherence to standards. If unsure about these commands, you can ask the user if they'd like you to run them and if so how to.
+5. **Verify (Standards):** VERY IMPORTANT: After making code changes, execute the project-specific build, linting and type-checking commands (e.g., 'tsc', 'npm run lint', 'ruff check .') that you have identified for this project (or obtained from the user). This ensures code quality and adherence to standards.${interactiveMode ? " If unsure about these commands, you can ask the user if they'd like you to run them and if so how to." : ""}
 6. **Finalize:** After all verification passes, consider the task complete. Do not remove or revert any changes or created files (like tests). Await the user's next instruction.
 
 ## New Applications
 
 **Goal:** Autonomously implement and deliver a visually appealing, substantially complete, and functional prototype. Utilize all tools at your disposal to implement the application. Some tools you may especially find useful are '${WRITE_FILE_TOOL_NAME}', '${EDIT_TOOL_NAME}' and '${SHELL_TOOL_NAME}'.
 
-1. **Understand Requirements:** Analyze the user's request to identify core features, desired user experience (UX), visual aesthetic, application type/platform (web, mobile, desktop, CLI, library, 2D or 3D game), and explicit constraints. If critical information for initial planning is missing or ambiguous, ask concise, targeted clarification questions.
+1. **Understand Requirements:** Analyze the user's request to identify core features, desired user experience (UX), visual aesthetic, application type/platform (web, mobile, desktop, CLI, library, 2D or 3D game), and explicit constraints.${interactiveMode ? " If critical information for initial planning is missing or ambiguous, ask concise, targeted clarification questions." : ""}
 2. **Propose Plan:** Formulate an internal development plan. Present a clear, concise, high-level summary to the user. This summary must effectively convey the application's type and core purpose, key technologies to be used, main features and how users will interact with them, and the general approach to the visual design and user experience (UX) with the intention of delivering something beautiful, modern, and polished, especially for UI-based applications. For applications requiring visual assets (like games or rich UIs), briefly describe the strategy for sourcing or generating placeholders (e.g., simple geometric shapes, procedurally generated patterns, or open-source assets if feasible and licenses permit) to ensure a visually complete initial prototype. Ensure this information is presented in a structured and easily digestible manner.
   - When key technologies aren't specified, prefer the following:
   - **Websites (Frontend):** React (JavaScript/TypeScript) or Angular with Bootstrap CSS, incorporating Material Design principles for UI/UX.
@@ -363713,10 +364675,17 @@ Mandates').
   - **Mobile App:** Compose Multiplatform (Kotlin Multiplatform) or Flutter (Dart) using Material Design libraries and principles, when sharing code between Android and iOS. Jetpack Compose (Kotlin JVM) with Material Design principles or SwiftUI (Swift) for native apps targeted at either Android or iOS, respectively.
   - **3d Games:** HTML/CSS/JavaScript with Three.js.
   - **2d Games:** HTML/CSS/JavaScript.
-3. **User Approval:** Obtain user approval for the proposed plan.
+${function() {
+        if (interactiveMode) {
+          return `3. **User Approval:** Obtain user approval for the proposed plan.
 4. **Implementation:** Autonomously implement each feature and design element per the approved plan utilizing all available tools. When starting ensure you scaffold the application using '${SHELL_TOOL_NAME}' for commands like 'npm init', 'npx create-react-app'. Aim for full scope completion. Proactively create or source necessary placeholder assets (e.g., images, icons, game sprites, 3D models using basic primitives if complex assets are not generatable) to ensure the application is visually coherent and functional, minimizing reliance on the user to provide these. If the model can generate simple assets (e.g., a uniformly colored square sprite, a simple 3D cube), it should do so. Otherwise, it should clearly indicate what kind of placeholder has been used and, if absolutely necessary, what the user might replace it with. Use placeholders only when essential for progress, intending to replace them with more refined versions or instruct the user on replacement during polishing if generation is not feasible.
 5. **Verify:** Review work against the original request, the approved plan. Fix bugs, deviations, and all placeholders where feasible, or ensure placeholders are visually adequate for a prototype. Ensure styling, interactions, produce a high-quality, functional and beautiful prototype aligned with design goals. Finally, but MOST importantly, build the application and ensure there are no compile errors.
-6. **Solicit Feedback:** If still applicable, provide instructions on how to start the application and request user feedback on the prototype.`,
+6. **Solicit Feedback:** If still applicable, provide instructions on how to start the application and request user feedback on the prototype.`;
+        } else {
+          return `3. **Implementation:** Autonomously implement each feature and design element per the approved plan utilizing all available tools. When starting ensure you scaffold the application using '${SHELL_TOOL_NAME}' for commands like 'npm init', 'npx create-react-app'. Aim for full scope completion. Proactively create or source necessary placeholder assets (e.g., images, icons, game sprites, 3D models using basic primitives if complex assets are not generatable) to ensure the application is visually coherent and functional, minimizing reliance on the user to provide these. If the model can generate simple assets (e.g., a uniformly colored square sprite, a simple 3D cube), it should do so. Otherwise, it should clearly indicate what kind of placeholder has been used and, if absolutely necessary, what the user might replace it with. Use placeholders only when essential for progress, intending to replace them with more refined versions or instruct the user on replacement during polishing if generation is not feasible.
+4. **Verify:** Review work against the original request, the approved plan. Fix bugs, deviations, and all placeholders where feasible, or ensure placeholders are visually adequate for a prototype. Ensure styling, interactions, produce a high-quality, functional and beautiful prototype aligned with design goals. Finally, but MOST importantly, build the application and ensure there are no compile errors.`;
+        }
+      }()}`,
       operationalGuidelines: `
 # Operational Guidelines
 ${function() {
@@ -363740,12 +364709,12 @@ IT IS CRITICAL TO FOLLOW THESE GUIDELINES TO AVOID EXCESSIVE TOKEN CONSUMPTION.
 ## Tone and Style (CLI Interaction)
 - **Concise & Direct:** Adopt a professional, direct, and concise tone suitable for a CLI environment.
 - **Minimal Output:** Aim for fewer than 3 lines of text output (excluding tool use/code generation) per response whenever practical. Focus strictly on the user's query.
-- **Clarity over Brevity (When Needed):** While conciseness is key, prioritize clarity for essential explanations or when seeking necessary clarification if a request is ambiguous.
-${function() {
-        if (useChattySystemPrompt) {
+- **Clarity over Brevity (When Needed):** While conciseness is key, prioritize clarity for essential explanations or when seeking necessary clarification if a request is ambiguous.${function() {
+        if (isGemini3) {
           return "";
         } else {
-          return '- **No Chitchat:** Avoid conversational filler, preambles ("Okay, I will now..."), or postambles ("I have finished the changes..."). Get straight to the action or answer.';
+          return `
+- **No Chitchat:** Avoid conversational filler, preambles ("Okay, I will now..."), or postambles ("I have finished the changes..."). Get straight to the action or answer.`;
         }
       }()}
 - **Formatting:** Use GitHub-flavored Markdown. Responses will be rendered in monospace.
@@ -363759,15 +364728,16 @@ ${function() {
 ## Tool Usage
 - **Parallelism:** Execute multiple independent tool calls in parallel when feasible (i.e. searching the codebase).
 - **Command Execution:** Use the '${SHELL_TOOL_NAME}' tool for running shell commands, remembering the safety rule to explain modifying commands first.
-- **Background Processes:** Use background processes (via \`&\`) for commands that are unlikely to stop on their own, e.g. \`node server.js &\`. If unsure, ask the user.
 ${function() {
-        if (!config3.isInteractiveShellEnabled()) {
-          return `- **Interactive Commands:** Some commands are interactive, meaning they can accept user input during their execution (e.g. ssh, vim). Only execute non-interactive commands. Use non-interactive versions of commands (e.g. \`npm init -y\` instead of \`npm init\`) when available. Interactive shell commands are not supported and may cause hangs until canceled by the user.`;
+        if (interactiveMode) {
+          return `- **Background Processes:** Use background processes (via \`&\`) for commands that are unlikely to stop on their own, e.g. \`node server.js &\`. If unsure, ask the user.
+- **Interactive Commands:** Prefer non-interactive commands when it makes sense; however, some commands are only interactive and expect user input during their execution (e.g. ssh, vim). If you choose to execute an interactive command consider letting the user know they can press \`ctrl + f\` to focus into the shell to provide input.`;
         } else {
-          return `- **Interactive Commands:** Prefer non-interactive commands when it makes sense; however, some commands are only interactive and expect user input during their execution (e.g. ssh, vim). If you choose to execute an interactive command consider letting the user know they can press \`ctrl + f\` to focus into the shell to provide input.`;
+          return `- **Background Processes:** Use background processes (via \`&\`) for commands that are unlikely to stop on their own, e.g. \`node server.js &\`.
+- **Interactive Commands:** Only execute non-interactive commands.`;
         }
       }()}
-- **Remembering Facts:** Use the '${MEMORY_TOOL_NAME}' tool to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information. If unsure whether to save something, you can ask the user, "Should I remember that for you?"
+- **Remembering Facts:** Use the '${MEMORY_TOOL_NAME}' tool to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information.${interactiveMode ? ` If unsure whether to save something, you can ask the user, "Should I remember that for you?"` : ""}
 - **Respect User Confirmations:** Most tool calls (also denoted as 'function calls') will first require confirmation from the user, where they will either approve or cancel the function call. If a user cancels a function call, respect their choice and do _not_ try to make the function call again. It is okay to request the tool call again _only_ if the user requests that same tool call on a subsequent prompt. When a user cancels a function call, assume best intentions from the user and consider inquiring if they prefer any alternative paths forward.
 
 ## Interaction Details
@@ -363807,8 +364777,8 @@ ${function() {
   - \`git log -n 3\` to review recent commit messages and match their style (verbosity, formatting, signature line, etc.)
 - Combine shell commands whenever possible to save time/steps, e.g. \`git status && git diff HEAD && git log -n 3\`.
 - Always propose a draft commit message. Never just ask the user to give you the full commit message.
-- Prefer commit messages that are clear, concise, and focused more on "why" and less on "what".
-- Keep the user informed and ask for clarification or confirmation where needed.
+- Prefer commit messages that are clear, concise, and focused more on "why" and less on "what".${interactiveMode ? `
+- Keep the user informed and ask for clarification or confirmation where needed.` : ""}
 - After each commit, confirm that it was successful by running \`git status\`.
 - If a commit fails, never attempt to work around the issues without being asked to do so.
 - Never push changes to a remote repository without being asked explicitly by the user.
@@ -364476,7 +365446,7 @@ var ChatCompressionService = class {
       ...historyToKeep
     ];
     const fullNewHistory = await getInitialChatHistory(config3, extraHistory);
-    const newTokenCount = Math.floor(fullNewHistory.reduce((total, content) => total + JSON.stringify(content).length, 0) / 4);
+    const newTokenCount = await calculateRequestTokenCount(fullNewHistory.flatMap((c4) => c4.parts || []), config3.getContentGenerator(), model);
     logChatCompression(config3, makeChatCompressionEvent({
       tokens_before: originalTokenCount,
       tokens_after: newTokenCount
@@ -364503,405 +365473,6 @@ var ChatCompressionService = class {
   }
 };
 
-// packages/core/dist/src/hooks/hookTranslator.js
-var HookTranslator = class {
-};
-function hasTextProperty(value) {
-  return typeof value === "object" && value !== null && "text" in value && typeof value.text === "string";
-}
-function isContentWithParts(content) {
-  return typeof content === "object" && content !== null && "role" in content && "parts" in content;
-}
-function extractGenerationConfig(request3) {
-  if (request3.config && typeof request3.config === "object") {
-    const config3 = request3.config;
-    return {
-      temperature: config3.temperature,
-      maxOutputTokens: config3.maxOutputTokens,
-      topP: config3.topP,
-      topK: config3.topK
-    };
-  }
-  return void 0;
-}
-var HookTranslatorGenAIv1 = class extends HookTranslator {
-  /**
-   * Convert genai SDK GenerateContentParameters to stable LLMRequest
-   *
-   * Note: This implementation intentionally extracts only text content from parts.
-   * Non-text parts (images, function calls, etc.) are filtered out in v1 to provide
-   * a simplified, stable interface for hooks. This allows hooks to focus on text
-   * manipulation without needing to handle complex multimodal content.
-   * Future versions may expose additional content types if needed.
-   */
-  toHookLLMRequest(sdkRequest) {
-    const messages = [];
-    if (sdkRequest.contents) {
-      const contents = Array.isArray(sdkRequest.contents) ? sdkRequest.contents : [sdkRequest.contents];
-      for (const content of contents) {
-        if (typeof content === "string") {
-          messages.push({
-            role: "user",
-            content
-          });
-        } else if (isContentWithParts(content)) {
-          const role = content.role === "model" ? "model" : content.role === "system" ? "system" : "user";
-          const parts2 = Array.isArray(content.parts) ? content.parts : [content.parts];
-          const textContent2 = parts2.filter(hasTextProperty).map((part) => part.text).join("");
-          if (textContent2) {
-            messages.push({
-              role,
-              content: textContent2
-            });
-          }
-        }
-      }
-    }
-    const config3 = extractGenerationConfig(sdkRequest);
-    return {
-      model: sdkRequest.model || DEFAULT_GEMINI_FLASH_MODEL,
-      messages,
-      config: {
-        temperature: config3?.temperature,
-        maxOutputTokens: config3?.maxOutputTokens,
-        topP: config3?.topP,
-        topK: config3?.topK
-      }
-    };
-  }
-  /**
-   * Convert stable LLMRequest to genai SDK GenerateContentParameters
-   */
-  fromHookLLMRequest(hookRequest, baseRequest) {
-    const contents = hookRequest.messages.map((message) => ({
-      role: message.role === "model" ? "model" : message.role,
-      parts: [
-        {
-          text: typeof message.content === "string" ? message.content : String(message.content)
-        }
-      ]
-    }));
-    const result = {
-      ...baseRequest,
-      model: hookRequest.model,
-      contents
-    };
-    if (hookRequest.config) {
-      const baseConfig = baseRequest ? extractGenerationConfig(baseRequest) : void 0;
-      result.config = {
-        ...baseConfig,
-        temperature: hookRequest.config.temperature,
-        maxOutputTokens: hookRequest.config.maxOutputTokens,
-        topP: hookRequest.config.topP,
-        topK: hookRequest.config.topK
-      };
-    }
-    return result;
-  }
-  /**
-   * Convert genai SDK GenerateContentResponse to stable LLMResponse
-   */
-  toHookLLMResponse(sdkResponse) {
-    return {
-      text: sdkResponse.text,
-      candidates: (sdkResponse.candidates || []).map((candidate) => {
-        const textParts = candidate.content?.parts?.filter(hasTextProperty).map((part) => part.text) || [];
-        return {
-          content: {
-            role: "model",
-            parts: textParts
-          },
-          finishReason: candidate.finishReason,
-          index: candidate.index,
-          safetyRatings: candidate.safetyRatings?.map((rating) => ({
-            category: String(rating.category || ""),
-            probability: String(rating.probability || "")
-          }))
-        };
-      }),
-      usageMetadata: sdkResponse.usageMetadata ? {
-        promptTokenCount: sdkResponse.usageMetadata.promptTokenCount,
-        candidatesTokenCount: sdkResponse.usageMetadata.candidatesTokenCount,
-        totalTokenCount: sdkResponse.usageMetadata.totalTokenCount
-      } : void 0
-    };
-  }
-  /**
-   * Convert stable LLMResponse to genai SDK GenerateContentResponse
-   */
-  fromHookLLMResponse(hookResponse) {
-    const response = {
-      text: hookResponse.text,
-      candidates: hookResponse.candidates.map((candidate) => ({
-        content: {
-          role: "model",
-          parts: candidate.content.parts.map((part) => ({
-            text: part
-          }))
-        },
-        finishReason: candidate.finishReason,
-        index: candidate.index,
-        safetyRatings: candidate.safetyRatings
-      })),
-      usageMetadata: hookResponse.usageMetadata
-    };
-    return response;
-  }
-  /**
-   * Convert genai SDK ToolConfig to stable HookToolConfig
-   */
-  toHookToolConfig(sdkToolConfig) {
-    return {
-      mode: sdkToolConfig.functionCallingConfig?.mode,
-      allowedFunctionNames: sdkToolConfig.functionCallingConfig?.allowedFunctionNames
-    };
-  }
-  /**
-   * Convert stable HookToolConfig to genai SDK ToolConfig
-   */
-  fromHookToolConfig(hookToolConfig) {
-    const functionCallingConfig = hookToolConfig.mode || hookToolConfig.allowedFunctionNames ? {
-      mode: hookToolConfig.mode,
-      allowedFunctionNames: hookToolConfig.allowedFunctionNames
-    } : void 0;
-    return {
-      functionCallingConfig
-    };
-  }
-};
-var defaultHookTranslator = new HookTranslatorGenAIv1();
-
-// packages/core/dist/src/hooks/types.js
-var HookEventName;
-(function(HookEventName2) {
-  HookEventName2["BeforeTool"] = "BeforeTool";
-  HookEventName2["AfterTool"] = "AfterTool";
-  HookEventName2["BeforeAgent"] = "BeforeAgent";
-  HookEventName2["Notification"] = "Notification";
-  HookEventName2["AfterAgent"] = "AfterAgent";
-  HookEventName2["SessionStart"] = "SessionStart";
-  HookEventName2["SessionEnd"] = "SessionEnd";
-  HookEventName2["PreCompress"] = "PreCompress";
-  HookEventName2["BeforeModel"] = "BeforeModel";
-  HookEventName2["AfterModel"] = "AfterModel";
-  HookEventName2["BeforeToolSelection"] = "BeforeToolSelection";
-})(HookEventName || (HookEventName = {}));
-var HookType;
-(function(HookType2) {
-  HookType2["Command"] = "command";
-})(HookType || (HookType = {}));
-function createHookOutput(eventName, data) {
-  switch (eventName) {
-    case "BeforeModel":
-      return new BeforeModelHookOutput(data);
-    case "AfterModel":
-      return new AfterModelHookOutput(data);
-    case "BeforeToolSelection":
-      return new BeforeToolSelectionHookOutput(data);
-    default:
-      return new DefaultHookOutput(data);
-  }
-}
-var DefaultHookOutput = class {
-  continue;
-  stopReason;
-  suppressOutput;
-  systemMessage;
-  decision;
-  reason;
-  hookSpecificOutput;
-  constructor(data = {}) {
-    this.continue = data.continue;
-    this.stopReason = data.stopReason;
-    this.suppressOutput = data.suppressOutput;
-    this.systemMessage = data.systemMessage;
-    this.decision = data.decision;
-    this.reason = data.reason;
-    this.hookSpecificOutput = data.hookSpecificOutput;
-  }
-  /**
-   * Check if this output represents a blocking decision
-   */
-  isBlockingDecision() {
-    return this.decision === "block" || this.decision === "deny";
-  }
-  /**
-   * Check if this output requests to stop execution
-   */
-  shouldStopExecution() {
-    return this.continue === false;
-  }
-  /**
-   * Get the effective reason for blocking or stopping
-   */
-  getEffectiveReason() {
-    return this.reason || this.stopReason || "No reason provided";
-  }
-  /**
-   * Apply LLM request modifications (specific method for BeforeModel hooks)
-   */
-  applyLLMRequestModifications(target) {
-    return target;
-  }
-  /**
-   * Apply tool config modifications (specific method for BeforeToolSelection hooks)
-   */
-  applyToolConfigModifications(target) {
-    return target;
-  }
-  /**
-   * Get additional context for adding to responses
-   */
-  getAdditionalContext() {
-    if (this.hookSpecificOutput && "additionalContext" in this.hookSpecificOutput) {
-      const context2 = this.hookSpecificOutput["additionalContext"];
-      return typeof context2 === "string" ? context2 : void 0;
-    }
-    return void 0;
-  }
-  /**
-   * Check if execution should be blocked and return error info
-   */
-  getBlockingError() {
-    if (this.isBlockingDecision()) {
-      return {
-        blocked: true,
-        reason: this.getEffectiveReason()
-      };
-    }
-    return { blocked: false, reason: "" };
-  }
-};
-var BeforeToolHookOutput = class extends DefaultHookOutput {
-  /**
-   * Get the effective blocking reason, considering compatibility fields
-   */
-  getEffectiveReason() {
-    if (this.hookSpecificOutput) {
-      if ("permissionDecisionReason" in this.hookSpecificOutput) {
-        const compatReason = this.hookSpecificOutput["permissionDecisionReason"];
-        if (typeof compatReason === "string") {
-          return compatReason;
-        }
-      }
-    }
-    return super.getEffectiveReason();
-  }
-  /**
-   * Check if this output represents a blocking decision, considering compatibility fields
-   */
-  isBlockingDecision() {
-    if (this.hookSpecificOutput && "permissionDecision" in this.hookSpecificOutput) {
-      const compatDecision = this.hookSpecificOutput["permissionDecision"];
-      if (compatDecision === "block" || compatDecision === "deny") {
-        return true;
-      }
-    }
-    return super.isBlockingDecision();
-  }
-};
-var BeforeModelHookOutput = class extends DefaultHookOutput {
-  /**
-   * Get synthetic LLM response if provided by hook
-   */
-  getSyntheticResponse() {
-    if (this.hookSpecificOutput && "llm_response" in this.hookSpecificOutput) {
-      const hookResponse = this.hookSpecificOutput["llm_response"];
-      if (hookResponse) {
-        return defaultHookTranslator.fromHookLLMResponse(hookResponse);
-      }
-    }
-    return void 0;
-  }
-  /**
-   * Apply modifications to LLM request
-   */
-  applyLLMRequestModifications(target) {
-    if (this.hookSpecificOutput && "llm_request" in this.hookSpecificOutput) {
-      const hookRequest = this.hookSpecificOutput["llm_request"];
-      if (hookRequest) {
-        const sdkRequest = defaultHookTranslator.fromHookLLMRequest(hookRequest, target);
-        return {
-          ...target,
-          ...sdkRequest
-        };
-      }
-    }
-    return target;
-  }
-};
-var BeforeToolSelectionHookOutput = class extends DefaultHookOutput {
-  /**
-   * Apply tool configuration modifications
-   */
-  applyToolConfigModifications(target) {
-    if (this.hookSpecificOutput && "toolConfig" in this.hookSpecificOutput) {
-      const hookToolConfig = this.hookSpecificOutput["toolConfig"];
-      if (hookToolConfig) {
-        const sdkToolConfig = defaultHookTranslator.fromHookToolConfig(hookToolConfig);
-        return {
-          ...target,
-          tools: target.tools || [],
-          toolConfig: sdkToolConfig
-        };
-      }
-    }
-    return target;
-  }
-};
-var AfterModelHookOutput = class extends DefaultHookOutput {
-  /**
-   * Get modified LLM response if provided by hook
-   */
-  getModifiedResponse() {
-    if (this.hookSpecificOutput && "llm_response" in this.hookSpecificOutput) {
-      const hookResponse = this.hookSpecificOutput["llm_response"];
-      if (hookResponse?.candidates?.[0]?.content?.parts?.length) {
-        return defaultHookTranslator.fromHookLLMResponse(hookResponse);
-      }
-    }
-    if (this.shouldStopExecution()) {
-      const stopResponse = {
-        candidates: [
-          {
-            content: {
-              role: "model",
-              parts: [this.getEffectiveReason() || "Execution stopped by hook"]
-            },
-            finishReason: "STOP"
-          }
-        ]
-      };
-      return defaultHookTranslator.fromHookLLMResponse(stopResponse);
-    }
-    return void 0;
-  }
-};
-var NotificationType;
-(function(NotificationType2) {
-  NotificationType2["ToolPermission"] = "ToolPermission";
-})(NotificationType || (NotificationType = {}));
-var SessionStartSource;
-(function(SessionStartSource2) {
-  SessionStartSource2["Startup"] = "startup";
-  SessionStartSource2["Resume"] = "resume";
-  SessionStartSource2["Clear"] = "clear";
-  SessionStartSource2["Compress"] = "compress";
-})(SessionStartSource || (SessionStartSource = {}));
-var SessionEndReason;
-(function(SessionEndReason2) {
-  SessionEndReason2["Exit"] = "exit";
-  SessionEndReason2["Clear"] = "clear";
-  SessionEndReason2["Logout"] = "logout";
-  SessionEndReason2["PromptInputExit"] = "prompt_input_exit";
-  SessionEndReason2["Other"] = "other";
-})(SessionEndReason || (SessionEndReason = {}));
-var PreCompressTrigger;
-(function(PreCompressTrigger2) {
-  PreCompressTrigger2["Manual"] = "manual";
-  PreCompressTrigger2["Auto"] = "auto";
-})(PreCompressTrigger || (PreCompressTrigger = {}));
-
 // packages/core/dist/src/core/clientHookTriggers.js
 async function fireBeforeAgentHook(messageBus, request3) {
   try {
@@ -364940,23 +365511,6 @@ async function fireAfterAgentHook(messageBus, request3, responseText) {
 
 // packages/core/dist/src/core/client.js
 var MAX_TURNS = 100;
-function estimateTextOnlyLength(request3) {
-  if (typeof request3 === "string") {
-    return request3.length;
-  }
-  if (!Array.isArray(request3)) {
-    return 0;
-  }
-  let textLength = 0;
-  for (const part of request3) {
-    if (typeof part === "string") {
-      textLength += part.length;
-    } else if (typeof part === "object" && part !== null && "text" in part && part.text) {
-      textLength += part.text.length;
-    }
-  }
-  return textLength;
-}
 var GeminiClient = class {
   config;
   chat;
@@ -365237,7 +365791,7 @@ var GeminiClient = class {
       return new Turn(this.getChat(), prompt_id);
     }
     const modelForLimitCheck = this._getEffectiveModelForCurrentTurn();
-    const estimatedRequestTokenCount = Math.floor(estimateTextOnlyLength(request3) / 4);
+    const estimatedRequestTokenCount = await calculateRequestTokenCount(request3, this.getContentGeneratorOrFail(), modelForLimitCheck);
     const remainingTokenCount = tokenLimit(modelForLimitCheck) - this.getChat().getLastPromptTokenCount();
     if (estimatedRequestTokenCount > remainingTokenCount * 0.95) {
       yield {
@@ -370307,6 +370861,81 @@ var StandardFileSystemService = class {
   }
 };
 
+// packages/core/dist/src/availability/modelAvailabilityService.js
+var ModelAvailabilityService = class {
+  health = /* @__PURE__ */ new Map();
+  markTerminal(model, reason) {
+    this.setState(model, {
+      status: "terminal",
+      reason
+    });
+  }
+  markHealthy(model) {
+    this.clearState(model);
+  }
+  markRetryOncePerTurn(model) {
+    const currentState = this.health.get(model);
+    if (currentState?.status === "terminal") {
+      return;
+    }
+    let consumed = false;
+    if (currentState?.status === "sticky_retry") {
+      consumed = currentState.consumed;
+    }
+    this.setState(model, {
+      status: "sticky_retry",
+      reason: "retry_once_per_turn",
+      consumed
+    });
+  }
+  consumeStickyAttempt(model) {
+    const state = this.health.get(model);
+    if (state?.status === "sticky_retry") {
+      this.setState(model, { ...state, consumed: true });
+    }
+  }
+  snapshot(model) {
+    const state = this.health.get(model);
+    if (!state) {
+      return { available: true };
+    }
+    if (state.status === "terminal") {
+      return { available: false, reason: state.reason };
+    }
+    if (state.status === "sticky_retry" && state.consumed) {
+      return { available: false, reason: state.reason };
+    }
+    return { available: true };
+  }
+  selectFirstAvailable(models) {
+    const skipped = [];
+    for (const model of models) {
+      const snapshot = this.snapshot(model);
+      if (snapshot.available) {
+        const state = this.health.get(model);
+        const attempts = state?.status === "sticky_retry" ? 1 : void 0;
+        return { selectedModel: model, skipped, attempts };
+      } else {
+        skipped.push({ model, reason: snapshot.reason ?? "unknown" });
+      }
+    }
+    return { selectedModel: null, skipped };
+  }
+  resetTurn() {
+    for (const [model, state] of this.health.entries()) {
+      if (state.status === "sticky_retry") {
+        this.setState(model, { ...state, consumed: false });
+      }
+    }
+  }
+  setState(model, nextState) {
+    this.health.set(model, nextState);
+  }
+  clearState(model) {
+    this.health.delete(model);
+  }
+};
+
 // packages/core/dist/src/routing/strategies/defaultStrategy.js
 var DefaultStrategy = class {
   name = "default";
@@ -373914,7 +374543,7 @@ async function getClientMetadata() {
     clientMetadataPromise = (async () => ({
       ideName: "IDE_UNSPECIFIED",
       pluginType: "GEMINI",
-      ideVersion: "0.19.0-preview.0",
+      ideVersion: "0.20.0-nightly.20251130.576fda18e",
       platform: getPlatform(),
       updateChannel: await getReleaseChannel(__dirname5)
     }))();
@@ -376601,7 +377230,9 @@ async function loadServerHierarchicalMemory(currentWorkingDirectory, includeDire
 }
 async function refreshServerHierarchicalMemory(config3) {
   const result = await loadServerHierarchicalMemory(config3.getWorkingDir(), config3.shouldLoadMemoryFromIncludeDirectories() ? config3.getWorkspaceContext().getDirectories() : [], config3.getDebugMode(), config3.getFileService(), config3.getExtensionLoader(), config3.isTrustedFolder(), config3.getImportFormat(), config3.getFileFilteringOptions(), config3.getDiscoveryMaxDirs());
-  config3.setUserMemory(result.memoryContent);
+  const mcpInstructions = config3.getMcpClientManager()?.getMcpInstructions() || "";
+  const finalMemory = [result.memoryContent, mcpInstructions.trimStart()].filter(Boolean).join("\n\n");
+  config3.setUserMemory(finalMemory);
   config3.setGeminiMdFileCount(result.fileCount);
   config3.setGeminiMdFilePaths(result.filePaths);
   coreEvents.emit(CoreEvent.MemoryChanged, result);
@@ -377585,6 +378216,30 @@ var GoogleCredentialProvider = class {
   codeVerifier() {
     return "";
   }
+  /**
+   * Returns the project ID used for quota.
+   */
+  async getQuotaProjectId() {
+    const client = await this.auth.getClient();
+    return client.quotaProjectId;
+  }
+  /**
+   * Returns custom headers to be added to the request.
+   */
+  async getRequestHeaders() {
+    const headers = {};
+    const configHeaders = this.config?.headers ?? {};
+    const userProjectHeaderKey = Object.keys(configHeaders).find((key) => key.toLowerCase() === "x-goog-user-project");
+    if (userProjectHeaderKey) {
+      headers[userProjectHeaderKey] = configHeaders[userProjectHeaderKey];
+    } else {
+      const quotaProjectId = await this.getQuotaProjectId();
+      if (quotaProjectId) {
+        headers["X-Goog-User-Project"] = quotaProjectId;
+      }
+    }
+    return headers;
+  }
 };
 
 // packages/core/dist/src/mcp/sa-impersonation-provider.js
@@ -378567,6 +379222,9 @@ var McpClient = class {
   getServerConfig() {
     return this.serverConfig;
   }
+  getInstructions() {
+    return this.client?.getInstructions();
+  }
 };
 var serverStatuses = /* @__PURE__ */ new Map();
 var mcpDiscoveryState = MCPDiscoveryState.NOT_STARTED;
@@ -379045,7 +379703,7 @@ async function createTransport(mcpServerName, mcpServerConfig, debugMode) {
   }
   if (mcpServerConfig.httpUrl || mcpServerConfig.url) {
     const authProvider = createAuthProvider(mcpServerConfig);
-    const headers = {};
+    const headers = await authProvider?.getRequestHeaders?.() ?? {};
     if (authProvider === void 0) {
       let accessToken = null;
       let hasOAuthConfig = mcpServerConfig.oauth?.enabled;
@@ -379322,6 +379980,19 @@ var McpClientManager = class {
     }
     return mcpServers;
   }
+  getMcpInstructions() {
+    const instructions = [];
+    for (const [name4, client] of this.clients) {
+      if (client.getServerConfig().useInstructions) {
+        const clientInstructions = client.getInstructions();
+        if (clientInstructions) {
+          instructions.push(`# Instructions for MCP Server '${name4}'
+${clientInstructions}`);
+        }
+      }
+    }
+    return instructions.join("\n\n");
+  }
 };
 
 // packages/core/dist/src/config/config.js
@@ -379369,6 +380040,7 @@ var Config = class {
   geminiClient;
   baseLlmClient;
   modelRouterService;
+  modelAvailabilityService;
   fileFiltering;
   fileDiscoveryService = null;
   gitService = void 0;
@@ -379423,6 +380095,7 @@ var Config = class {
   continueOnFailedApiCall;
   retryFetchErrors;
   enableShellOutputEfficiency;
+  shellToolInactivityTimeout;
   fakeResponses;
   recordResponses;
   disableYoloMode;
@@ -379484,6 +380157,7 @@ var Config = class {
     this.bugCommand = params.bugCommand;
     this.model = params.model;
     this.enableModelAvailabilityService = params.enableModelAvailabilityService ?? false;
+    this.modelAvailabilityService = new ModelAvailabilityService();
     this.previewFeatures = params.previewFeatures ?? void 0;
     this.maxSessionTurns = params.maxSessionTurns ?? -1;
     this.experimentalZedIntegration = params.experimentalZedIntegration ?? false;
@@ -379530,6 +380204,7 @@ var Config = class {
     };
     this.continueOnFailedApiCall = params.continueOnFailedApiCall ?? true;
     this.enableShellOutputEfficiency = params.enableShellOutputEfficiency ?? true;
+    this.shellToolInactivityTimeout = (params.shellToolInactivityTimeout ?? 300) * 1e3;
     this.extensionManagement = params.extensionManagement ?? true;
     this.enableExtensionReloading = params.enableExtensionReloading ?? false;
     this.storage = new Storage2(this.targetDir);
@@ -379890,6 +380565,9 @@ var Config = class {
   getModelRouterService() {
     return this.modelRouterService;
   }
+  getModelAvailabilityService() {
+    return this.modelAvailabilityService;
+  }
   getEnableRecursiveFileSearch() {
     return this.fileFiltering.enableRecursiveFileSearch;
   }
@@ -380070,6 +380748,9 @@ var Config = class {
   getEnableShellOutputEfficiency() {
     return this.enableShellOutputEfficiency;
   }
+  getShellToolInactivityTimeout() {
+    return this.shellToolInactivityTimeout;
+  }
   getShellExecutionConfig() {
     return this.shellExecutionConfig;
   }