@google/gemini-cli-a2a-server 0.28.0-preview.2 → 0.29.0-nightly.20260205.a3af4a8ca

package/dist/a2a-server.mjs

@@ -92114,7 +92114,7 @@ function isValidToolName(name4, options = {}) {
   }
   return false;
 }
-var GLOB_TOOL_NAME, WRITE_TODOS_TOOL_NAME, WRITE_FILE_TOOL_NAME, WEB_SEARCH_TOOL_NAME, WEB_FETCH_TOOL_NAME, EDIT_TOOL_NAME, SHELL_TOOL_NAME, GREP_TOOL_NAME, READ_MANY_FILES_TOOL_NAME, READ_FILE_TOOL_NAME, LS_TOOL_NAME, MEMORY_TOOL_NAME, GET_INTERNAL_DOCS_TOOL_NAME, ACTIVATE_SKILL_TOOL_NAME, EDIT_TOOL_NAMES, ASK_USER_TOOL_NAME, ASK_USER_DISPLAY_NAME, EXIT_PLAN_MODE_TOOL_NAME, TOOL_LEGACY_ALIASES, DISCOVERED_TOOL_PREFIX, ALL_BUILTIN_TOOL_NAMES, PLAN_MODE_TOOLS;
+var GLOB_TOOL_NAME, WRITE_TODOS_TOOL_NAME, WRITE_FILE_TOOL_NAME, WEB_SEARCH_TOOL_NAME, WEB_FETCH_TOOL_NAME, EDIT_TOOL_NAME, SHELL_TOOL_NAME, GREP_TOOL_NAME, READ_MANY_FILES_TOOL_NAME, READ_FILE_TOOL_NAME, LS_TOOL_NAME, MEMORY_TOOL_NAME, GET_INTERNAL_DOCS_TOOL_NAME, ACTIVATE_SKILL_TOOL_NAME, EDIT_TOOL_NAMES, ASK_USER_TOOL_NAME, ASK_USER_DISPLAY_NAME, EXIT_PLAN_MODE_TOOL_NAME, ENTER_PLAN_MODE_TOOL_NAME, TOOL_LEGACY_ALIASES, DISCOVERED_TOOL_PREFIX, ALL_BUILTIN_TOOL_NAMES, PLAN_MODE_TOOLS;
 var init_tool_names = __esm({
   "packages/core/dist/src/tools/tool-names.js"() {
     "use strict";
@@ -92136,6 +92136,7 @@ var init_tool_names = __esm({
     ASK_USER_TOOL_NAME = "ask_user";
     ASK_USER_DISPLAY_NAME = "Ask User";
     EXIT_PLAN_MODE_TOOL_NAME = "exit_plan_mode";
+    ENTER_PLAN_MODE_TOOL_NAME = "enter_plan_mode";
     TOOL_LEGACY_ALIASES = {
       // Add future renames here, e.g.:
       search_file_content: GREP_TOOL_NAME
@@ -122543,13 +122544,13 @@ var require_path = __commonJS({
   "node_modules/@protobufjs/path/index.js"(exports2) {
     "use strict";
     var path82 = exports2;
-    var isAbsolute5 = (
+    var isAbsolute6 = (
       /**
        * Tests if the specified path is absolute.
        * @param {string} path Path to test
        * @returns {boolean} `true` if path is absolute
        */
-      path82.isAbsolute = function isAbsolute6(path83) {
+      path82.isAbsolute = function isAbsolute7(path83) {
         return /^(?:\/|\w+:)/.test(path83);
       }
     );
@@ -122561,7 +122562,7 @@ var require_path = __commonJS({
        */
       path82.normalize = function normalize6(path83) {
         path83 = path83.replace(/\\/g, "/").replace(/\/{2,}/g, "/");
-        var parts2 = path83.split("/"), absolute = isAbsolute5(path83), prefix = "";
+        var parts2 = path83.split("/"), absolute = isAbsolute6(path83), prefix = "";
         if (absolute)
           prefix = parts2.shift() + "/";
         for (var i4 = 0; i4 < parts2.length; ) {
@@ -122583,7 +122584,7 @@ var require_path = __commonJS({
     path82.resolve = function resolve15(originPath, includePath, alreadyNormalized) {
       if (!alreadyNormalized)
         includePath = normalize5(includePath);
-      if (isAbsolute5(includePath))
+      if (isAbsolute6(includePath))
         return includePath;
       if (!alreadyNormalized)
         originPath = normalize5(originPath);
@@ -327581,7 +327582,7 @@ var __filename = fileURLToPath5(import.meta.url);
 var __dirname3 = path20.dirname(__filename);
 async function getVersion() {
   const pkgJson = await getPackageJson(__dirname3);
-  return "0.28.0-preview.2";
+  return "0.29.0-nightly.20260205.a3af4a8ca";
 }
 
 // packages/core/dist/src/code_assist/experiments/client_metadata.js
@@ -331005,8 +331006,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 = "45866d8e0";
-var CLI_VERSION = "0.28.0-preview.2";
+var GIT_COMMIT_INFO = "a3af4a8ca";
+var CLI_VERSION = "0.29.0-nightly.20260205.a3af4a8ca";
 
 // packages/core/dist/src/ide/detect-ide.js
 var IDE_DEFINITIONS = {
@@ -382369,8 +382370,8 @@ var AskUserTool = class extends BaseDeclarativeTool {
               },
               header: {
                 type: "string",
-                maxLength: 12,
-                description: 'Very short label displayed as a chip/tag (max 12 chars). Examples: "Auth method", "Library", "Approach".'
+                maxLength: 16,
+                description: 'Very short label displayed as a chip/tag (max 16 chars). Examples: "Auth method", "Library", "Approach".'
               },
               type: {
                 type: "string",
@@ -382657,6 +382658,7 @@ var ExitPlanModeInvocation = class extends BaseToolInvocation {
     if (payload?.approved) {
       const newMode = payload.approvalMode ?? ApprovalMode.DEFAULT;
       this.config.setApprovalMode(newMode);
+      this.config.setApprovedPlanPath(resolvedPlanPath);
       const description = getApprovalModeDescription(newMode);
       return {
         llmContent: `Plan approved. Switching to ${description}.
@@ -382688,6 +382690,71 @@ Ask the user for specific feedback on how to improve the plan.`,
   }
 };
 
+// packages/core/dist/src/tools/enter-plan-mode.js
+init_tools();
+init_tool_names();
+init_types2();
+var EnterPlanModeTool = class extends BaseDeclarativeTool {
+  config;
+  constructor(config3, messageBus) {
+    super(ENTER_PLAN_MODE_TOOL_NAME, "Enter Plan Mode", "Switch to Plan Mode to safely research, design, and plan complex changes using read-only tools.", Kind.Plan, {
+      type: "object",
+      properties: {
+        reason: {
+          type: "string",
+          description: "Short reason explaining why you are entering plan mode."
+        }
+      }
+    }, messageBus);
+    this.config = config3;
+  }
+  createInvocation(params, messageBus, toolName, toolDisplayName) {
+    return new EnterPlanModeInvocation(params, messageBus, toolName, toolDisplayName, this.config);
+  }
+};
+var EnterPlanModeInvocation = class extends BaseToolInvocation {
+  config;
+  confirmationOutcome = null;
+  constructor(params, messageBus, toolName, toolDisplayName, config3) {
+    super(params, messageBus, toolName, toolDisplayName);
+    this.config = config3;
+  }
+  getDescription() {
+    return this.params.reason || "Initiating Plan Mode";
+  }
+  async shouldConfirmExecute(abortSignal) {
+    const decision = await this.getMessageBusDecision(abortSignal);
+    if (decision === "ALLOW") {
+      return false;
+    }
+    if (decision === "DENY") {
+      throw new Error(`Tool execution for "${this._toolDisplayName || this._toolName}" denied by policy.`);
+    }
+    return {
+      type: "info",
+      title: "Enter Plan Mode",
+      prompt: "This will restrict the agent to read-only tools to allow for safe planning.",
+      onConfirm: async (outcome) => {
+        this.confirmationOutcome = outcome;
+        await this.publishPolicyUpdate(outcome);
+      }
+    };
+  }
+  async execute(_signal) {
+    if (this.confirmationOutcome === ToolConfirmationOutcome.Cancel) {
+      return {
+        llmContent: "User cancelled entering Plan Mode.",
+        returnDisplay: "Cancelled"
+      };
+    }
+    this.config.setApprovalMode(ApprovalMode.PLAN);
+    return {
+      llmContent: "Switching to Plan mode.",
+      returnDisplay: this.params.reason ? `Switching to Plan mode: ${this.params.reason}` : "Switching to Plan mode"
+    };
+  }
+};
+
 // packages/core/dist/src/core/client.js
 init_node();
 
@@ -385465,7 +385532,7 @@ ${renderAgentSkills(options.agentSkills)}
 
 ${renderHookContext(options.hookContext)}
 
-${renderPrimaryWorkflows(options.primaryWorkflows)}
+${options.planningWorkflow ? renderPlanningWorkflow(options.planningWorkflow) : renderPrimaryWorkflows(options.primaryWorkflows)}
 
 ${renderOperationalGuidelines(options.operationalGuidelines)}
 
@@ -385476,13 +385543,11 @@ ${renderGitRepo(options.gitRepo)}
 ${renderFinalReminder(options.finalReminder)}
 `.trim();
 }
-function renderFinalShell(basePrompt, userMemory, planOptions) {
+function renderFinalShell(basePrompt, userMemory) {
   return `
 ${basePrompt.trim()}
 
 ${renderUserMemory(userMemory)}
-
-${renderApprovalModePlan(planOptions)}
 `.trim();
 }
 function renderPreamble(options) {
@@ -385549,7 +385614,7 @@ function renderPrimaryWorkflows(options) {
 When requested to perform tasks like fixing bugs, adding features, refactoring, or explaining code, follow this sequence:
 ${workflowStepUnderstand(options)}
 ${workflowStepPlan(options)}
-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').
+3. **Implement:** Use the available tools (e.g., '${EDIT_TOOL_NAME}', '${WRITE_FILE_TOOL_NAME}' '${SHELL_TOOL_NAME}' ...) to act on the plan. Strictly adhere to the project's established conventions (detailed under 'Core Mandates'). Before making manual code changes, check if an ecosystem tool (like 'eslint --fix', 'prettier --write', 'go fmt', 'cargo fmt') is available in the project to perform the task automatically.
 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. When executing test commands, prefer "run once" or "CI" modes to ensure the command terminates after completion.
 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.${workflowVerifyStandardsSuffix(options.interactive)}
 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.
@@ -385643,7 +385708,7 @@ function renderUserMemory(memory) {
 
 ${memory.trim()}`;
 }
-function renderApprovalModePlan(options) {
+function renderPlanningWorkflow(options) {
   if (!options)
     return "";
   return `
@@ -385791,11 +385856,11 @@ function toolUsageInteractive(interactive) {
   if (interactive) {
     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:** Always prefer non-interactive commands (e.g., using 'run once' or 'CI' flags for test runners to avoid persistent watch modes or 'git --no-pager') unless a persistent process is specifically required; 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.`;
+- **Interactive Commands:** Never use interactive shell commands unless absolutely necessary. **ALWAYS** use arguments to bypass prompts for **EVERY** tool in use that supports it, even if that command is part of a chain or larger command. For example: 'git --no-pager', 'vitest run', and 'npx --yes' to bypass interactive prompts.`;
   }
   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. e.g.: use 'git --no-pager'`;
+- **Interactive Commands:** Never use interactive shell commands. **ALWAYS** use arguments to bypass prompts for **EVERY** tool in use that supports it, even if that command is part of a chain or larger command. For example: 'git --no-pager', 'vitest run', and 'npx --yes' to bypass interactive prompts.`;
 }
 function toolUsageRememberingFacts(options) {
   const base = `
@@ -386084,10 +386149,6 @@ var PromptProvider = class {
     const toolNames = config3.getToolRegistry().getAllToolNames();
     const desiredModel = resolveModel(config3.getActiveModel(), config3.getPreviewFeatures());
     const isGemini3 = isPreviewModel(desiredModel);
-    const planOptions = isPlanMode ? {
-      planModeToolsList: PLAN_MODE_TOOLS.filter((t3) => new Set(toolNames).has(t3)).map((t3) => `- \`${t3}\``).join("\n"),
-      plansDir: config3.storage.getProjectTempPlansDir()
-    } : void 0;
     let basePrompt;
     if (systemMdResolution.value && !systemMdResolution.isDisabled) {
       let systemMdPath = path60.resolve(path60.join(GEMINI_DIR, "system.md"));
@@ -386126,6 +386187,10 @@ var PromptProvider = class {
           enableCodebaseInvestigator: toolNames.includes(CodebaseInvestigatorAgent.name),
           enableWriteTodosTool: toolNames.includes(WRITE_TODOS_TOOL_NAME)
         }), !isPlanMode),
+        planningWorkflow: this.withSection("planningWorkflow", () => ({
+          planModeToolsList: PLAN_MODE_TOOLS.filter((t3) => new Set(toolNames).has(t3)).map((t3) => `- \`${t3}\``).join("\n"),
+          plansDir: config3.storage.getProjectTempPlansDir()
+        }), isPlanMode),
         operationalGuidelines: this.withSection("operationalGuidelines", () => ({
           interactive: interactiveMode,
           isGemini3,
@@ -386139,7 +386204,7 @@ var PromptProvider = class {
       };
       basePrompt = getCoreSystemPrompt(options);
     }
-    const finalPrompt = renderFinalShell(basePrompt, userMemory, planOptions);
+    const finalPrompt = renderFinalShell(basePrompt, userMemory);
     const sanitizedPrompt = finalPrompt.replace(/\n{3,}/g, "\n\n");
     this.maybeWriteSystemMd(sanitizedPrompt, systemMdResolution, path60.resolve(path60.join(GEMINI_DIR, "system.md")));
     return sanitizedPrompt;
@@ -394157,7 +394222,7 @@ var HookRegistry = class {
   async initialize() {
     this.entries = [];
     this.processHooksFromConfig();
-    debugLogger.log(`Hook registry initialized with ${this.entries.length} hook entries`);
+    debugLogger.debug(`Hook registry initialized with ${this.entries.length} hook entries`);
   }
   /**
    * Get all hook entries for a specific event
@@ -398087,6 +398152,22 @@ var jsYaml = {
 import * as fs58 from "node:fs/promises";
 import * as path67 from "node:path";
 import * as crypto21 from "node:crypto";
+
+// packages/core/dist/src/agents/types.js
+var AgentTerminateMode;
+(function(AgentTerminateMode2) {
+  AgentTerminateMode2["ERROR"] = "ERROR";
+  AgentTerminateMode2["TIMEOUT"] = "TIMEOUT";
+  AgentTerminateMode2["GOAL"] = "GOAL";
+  AgentTerminateMode2["MAX_TURNS"] = "MAX_TURNS";
+  AgentTerminateMode2["ABORTED"] = "ABORTED";
+  AgentTerminateMode2["ERROR_NO_COMPLETE_TASK_CALL"] = "ERROR_NO_COMPLETE_TASK_CALL";
+})(AgentTerminateMode || (AgentTerminateMode = {}));
+var DEFAULT_QUERY_STRING = "Get Started!";
+var DEFAULT_MAX_TURNS = 15;
+var DEFAULT_MAX_TIME_MINUTES = 5;
+
+// packages/core/dist/src/agents/agentLoader.js
 init_tool_names();
 
 // packages/core/dist/src/skills/skillLoader.js
@@ -398149,10 +398230,12 @@ async function loadSkillsFromDir(dir) {
     if (!stats || !stats.isDirectory()) {
       return [];
     }
-    const skillFiles = await glob(["SKILL.md", "*/SKILL.md"], {
+    const pattern = ["SKILL.md", "*/SKILL.md"];
+    const skillFiles = await glob(pattern, {
       cwd: absoluteSearchPath,
       absolute: true,
-      nodir: true
+      nodir: true,
+      ignore: ["**/node_modules/**", "**/.git/**"]
     });
     for (const skillFile of skillFiles) {
       const metadata2 = await loadSkillFromFile(skillFile);
@@ -398182,8 +398265,9 @@ async function loadSkillFromFile(filePath) {
     if (!frontmatter) {
       return null;
     }
+    const sanitizedName = frontmatter.name.replace(/[:\\/<>*?"|]/g, "-");
     return {
-      name: frontmatter.name,
+      name: sanitizedName,
       description: frontmatter.description,
       location: filePath,
       body: match2[2]?.trim() ?? ""
@@ -398343,8 +398427,8 @@ function markdownToAgentDefinition(markdown, metadata2) {
       }
     },
     runConfig: {
-      maxTurns: markdown.max_turns,
-      maxTimeMinutes: markdown.timeout_mins || 5
+      maxTurns: markdown.max_turns ?? DEFAULT_MAX_TURNS,
+      maxTimeMinutes: markdown.timeout_mins ?? DEFAULT_MAX_TIME_MINUTES
     },
     toolConfig: markdown.tools ? {
       tools: markdown.tools
@@ -399865,18 +399949,6 @@ var A2AClientManager = class _A2AClientManager {
 // packages/core/dist/src/agents/remote-invocation.js
 init_tools();
 
-// packages/core/dist/src/agents/types.js
-var AgentTerminateMode;
-(function(AgentTerminateMode2) {
-  AgentTerminateMode2["ERROR"] = "ERROR";
-  AgentTerminateMode2["TIMEOUT"] = "TIMEOUT";
-  AgentTerminateMode2["GOAL"] = "GOAL";
-  AgentTerminateMode2["MAX_TURNS"] = "MAX_TURNS";
-  AgentTerminateMode2["ABORTED"] = "ABORTED";
-  AgentTerminateMode2["ERROR_NO_COMPLETE_TASK_CALL"] = "ERROR_NO_COMPLETE_TASK_CALL";
-})(AgentTerminateMode || (AgentTerminateMode = {}));
-var DEFAULT_QUERY_STRING = "Get Started!";
-
 // packages/core/dist/src/agents/a2aUtils.js
 function extractMessageText(message) {
   if (!message) {
@@ -401463,7 +401535,8 @@ var LocalAgentExecutor = class _LocalAgentExecutor {
     let turnCounter = 0;
     let terminateReason = AgentTerminateMode.ERROR;
     let finalResult = null;
-    const { maxTimeMinutes } = this.definition.runConfig;
+    const maxTimeMinutes = this.definition.runConfig.maxTimeMinutes ?? DEFAULT_MAX_TIME_MINUTES;
+    const maxTurns = this.definition.runConfig.maxTurns ?? DEFAULT_MAX_TURNS;
     const timeoutController = new AbortController();
     const timeoutId = setTimeout(() => timeoutController.abort(new Error("Agent timed out.")), maxTimeMinutes * 60 * 1e3);
     const combinedSignal = AbortSignal.any([signal, timeoutController.signal]);
@@ -401482,7 +401555,7 @@ var LocalAgentExecutor = class _LocalAgentExecutor {
       const query = this.definition.promptConfig.query ? templateString(this.definition.promptConfig.query, augmentedInputs) : DEFAULT_QUERY_STRING;
       let currentMessage = { role: "user", parts: [{ text: query }] };
       while (true) {
-        const reason = this.checkTermination(startTime, turnCounter);
+        const reason = this.checkTermination(turnCounter, maxTurns);
         if (reason) {
           terminateReason = reason;
           break;
@@ -401514,13 +401587,13 @@ var LocalAgentExecutor = class _LocalAgentExecutor {
           finalResult = recoveryResult;
         } else {
           if (terminateReason === AgentTerminateMode.TIMEOUT) {
-            finalResult = `Agent timed out after ${this.definition.runConfig.maxTimeMinutes} minutes.`;
+            finalResult = `Agent timed out after ${maxTimeMinutes} minutes.`;
             this.emitActivity("ERROR", {
               error: finalResult,
               context: "timeout"
             });
           } else if (terminateReason === AgentTerminateMode.MAX_TURNS) {
-            finalResult = `Agent reached max turns limit (${this.definition.runConfig.maxTurns}).`;
+            finalResult = `Agent reached max turns limit (${maxTurns}).`;
             this.emitActivity("ERROR", {
               error: finalResult,
               context: "max_turns"
@@ -401564,7 +401637,7 @@ var LocalAgentExecutor = class _LocalAgentExecutor {
             };
           }
         }
-        finalResult = `Agent timed out after ${this.definition.runConfig.maxTimeMinutes} minutes.`;
+        finalResult = `Agent timed out after ${maxTimeMinutes} minutes.`;
         this.emitActivity("ERROR", {
           error: finalResult,
           context: "timeout"
@@ -401973,9 +402046,8 @@ Important Rules:
    *
    * @returns The reason for termination, or `null` if execution can continue.
    */
-  checkTermination(startTime, turnCounter) {
-    const { runConfig } = this.definition;
-    if (runConfig.maxTurns && turnCounter >= runConfig.maxTurns) {
+  checkTermination(turnCounter, maxTurns) {
+    if (turnCounter >= maxTurns) {
       return AgentTerminateMode.MAX_TURNS;
     }
     return null;
@@ -402167,9 +402239,6 @@ var SubAgentInvocation = class extends BaseToolInvocation {
     return `Delegating to agent '${this.definition.name}'`;
   }
   async shouldConfirmExecute(abortSignal) {
-    if (this.definition.kind !== "remote") {
-      return false;
-    }
     const invocation = this.buildSubInvocation(this.definition, this.params);
     return invocation.shouldConfirmExecute(abortSignal);
   }
@@ -404494,10 +404563,12 @@ var McpClient = class {
     }
     this.updateStatus(MCPServerStatus.CONNECTING);
     try {
-      this.client = await connectToMcpServer(this.clientVersion, this.serverName, this.serverConfig, this.debugMode, this.workspaceContext, this.cliConfig.sanitizationConfig);
+      const { client, transport } = await connectToMcpServer(this.clientVersion, this.serverName, this.serverConfig, this.debugMode, this.workspaceContext, this.cliConfig.sanitizationConfig);
+      this.client = client;
+      this.transport = transport;
       this.registerNotificationHandlers();
       const originalOnError = this.client.onerror;
-      this.client.onerror = (error2) => {
+      this.client.onerror = async (error2) => {
         if (this.status !== MCPServerStatus.CONNECTED) {
           return;
         }
@@ -404505,6 +404576,12 @@ var McpClient = class {
           originalOnError(error2);
         coreEvents.emitFeedback("error", `MCP ERROR (${this.serverName})`, error2);
         this.updateStatus(MCPServerStatus.DISCONNECTED);
+        if (this.transport) {
+          try {
+            await this.transport.close();
+          } catch {
+          }
+        }
       };
       this.updateStatus(MCPServerStatus.CONNECTED);
     } catch (error2) {
@@ -405060,6 +405137,7 @@ async function connectWithSSETransport(client, config3, accessToken) {
   await client.connect(transport, {
     timeout: config3.timeout ?? MCP_DEFAULT_TIMEOUT_MSEC
   });
+  return transport;
 }
 async function showAuthRequiredMessage(serverName) {
   const hasRejectedToken = !!await getStoredOAuthToken(serverName);
@@ -405070,9 +405148,9 @@ async function showAuthRequiredMessage(serverName) {
 async function retryWithOAuth(client, serverName, config3, accessToken, httpReturned404) {
   if (httpReturned404) {
     debugLogger.log(`Retrying SSE connection to '${serverName}' with OAuth token...`);
-    await connectWithSSETransport(client, config3, accessToken);
+    const transport = await connectWithSSETransport(client, config3, accessToken);
     debugLogger.log(`Successfully connected to '${serverName}' using SSE with OAuth.`);
-    return;
+    return transport;
   }
   debugLogger.log(`Retrying connection to '${serverName}' with OAuth token...`);
   const httpTransport = await createTransportWithOAuth(serverName, config3, accessToken);
@@ -405084,12 +405162,14 @@ async function retryWithOAuth(client, serverName, config3, accessToken, httpRetu
       timeout: config3.timeout ?? MCP_DEFAULT_TIMEOUT_MSEC
     });
     debugLogger.log(`Successfully connected to '${serverName}' using HTTP with OAuth.`);
+    return httpTransport;
   } catch (httpError) {
     await httpTransport.close();
     if (String(httpError).includes("404") && config3.url && !config3.type && !config3.httpUrl) {
       debugLogger.log(`HTTP with OAuth returned 404, trying SSE with OAuth...`);
-      await connectWithSSETransport(client, config3, accessToken);
+      const sseTransport = await connectWithSSETransport(client, config3, accessToken);
       debugLogger.log(`Successfully connected to '${serverName}' using SSE with OAuth.`);
+      return sseTransport;
     } else {
       throw httpError;
     }
@@ -405145,7 +405225,7 @@ async function connectToMcpServer(clientVersion, mcpServerName, mcpServerConfig,
       await mcpClient.connect(transport, {
         timeout: mcpServerConfig.timeout ?? MCP_DEFAULT_TIMEOUT_MSEC
       });
-      return mcpClient;
+      return { client: mcpClient, transport };
     } catch (error2) {
       await transport.close();
       firstAttemptError = error2;
@@ -405162,9 +405242,9 @@ async function connectToMcpServer(clientVersion, mcpServerName, mcpServerConfig,
       const logMessage = httpReturned404 ? `HTTP returned 404, trying SSE transport...` : `HTTP connection failed, attempting SSE fallback...`;
       debugLogger.log(`MCP server '${mcpServerName}': ${logMessage}`);
       try {
-        await connectWithSSETransport(mcpClient, mcpServerConfig, await getStoredOAuthToken(mcpServerName));
+        const sseTransport = await connectWithSSETransport(mcpClient, mcpServerConfig, await getStoredOAuthToken(mcpServerName));
         debugLogger.log(`MCP server '${mcpServerName}': Successfully connected using SSE transport.`);
-        return mcpClient;
+        return { client: mcpClient, transport: sseTransport };
       } catch (sseFallbackError) {
         sseError = sseFallbackError;
         if (isAuthenticationError(sseError)) {
@@ -405225,8 +405305,8 @@ async function connectToMcpServer(clientVersion, mcpServerName, mcpServerConfig,
           if (!accessToken) {
             throw new Error(`Failed to get OAuth token for server '${mcpServerName}'`);
           }
-          await retryWithOAuth(mcpClient, mcpServerName, mcpServerConfig, accessToken, httpReturned404);
-          return mcpClient;
+          const oauthTransport = await retryWithOAuth(mcpClient, mcpServerName, mcpServerConfig, accessToken, httpReturned404);
+          return { client: mcpClient, transport: oauthTransport };
         } else {
           throw new Error(`Failed to handle automatic OAuth for server '${mcpServerName}'`);
         }
@@ -405263,7 +405343,7 @@ async function connectToMcpServer(clientVersion, mcpServerName, mcpServerConfig,
             await mcpClient.connect(oauthTransport, {
               timeout: mcpServerConfig.timeout ?? MCP_DEFAULT_TIMEOUT_MSEC
             });
-            return mcpClient;
+            return { client: mcpClient, transport: oauthTransport };
           } else {
             throw new Error(`OAuth configuration failed for '${mcpServerName}'. Please authenticate manually with /mcp auth ${mcpServerName}`);
           }
@@ -405837,9 +405917,11 @@ var Config = class {
   remoteAdminSettings;
   latestApiRequest;
   lastModeSwitchTime = Date.now();
+  approvedPlanPath;
   constructor(params) {
     this.sessionId = params.sessionId;
     this.clientVersion = params.clientVersion ?? "unknown";
+    this.approvedPlanPath = void 0;
     this.embeddingModel = params.embeddingModel ?? DEFAULT_GEMINI_EMBEDDING_MODEL;
     this.fileSystemService = new StandardFileSystemService();
     this.sandbox = params.sandbox;
@@ -406128,7 +406210,7 @@ var Config = class {
     return this.contentGenerator?.userTier;
   }
   getUserTierName() {
-    return void 0;
+    return this.contentGenerator?.userTierName;
   }
   /**
    * Provides access to the BaseLlmClient for stateless LLM operations.
@@ -406626,6 +406708,12 @@ var Config = class {
   isPlanEnabled() {
     return this.planEnabled;
   }
+  getApprovedPlanPath() {
+    return this.approvedPlanPath;
+  }
+  setApprovedPlanPath(path82) {
+    this.approvedPlanPath = path82;
+  }
   isAgentsEnabled() {
     return this.enableAgents;
   }
@@ -406681,6 +406769,9 @@ var Config = class {
    * @returns true if the path is allowed, false otherwise.
    */
   isPathAllowed(absolutePath) {
+    if (this.interactive && path72.isAbsolute(absolutePath)) {
+      return true;
+    }
     const realpath3 = (p) => {
       let resolved;
       try {
@@ -406946,6 +407037,7 @@ var Config = class {
     }
     if (this.isPlanEnabled()) {
       registerCoreTool(ExitPlanModeTool, this);
+      registerCoreTool(EnterPlanModeTool, this);
     }
     this.registerSubAgentTools(registry2);
     await registry2.discoverAllTools();