@google/gemini-cli 0.63.0-nightly.20260928.g2fe7c2d3f → 0.63.0-preview.0

package/bundle/{chunk-YZPLV23A.js → chunk-JEUVKR2X.js}

@@ -2,7 +2,7 @@ const require = (await import('node:module')).createRequire(import.meta.url); co
 import {
   exitCli,
   require_source
-} from "./chunk-I7XQQVIO.js";
+} from "./chunk-R6Q6D3UA.js";
 import {
   DEFAULT_PORT,
   SERVER_START_WAIT_MS,
@@ -14,10 +14,10 @@ import {
   isServerRunning,
   resolveGemmaConfig,
   writeServerProcessInfo
-} from "./chunk-EORMOPQX.js";
+} from "./chunk-2NCBQURB.js";
 import {
   debugLogger
-} from "./chunk-B3EF23HT.js";
+} from "./chunk-NWSCUKK3.js";
 import {
   __toESM
 } from "./chunk-34MYV7JD.js";

package/bundle/{chunk-KRI5JA76.js → chunk-KCB54UJ5.js}

@@ -254248,7 +254248,7 @@ function sanitizeFilenamePart(part) {
   return part.replace(/[^a-zA-Z0-9_-]/g, "_");
 }
 function formatTruncatedToolOutput(contentStr, outputFile, maxChars) {
-  if (contentStr.length <= maxChars) return contentStr;
+  if (maxChars <= 0 || contentStr.length <= maxChars) return contentStr;
   const headChars = Math.floor(maxChars * 0.2);
   const tailChars = maxChars - headChars;
   const head = contentStr.slice(0, headChars);
@@ -279008,10 +279008,25 @@ var KeychainService = class {
   getKeychain() {
     return this.initializationPromise ??= this.initializeKeychain();
   }
+  isWsl() {
+    if (os16.platform() !== "linux") {
+      return false;
+    }
+    return !!(process.env["WSL_DISTRO_NAME"] || process.env["WSLENV"] || process.env["WSL_INTEROP"]);
+  }
   // High-level orchestration of the loading and testing cycle.
   async initializeKeychain() {
     const forceFileStorage = process.env[FORCE_FILE_STORAGE_ENV_VAR] === "true";
-    const nativeKeychain = forceFileStorage ? null : await this.getNativeKeychain();
+    let nativeKeychain = null;
+    if (!forceFileStorage) {
+      if (this.isWsl()) {
+        debugLogger.debug(
+          "WSL environment detected; bypassing native keychain to prevent libsecret lockups."
+        );
+      } else {
+        nativeKeychain = await this.getNativeKeychain();
+      }
+    }
     coreEvents.emitTelemetryKeychainAvailability(
       new KeychainAvailabilityEvent(nativeKeychain !== null)
     );
@@ -280123,6 +280138,24 @@ function getAvailablePort() {
     }
   });
 }
+async function readOAuthCredsWithRetry(filePath, maxRetries = 3) {
+  let attempt = 0;
+  while (attempt < maxRetries) {
+    try {
+      return await fs28.readFile(filePath, "utf-8");
+    } catch (err2) {
+      if (err2 && typeof err2 === "object" && "code" in err2 && err2.code === "ENOENT") {
+        throw err2;
+      }
+      attempt++;
+      if (attempt >= maxRetries) {
+        throw err2;
+      }
+      await new Promise((resolve29) => setTimeout(resolve29, 25 * attempt));
+    }
+  }
+  return "";
+}
 async function fetchCachedCredentialsList() {
   const credentialsList = [];
   const useEncryptedStorage = getUseEncryptedStorageFlag();
@@ -280145,7 +280178,7 @@ async function fetchCachedCredentialsList() {
   ].filter((p) => !!p);
   for (const keyFile of pathsToTry) {
     try {
-      const keyFileString = await fs28.readFile(keyFile, "utf-8");
+      const keyFileString = await readOAuthCredsWithRetry(keyFile);
       const parsed = JSON.parse(keyFileString);
       const isOAuthCreds = (val) => typeof val === "object" && val !== null;
       if (isOAuthCreds(parsed)) {
@@ -280210,12 +280243,14 @@ async function fetchAndCacheUserInfo(client) {
 function resetOauthClientForTesting() {
   oauthClientPromises.clear();
 }
+var tempCounter = 0;
 async function cacheCredentials(credentials3) {
   const filePath = Storage.getOAuthCredsPath();
-  await fs28.mkdir(path26.dirname(filePath), { recursive: true });
+  const dirPath = path26.dirname(filePath);
+  await fs28.mkdir(dirPath, { recursive: true });
   let existing = {};
   try {
-    const existingContent = await fs28.readFile(filePath, "utf-8");
+    const existingContent = await readOAuthCredsWithRetry(filePath);
     const parsed = JSON.parse(existingContent);
     if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
       existing = parsed;
@@ -280236,7 +280271,24 @@ async function cacheCredentials(credentials3) {
     ...cleanCredentials
   };
   const credString = JSON.stringify(finalCredentials, null, 2);
-  await fs28.writeFile(filePath, credString, { mode: 384 });
+  const tempPath = path26.join(
+    dirPath,
+    `.${path26.basename(filePath)}.${process.pid}.${Date.now()}.${tempCounter++}.tmp`
+  );
+  try {
+    await fs28.writeFile(tempPath, credString, { mode: 384 });
+    try {
+      await fs28.chmod(tempPath, 384);
+    } catch {
+    }
+    await fs28.rename(tempPath, filePath);
+  } catch {
+    try {
+      await fs28.rm(tempPath, { force: true });
+    } catch {
+    }
+    await fs28.writeFile(filePath, credString, { mode: 384 });
+  }
   try {
     await fs28.chmod(filePath, 384);
   } catch {
@@ -283760,7 +283812,7 @@ function isValidToolName(name3, options = {}) {
 }
 
 // packages/core/src/generated/git-commit.ts
-var GIT_COMMIT_INFO = "2fe7c2d3f";
+var GIT_COMMIT_INFO = "d75234cae";
 var CLI_VERSION = "0.63.0-nightly.20260923.gf50ba8608";
 
 // packages/core/src/ide/detect-ide.ts
@@ -336678,6 +336730,15 @@ You are operating with a persistent file-based task tracking system located at \
 }
 function renderPlanningWorkflow(options) {
   if (!options) return "";
+  const consultSection = options.interactive ? `### 2. Consult
+The depth of your consultation should be proportional to the task's complexity. Before proceeding to Step 3 (Draft), you MUST discuss your findings and proposed strategy with the user to reach an informal agreement.
+- **Simple Tasks:** Briefly describe your proposed strategy in the chat to ensure alignment, then **STOP and wait** for the user to confirm agreement before drafting the plan.
+- **Standard Tasks:** If multiple viable approaches exist, present a concise summary (including pros/cons and your recommendation) via ${formatToolName(ASK_USER_TOOL_NAME)} and wait for a decision.
+- **Complex Tasks:** You MUST present at least two viable approaches with detailed trade-offs via ${formatToolName(ASK_USER_TOOL_NAME)} and obtain approval before drafting the plan.
+
+**CRITICAL:** You MUST NOT proceed to Step 3 (Draft) or Step 4 (Review & Approval) in the same turn as your initial strategy proposal. You MUST wait for user feedback and reach a clear agreement before drafting or submitting the plan.` : `### 2. Determine Strategy
+Synthesize your exploration findings to select the best approach and implementation strategy. Because you are running non-interactively, proceed directly to Step 3 (Draft) autonomously without halting or waiting for user confirmation.`;
+  const reviewAndApprovalSection = options.interactive ? `ONLY use the built-in ${formatToolName(EXIT_PLAN_MODE_TOOL_NAME)} tool to present the plan for formal approval AFTER you have reached an informal agreement with the user in the chat regarding the proposed strategy. **CRITICAL: NEVER attempt to call this tool via ${formatToolName(SHELL_TOOL_NAME)}.** When called, this tool will present the plan and formally request approval.` : `Use the built-in ${formatToolName(EXIT_PLAN_MODE_TOOL_NAME)} tool to finalize the plan. **CRITICAL: NEVER attempt to call this tool via ${formatToolName(SHELL_TOOL_NAME)}.** When called, this tool will present the plan and begin implementation.`;
   return `
 # Active Approval Mode: Plan
 
@@ -336692,7 +336753,7 @@ ${options.planModeToolsList}
 ## Rules
 1. **Read-Only:** You cannot modify source code. You may ONLY use read-only tools to explore, and you can only write to \`${options.plansDir}/\`. If the user asks you to modify source code directly, you MUST explain that you are in Plan Mode and must first create a plan and get approval.
 2. **Write Constraint:** ${formatToolName(WRITE_FILE_TOOL_NAME)} and ${formatToolName(EDIT_TOOL_NAME)} may ONLY be used to write .md plan files to \`${options.plansDir}/\`. They cannot modify source code.
-3. **Efficiency:** Autonomously combine discovery and drafting phases to minimize conversational turns. If the request is ambiguous, use ${formatToolName(ASK_USER_TOOL_NAME)} to clarify. Use multi-select to offer flexibility and include detailed descriptions for each option to help the user understand the implications of their choice.
+3. **Efficiency:** Autonomously combine discovery and drafting phases to minimize conversational turns.${options.interactive ? ` If the request is ambiguous, use ${formatToolName(ASK_USER_TOOL_NAME)} to clarify. Use multi-select to offer flexibility and include detailed descriptions for each option to help the user understand the implications of their choice.` : ""}
 4. **Inquiries and Directives:** Distinguish between Inquiries and Directives to minimize unnecessary planning.
    - **Inquiries:** If the request is an **Inquiry** (e.g., "How does X work?"), answer directly. DO NOT create a plan.
    - **Directives:** If the request is a **Directive** (e.g., "Fix bug Y"), follow the workflow below.
@@ -336706,13 +336767,7 @@ Plan Mode uses an adaptive planning workflow where the research depth, plan stru
 ### 1. Explore & Analyze
 Analyze requirements and use search/read tools to explore the codebase. Systematically map affected modules, trace data flow, and identify dependencies.
 
-### 2. Consult
-The depth of your consultation should be proportional to the task's complexity. Before proceeding to Step 3 (Draft), you MUST discuss your findings and proposed strategy with the user to reach an informal agreement.
-- **Simple Tasks:** Briefly describe your proposed strategy in the chat to ensure alignment, then **STOP and wait** for the user to confirm agreement before drafting the plan.
-- **Standard Tasks:** If multiple viable approaches exist, present a concise summary (including pros/cons and your recommendation) via ${formatToolName(ASK_USER_TOOL_NAME)} and wait for a decision.
-- **Complex Tasks:** You MUST present at least two viable approaches with detailed trade-offs via ${formatToolName(ASK_USER_TOOL_NAME)} and obtain approval before drafting the plan.
-
-**CRITICAL:** You MUST NOT proceed to Step 3 (Draft) or Step 4 (Review & Approval) in the same turn as your initial strategy proposal. You MUST wait for user feedback and reach a clear agreement before drafting or submitting the plan.
+${consultSection}
 
 ### 3. Draft
 Write the implementation plan to \`${options.plansDir}/\`. The plan's structure adapts to the task:
@@ -336721,7 +336776,7 @@ Write the implementation plan to \`${options.plansDir}/\`. The plan's structure
 - **Complex Tasks:** Include **Background & Motivation**, **Scope & Impact**, **Proposed Solution**, **Alternatives Considered**, a phased **Implementation Plan**, **Verification**, and **Migration & Rollback** strategies.${options.interactive ? "\n- **Alignment Check:** After drafting the plan, you MUST present it to the user in the chat (adhering to Rule 7 for presenting plans) to ensure alignment on the specific details. Ask for feedback or confirmation, and proceed to Step 4 (Review & Approval) once the user agrees with the detailed plan." : ""}
 
 ### 4. Review & Approval
-ONLY use the built-in ${formatToolName(EXIT_PLAN_MODE_TOOL_NAME)} tool to present the plan for formal approval AFTER you have reached an informal agreement with the user in the chat regarding the proposed strategy. **CRITICAL: NEVER attempt to call this tool via ${formatToolName(SHELL_TOOL_NAME)}.** When called, this tool will present the plan and ${options.interactive ? "formally request approval." : "begin implementation."}
+${reviewAndApprovalSection}
 
 ${renderApprovedPlanSection(options.approvedPlanPath)}`.trim();
 }
@@ -343794,7 +343849,7 @@ var A2AAuthProviderFactory = class _A2AAuthProviderFactory {
         return provider;
       }
       case "oauth2": {
-        const { OAuth2AuthProvider } = await import("./oauth2-provider-KPLVYPVA.js");
+        const { OAuth2AuthProvider } = await import("./oauth2-provider-NGSH2JQK.js");
         const provider = new OAuth2AuthProvider(
           authConfig,
           options.agentName ?? "unknown",
@@ -405989,6 +406044,7 @@ export {
   authEvents,
   getOauthClient,
   getAvailablePort,
+  readOAuthCredsWithRetry,
   clearOauthClientCache,
   clearCachedCredentialFile,
   resetOauthClientForTesting,

package/bundle/{chunk-ZAM747AR.js → chunk-KPPDDNGJ.js}

@@ -1,7 +1,7 @@
 const require = (await import('node:module')).createRequire(import.meta.url); const __chunk_filename = (await import('node:url')).fileURLToPath(import.meta.url); const __chunk_dirname = (await import('node:path')).dirname(__chunk_filename);
 import {
   checkExhaustive
-} from "./chunk-KRI5JA76.js";
+} from "./chunk-HBZBBLAV.js";
 import {
   __commonJS,
   __toESM

package/bundle/{chunk-SZK5XAFL.js → chunk-NTWFJ2RF.js}

@@ -1,13 +1,13 @@
 const require = (await import('node:module')).createRequire(import.meta.url); const __chunk_filename = (await import('node:url')).fileURLToPath(import.meta.url); const __chunk_dirname = (await import('node:path')).dirname(__chunk_filename);
 import {
   runExitCleanup
-} from "./chunk-2AXHER6I.js";
+} from "./chunk-RXHIISMM.js";
 import {
   RELEASE_CHANNEL_STABILITY,
   debugLogger,
   getChannelFromVersion,
   isGitRepository
-} from "./chunk-TXWIPUPY.js";
+} from "./chunk-NWSCUKK3.js";
 
 // packages/cli/src/utils/installationInfo.ts
 import * as fs from "node:fs";
@@ -332,10 +332,37 @@ function setUpdateHandler(addItem, setUpdateInfo) {
 // packages/cli/src/utils/processUtils.ts
 var RELAUNCH_EXIT_CODE = 199;
 var isRelaunching = false;
-async function relaunchApp() {
+async function relaunchApp(options) {
   if (isRelaunching) return;
   isRelaunching = true;
   await waitForUpdateCompletion();
+  if (process.send && !process.env["VITEST"] && options?.overrideAuthType) {
+    await new Promise((resolve) => {
+      let resolved = false;
+      const done = () => {
+        if (!resolved) {
+          resolved = true;
+          resolve();
+        }
+      };
+      const timeout = setTimeout(done, 500);
+      try {
+        process.send(
+          {
+            type: "auth-selected-type",
+            authType: options.overrideAuthType
+          },
+          () => {
+            clearTimeout(timeout);
+            done();
+          }
+        );
+      } catch {
+        clearTimeout(timeout);
+        done();
+      }
+    });
+  }
   await runExitCleanup();
   process.exit(RELAUNCH_EXIT_CODE);
 }

package/bundle/{chunk-B3EF23HT.js → chunk-NWSCUKK3.js}

@@ -254169,7 +254169,7 @@ function sanitizeFilenamePart(part) {
   return part.replace(/[^a-zA-Z0-9_-]/g, "_");
 }
 function formatTruncatedToolOutput(contentStr, outputFile, maxChars) {
-  if (contentStr.length <= maxChars)
+  if (maxChars <= 0 || contentStr.length <= maxChars)
     return contentStr;
   const headChars = Math.floor(maxChars * 0.2);
   const tailChars = maxChars - headChars;
@@ -278704,10 +278704,23 @@ var KeychainService = class {
   getKeychain() {
     return this.initializationPromise ??= this.initializeKeychain();
   }
+  isWsl() {
+    if (os16.platform() !== "linux") {
+      return false;
+    }
+    return !!(process.env["WSL_DISTRO_NAME"] || process.env["WSLENV"] || process.env["WSL_INTEROP"]);
+  }
   // High-level orchestration of the loading and testing cycle.
   async initializeKeychain() {
     const forceFileStorage = process.env[FORCE_FILE_STORAGE_ENV_VAR] === "true";
-    const nativeKeychain = forceFileStorage ? null : await this.getNativeKeychain();
+    let nativeKeychain = null;
+    if (!forceFileStorage) {
+      if (this.isWsl()) {
+        debugLogger.debug("WSL environment detected; bypassing native keychain to prevent libsecret lockups.");
+      } else {
+        nativeKeychain = await this.getNativeKeychain();
+      }
+    }
     coreEvents.emitTelemetryKeychainAvailability(new KeychainAvailabilityEvent(nativeKeychain !== null));
     if (nativeKeychain) {
       return nativeKeychain;
@@ -279676,6 +279689,24 @@ function getAvailablePort() {
     }
   });
 }
+async function readOAuthCredsWithRetry(filePath, maxRetries = 3) {
+  let attempt = 0;
+  while (attempt < maxRetries) {
+    try {
+      return await fs28.readFile(filePath, "utf-8");
+    } catch (err2) {
+      if (err2 && typeof err2 === "object" && "code" in err2 && err2.code === "ENOENT") {
+        throw err2;
+      }
+      attempt++;
+      if (attempt >= maxRetries) {
+        throw err2;
+      }
+      await new Promise((resolve29) => setTimeout(resolve29, 25 * attempt));
+    }
+  }
+  return "";
+}
 async function fetchCachedCredentialsList() {
   const credentialsList = [];
   const useEncryptedStorage = getUseEncryptedStorageFlag();
@@ -279695,7 +279726,7 @@ async function fetchCachedCredentialsList() {
   ].filter((p) => !!p);
   for (const keyFile of pathsToTry) {
     try {
-      const keyFileString = await fs28.readFile(keyFile, "utf-8");
+      const keyFileString = await readOAuthCredsWithRetry(keyFile);
       const parsed = JSON.parse(keyFileString);
       const isOAuthCreds = (val) => typeof val === "object" && val !== null;
       if (isOAuthCreds(parsed)) {
@@ -279750,12 +279781,14 @@ async function fetchAndCacheUserInfo(client) {
 function resetOauthClientForTesting() {
   oauthClientPromises.clear();
 }
+var tempCounter = 0;
 async function cacheCredentials(credentials3) {
   const filePath = Storage.getOAuthCredsPath();
-  await fs28.mkdir(path26.dirname(filePath), { recursive: true });
+  const dirPath = path26.dirname(filePath);
+  await fs28.mkdir(dirPath, { recursive: true });
   let existing = {};
   try {
-    const existingContent = await fs28.readFile(filePath, "utf-8");
+    const existingContent = await readOAuthCredsWithRetry(filePath);
     const parsed = JSON.parse(existingContent);
     if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
       existing = parsed;
@@ -279772,7 +279805,21 @@ async function cacheCredentials(credentials3) {
     ...cleanCredentials
   };
   const credString = JSON.stringify(finalCredentials, null, 2);
-  await fs28.writeFile(filePath, credString, { mode: 384 });
+  const tempPath = path26.join(dirPath, `.${path26.basename(filePath)}.${process.pid}.${Date.now()}.${tempCounter++}.tmp`);
+  try {
+    await fs28.writeFile(tempPath, credString, { mode: 384 });
+    try {
+      await fs28.chmod(tempPath, 384);
+    } catch {
+    }
+    await fs28.rename(tempPath, filePath);
+  } catch {
+    try {
+      await fs28.rm(tempPath, { force: true });
+    } catch {
+    }
+    await fs28.writeFile(filePath, credString, { mode: 384 });
+  }
   try {
     await fs28.chmod(filePath, 384);
   } catch {
@@ -283453,8 +283500,8 @@ function isValidToolName(name3, options = {}) {
 }
 
 // packages/core/dist/src/generated/git-commit.js
-var GIT_COMMIT_INFO = "2fe7c2d3f";
-var CLI_VERSION = "0.63.0-nightly.20260923.gf50ba8608";
+var GIT_COMMIT_INFO = "d75234cae";
+var CLI_VERSION = "0.63.0-preview.0";
 
 // packages/core/dist/src/ide/detect-ide.js
 var IDE_DEFINITIONS = {
@@ -306753,7 +306800,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname4);
-    return "0.63.0-nightly.20260928.g2fe7c2d3f";
+    return "0.63.0-preview.0";
   })();
   return versionPromise;
 }
@@ -334137,6 +334184,15 @@ You are operating with a persistent file-based task tracking system located at \
 function renderPlanningWorkflow(options) {
   if (!options)
     return "";
+  const consultSection = options.interactive ? `### 2. Consult
+The depth of your consultation should be proportional to the task's complexity. Before proceeding to Step 3 (Draft), you MUST discuss your findings and proposed strategy with the user to reach an informal agreement.
+- **Simple Tasks:** Briefly describe your proposed strategy in the chat to ensure alignment, then **STOP and wait** for the user to confirm agreement before drafting the plan.
+- **Standard Tasks:** If multiple viable approaches exist, present a concise summary (including pros/cons and your recommendation) via ${formatToolName(ASK_USER_TOOL_NAME)} and wait for a decision.
+- **Complex Tasks:** You MUST present at least two viable approaches with detailed trade-offs via ${formatToolName(ASK_USER_TOOL_NAME)} and obtain approval before drafting the plan.
+
+**CRITICAL:** You MUST NOT proceed to Step 3 (Draft) or Step 4 (Review & Approval) in the same turn as your initial strategy proposal. You MUST wait for user feedback and reach a clear agreement before drafting or submitting the plan.` : `### 2. Determine Strategy
+Synthesize your exploration findings to select the best approach and implementation strategy. Because you are running non-interactively, proceed directly to Step 3 (Draft) autonomously without halting or waiting for user confirmation.`;
+  const reviewAndApprovalSection = options.interactive ? `ONLY use the built-in ${formatToolName(EXIT_PLAN_MODE_TOOL_NAME)} tool to present the plan for formal approval AFTER you have reached an informal agreement with the user in the chat regarding the proposed strategy. **CRITICAL: NEVER attempt to call this tool via ${formatToolName(SHELL_TOOL_NAME)}.** When called, this tool will present the plan and formally request approval.` : `Use the built-in ${formatToolName(EXIT_PLAN_MODE_TOOL_NAME)} tool to finalize the plan. **CRITICAL: NEVER attempt to call this tool via ${formatToolName(SHELL_TOOL_NAME)}.** When called, this tool will present the plan and begin implementation.`;
   return `
 # Active Approval Mode: Plan
 
@@ -334151,7 +334207,7 @@ ${options.planModeToolsList}
 ## Rules
 1. **Read-Only:** You cannot modify source code. You may ONLY use read-only tools to explore, and you can only write to \`${options.plansDir}/\`. If the user asks you to modify source code directly, you MUST explain that you are in Plan Mode and must first create a plan and get approval.
 2. **Write Constraint:** ${formatToolName(WRITE_FILE_TOOL_NAME)} and ${formatToolName(EDIT_TOOL_NAME)} may ONLY be used to write .md plan files to \`${options.plansDir}/\`. They cannot modify source code.
-3. **Efficiency:** Autonomously combine discovery and drafting phases to minimize conversational turns. If the request is ambiguous, use ${formatToolName(ASK_USER_TOOL_NAME)} to clarify. Use multi-select to offer flexibility and include detailed descriptions for each option to help the user understand the implications of their choice.
+3. **Efficiency:** Autonomously combine discovery and drafting phases to minimize conversational turns.${options.interactive ? ` If the request is ambiguous, use ${formatToolName(ASK_USER_TOOL_NAME)} to clarify. Use multi-select to offer flexibility and include detailed descriptions for each option to help the user understand the implications of their choice.` : ""}
 4. **Inquiries and Directives:** Distinguish between Inquiries and Directives to minimize unnecessary planning.
    - **Inquiries:** If the request is an **Inquiry** (e.g., "How does X work?"), answer directly. DO NOT create a plan.
    - **Directives:** If the request is a **Directive** (e.g., "Fix bug Y"), follow the workflow below.
@@ -334165,13 +334221,7 @@ Plan Mode uses an adaptive planning workflow where the research depth, plan stru
 ### 1. Explore & Analyze
 Analyze requirements and use search/read tools to explore the codebase. Systematically map affected modules, trace data flow, and identify dependencies.
 
-### 2. Consult
-The depth of your consultation should be proportional to the task's complexity. Before proceeding to Step 3 (Draft), you MUST discuss your findings and proposed strategy with the user to reach an informal agreement.
-- **Simple Tasks:** Briefly describe your proposed strategy in the chat to ensure alignment, then **STOP and wait** for the user to confirm agreement before drafting the plan.
-- **Standard Tasks:** If multiple viable approaches exist, present a concise summary (including pros/cons and your recommendation) via ${formatToolName(ASK_USER_TOOL_NAME)} and wait for a decision.
-- **Complex Tasks:** You MUST present at least two viable approaches with detailed trade-offs via ${formatToolName(ASK_USER_TOOL_NAME)} and obtain approval before drafting the plan.
-
-**CRITICAL:** You MUST NOT proceed to Step 3 (Draft) or Step 4 (Review & Approval) in the same turn as your initial strategy proposal. You MUST wait for user feedback and reach a clear agreement before drafting or submitting the plan.
+${consultSection}
 
 ### 3. Draft
 Write the implementation plan to \`${options.plansDir}/\`. The plan's structure adapts to the task:
@@ -334180,7 +334230,7 @@ Write the implementation plan to \`${options.plansDir}/\`. The plan's structure
 - **Complex Tasks:** Include **Background & Motivation**, **Scope & Impact**, **Proposed Solution**, **Alternatives Considered**, a phased **Implementation Plan**, **Verification**, and **Migration & Rollback** strategies.${options.interactive ? "\n- **Alignment Check:** After drafting the plan, you MUST present it to the user in the chat (adhering to Rule 7 for presenting plans) to ensure alignment on the specific details. Ask for feedback or confirmation, and proceed to Step 4 (Review & Approval) once the user agrees with the detailed plan." : ""}
 
 ### 4. Review & Approval
-ONLY use the built-in ${formatToolName(EXIT_PLAN_MODE_TOOL_NAME)} tool to present the plan for formal approval AFTER you have reached an informal agreement with the user in the chat regarding the proposed strategy. **CRITICAL: NEVER attempt to call this tool via ${formatToolName(SHELL_TOOL_NAME)}.** When called, this tool will present the plan and ${options.interactive ? "formally request approval." : "begin implementation."}
+${reviewAndApprovalSection}
 
 ${renderApprovedPlanSection(options.approvedPlanPath)}`.trim();
 }
@@ -340939,7 +340989,7 @@ var A2AAuthProviderFactory = class _A2AAuthProviderFactory {
         return provider;
       }
       case "oauth2": {
-        const { OAuth2AuthProvider } = await import("./oauth2-provider-CEQ4PAUC.js");
+        const { OAuth2AuthProvider } = await import("./oauth2-provider-TA2KRXWQ.js");
         const provider = new OAuth2AuthProvider(authConfig, options.agentName ?? "unknown", agentCard, options.agentCardUrl);
         await provider.initialize();
         return provider;
@@ -399014,6 +399064,7 @@ export {
   authEvents,
   getOauthClient,
   getAvailablePort,
+  readOAuthCredsWithRetry,
   clearOauthClientCache,
   clearCachedCredentialFile,
   resetOauthClientForTesting,

package/bundle/{chunk-I7XQQVIO.js → chunk-R6Q6D3UA.js}

@@ -1,7 +1,7 @@
 const require = (await import('node:module')).createRequire(import.meta.url); const __chunk_filename = (await import('node:url')).fileURLToPath(import.meta.url); const __chunk_dirname = (await import('node:path')).dirname(__chunk_filename);
 import {
   runExitCleanup
-} from "./chunk-I5ZBUXWS.js";
+} from "./chunk-RXHIISMM.js";
 import {
   __commonJS,
   __require