@google/gemini-cli 0.36.0-preview.7 → 0.36.0

package/bundle/{interactiveCli-B6Y3UISW.js → interactiveCli-VLQHRXHU.js}

@@ -55,6 +55,7 @@ import {
   SettingScope,
   SettingsContext,
   Static,
+  StyledLine,
   TOGGLE_TYPES,
   TOOL_STATUS,
   TOOL_SUCCESS_RATE_HIGH,
@@ -181,7 +182,7 @@ import {
   widestLineFromStyledChars,
   wordBreakStyledChars,
   wrapStyledChars
-} from "./chunk-YTGZ6CSI.js";
+} from "./chunk-UNM3DGTG.js";
 import {
   ApiKeyUpdatedEvent,
   AsyncFzf,
@@ -300,7 +301,7 @@ import {
   validatePlanContent,
   validatePlanPath,
   writeToStdout
-} from "./chunk-GDBDMLKR.js";
+} from "./chunk-QVTX2M5J.js";
 import {
   ACTIVATE_SKILL_TOOL_NAME,
   ApprovalMode,
@@ -19858,13 +19859,13 @@ var import_jsx_runtime7 = __toESM(require_jsx_runtime(), 1);
 var MIN_COLUMN_WIDTH = 5;
 var COLUMN_PADDING = 2;
 var TABLE_MARGIN = 2;
-var parseMarkdownToStyledChars = (text, defaultColor) => {
+var parseMarkdownToStyledLine = (text, defaultColor) => {
   const ansi = parseMarkdownToANSI(text, defaultColor);
   return toStyledCharacters(ansi);
 };
-var calculateWidths = (styledChars) => {
-  const contentWidth = styledCharsWidth(styledChars);
-  const words = wordBreakStyledChars(styledChars);
+var calculateWidths = (styledLine) => {
+  const contentWidth = styledCharsWidth(styledLine);
+  const words = wordBreakStyledChars(styledLine);
   const maxWordWidth = widestLineFromStyledChars(words);
   return { contentWidth, maxWordWidth };
 };
@@ -19875,7 +19876,7 @@ var TableRenderer = ({
 }) => {
   const styledHeaders = (0, import_react7.useMemo)(
     () => headers.map(
-      (header) => parseMarkdownToStyledChars(
+      (header) => parseMarkdownToStyledLine(
         stripUnsafeCharacters(header),
         theme.text.link
       )
@@ -19885,7 +19886,7 @@ var TableRenderer = ({
   const styledRows = (0, import_react7.useMemo)(
     () => rows.map(
       (row) => row.map(
-        (cell) => parseMarkdownToStyledChars(
+        (cell) => parseMarkdownToStyledLine(
           stripUnsafeCharacters(cell),
           theme.text.primary
         )
@@ -19900,11 +19901,11 @@ var TableRenderer = ({
     );
     const constraints = Array.from({ length: numColumns }).map(
       (_, colIndex) => {
-        const headerStyledChars = styledHeaders[colIndex] || [];
-        let { contentWidth: maxContentWidth, maxWordWidth } = calculateWidths(headerStyledChars);
+        const headerStyledLine = styledHeaders[colIndex] || StyledLine.empty(0);
+        let { contentWidth: maxContentWidth, maxWordWidth } = calculateWidths(headerStyledLine);
         styledRows.forEach((row) => {
-          const cellStyledChars = row[colIndex] || [];
-          const { contentWidth: cellWidth, maxWordWidth: cellWordWidth } = calculateWidths(cellStyledChars);
+          const cellStyledLine = row[colIndex] || StyledLine.empty(0);
+          const { contentWidth: cellWidth, maxWordWidth: cellWordWidth } = calculateWidths(cellStyledLine);
           maxContentWidth = Math.max(maxContentWidth, cellWidth);
           maxWordWidth = Math.max(maxWordWidth, cellWordWidth);
         });
@@ -19957,11 +19958,11 @@ var TableRenderer = ({
     const wrapAndProcessRow = (row) => {
       const rowResult = [];
       for (let colIndex = 0; colIndex < numColumns; colIndex++) {
-        const cellStyledChars = row[colIndex] || [];
+        const cellStyledLine = row[colIndex] || StyledLine.empty(0);
         const allocatedWidth = finalContentWidths[colIndex];
         const contentWidth = Math.max(1, allocatedWidth);
         const wrappedStyledLines = wrapStyledChars(
-          cellStyledChars,
+          cellStyledLine,
           contentWidth
         );
         const maxLineWidth = widestLineFromStyledChars(wrappedStyledLines);
@@ -48368,7 +48369,7 @@ ${queuedText}` : queuedText;
       if (keyMatchers["app.showErrorDetails" /* SHOW_ERROR_DETAILS */](key)) {
         if (settings.merged.general.devtools) {
           void (async () => {
-            const { toggleDevToolsPanel } = await import("./devtoolsService-Q6LGZKTJ.js");
+            const { toggleDevToolsPanel } = await import("./devtoolsService-ZKU2HLK2.js");
             await toggleDevToolsPanel(
               config,
               showErrorDetails,

package/bundle/node_modules/@google/gemini-cli-devtools/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google/gemini-cli-devtools",
-  "version": "0.36.0-preview.7",
+  "version": "0.36.0",
   "license": "Apache-2.0",
   "type": "module",
   "main": "dist/src/index.js",

package/bundle/{oauth2-provider-IGY3DL3D.js → oauth2-provider-5ENESIRQ.js}

@@ -11,7 +11,7 @@ import {
   openBrowserSecurely,
   refreshAccessToken,
   startCallbackServer
-} from "./chunk-NYCY3Q2B.js";
+} from "./chunk-2OFO4ODK.js";
 import {
   FatalCancellationError,
   Storage,

package/bundle/{oauth2-provider-DLPX23GY.js → oauth2-provider-CAKFQRQV.js}

@@ -11,7 +11,7 @@ import {
   openBrowserSecurely,
   refreshAccessToken,
   startCallbackServer
-} from "./chunk-GDBDMLKR.js";
+} from "./chunk-QVTX2M5J.js";
 import {
   FatalCancellationError,
   Storage,

package/bundle/{oauth2-provider-MKUXMD5I.js → oauth2-provider-RVED6DAZ.js}

@@ -11,42 +11,42 @@ import {
   openBrowserSecurely,
   refreshAccessToken,
   startCallbackServer
-} from "./chunk-VA3P26WZ.js";
+} from "./chunk-VB55KQW3.js";
 import {
   FatalCancellationError,
   Storage,
   coreEvents,
   debugLogger,
   getErrorMessage
-} from "./chunk-S2IQOR7T.js";
+} from "./chunk-MYI75E6G.js";
 import "./chunk-664ZODQF.js";
 import "./chunk-RJTRUG2J.js";
 import "./chunk-IUUIT4SU.js";
 import "./chunk-34MYV7JD.js";
 
-// packages/core/dist/src/agents/auth-provider/oauth2-provider.js
+// packages/core/src/agents/auth-provider/oauth2-provider.ts
 var OAuth2AuthProvider = class extends BaseA2AAuthProvider {
-  config;
-  agentName;
-  agentCardUrl;
-  type = "oauth2";
-  tokenStorage;
-  cachedToken = null;
-  /** Resolved OAuth URLs — may come from config or agent card. */
-  authorizationUrl;
-  tokenUrl;
-  scopes;
   constructor(config, agentName, agentCard, agentCardUrl) {
     super();
     this.config = config;
     this.agentName = agentName;
     this.agentCardUrl = agentCardUrl;
-    this.tokenStorage = new MCPOAuthTokenStorage(Storage.getA2AOAuthTokensPath(), "gemini-cli-a2a");
+    this.tokenStorage = new MCPOAuthTokenStorage(
+      Storage.getA2AOAuthTokensPath(),
+      "gemini-cli-a2a"
+    );
     this.authorizationUrl = config.authorization_url;
     this.tokenUrl = config.token_url;
     this.scopes = config.scopes;
     this.mergeAgentCardDefaults(agentCard);
   }
+  type = "oauth2";
+  tokenStorage;
+  cachedToken = null;
+  /** Resolved OAuth URLs — may come from config or agent card. */
+  authorizationUrl;
+  tokenUrl;
+  scopes;
   /**
    * Initialize the provider by loading any persisted token from storage.
    * Also discovers OAuth URLs from the agent card if not yet resolved.
@@ -58,7 +58,9 @@ var OAuth2AuthProvider = class extends BaseA2AAuthProvider {
     const credentials = await this.tokenStorage.getCredentials(this.agentName);
     if (credentials && !this.tokenStorage.isTokenExpired(credentials.token)) {
       this.cachedToken = credentials.token;
-      debugLogger.debug(`[OAuth2AuthProvider] Loaded valid cached token for "${this.agentName}"`);
+      debugLogger.debug(
+        `[OAuth2AuthProvider] Loaded valid cached token for "${this.agentName}"`
+      );
     }
   }
   /**
@@ -71,16 +73,25 @@ var OAuth2AuthProvider = class extends BaseA2AAuthProvider {
     }
     if (this.cachedToken?.refreshToken && this.tokenUrl && this.config.client_id) {
       try {
-        const refreshed = await refreshAccessToken({
-          clientId: this.config.client_id,
-          clientSecret: this.config.client_secret,
-          scopes: this.scopes
-        }, this.cachedToken.refreshToken, this.tokenUrl);
-        this.cachedToken = this.toOAuthToken(refreshed, this.cachedToken.refreshToken);
+        const refreshed = await refreshAccessToken(
+          {
+            clientId: this.config.client_id,
+            clientSecret: this.config.client_secret,
+            scopes: this.scopes
+          },
+          this.cachedToken.refreshToken,
+          this.tokenUrl
+        );
+        this.cachedToken = this.toOAuthToken(
+          refreshed,
+          this.cachedToken.refreshToken
+        );
         await this.persistToken();
         return { Authorization: `Bearer ${this.cachedToken.accessToken}` };
       } catch (error) {
-        debugLogger.debug(`[OAuth2AuthProvider] Refresh failed, falling back to interactive flow: ${getErrorMessage(error)}`);
+        debugLogger.debug(
+          `[OAuth2AuthProvider] Refresh failed, falling back to interactive flow: ${getErrorMessage(error)}`
+        );
         await this.tokenStorage.deleteCredentials(this.agentName);
       }
     }
@@ -99,7 +110,9 @@ var OAuth2AuthProvider = class extends BaseA2AAuthProvider {
       return void 0;
     }
     this.authRetryCount++;
-    debugLogger.debug("[OAuth2AuthProvider] Auth failure, clearing token and re-authenticating");
+    debugLogger.debug(
+      "[OAuth2AuthProvider] Auth failure, clearing token and re-authenticating"
+    );
     this.cachedToken = null;
     await this.tokenStorage.deleteCredentials(this.agentName);
     return this.headers();
@@ -112,8 +125,7 @@ var OAuth2AuthProvider = class extends BaseA2AAuthProvider {
    * `securitySchemes` when not already provided via user config.
    */
   mergeAgentCardDefaults(agentCard) {
-    if (!agentCard?.securitySchemes)
-      return;
+    if (!agentCard?.securitySchemes) return;
     for (const scheme of Object.values(agentCard.securitySchemes)) {
       if (scheme.type === "oauth2" && scheme.flows.authorizationCode) {
         const flow = scheme.flows.authorizationCode;
@@ -129,15 +141,18 @@ var OAuth2AuthProvider = class extends BaseA2AAuthProvider {
    * (which normalizes proto-format cards) and extract OAuth2 URLs.
    */
   async fetchAgentCardDefaults() {
-    if (!this.agentCardUrl)
-      return;
+    if (!this.agentCardUrl) return;
     try {
-      debugLogger.debug(`[OAuth2AuthProvider] Fetching agent card from ${this.agentCardUrl}`);
+      debugLogger.debug(
+        `[OAuth2AuthProvider] Fetching agent card from ${this.agentCardUrl}`
+      );
       const resolver = new DefaultAgentCardResolver();
       const card = await resolver.resolve(this.agentCardUrl, "");
       this.mergeAgentCardDefaults(card);
     } catch (error) {
-      debugLogger.warn(`[OAuth2AuthProvider] Could not fetch agent card for OAuth URL discovery: ${getErrorMessage(error)}`);
+      debugLogger.warn(
+        `[OAuth2AuthProvider] Could not fetch agent card for OAuth URL discovery: ${getErrorMessage(error)}`
+      );
     }
   }
   /**
@@ -145,10 +160,14 @@ var OAuth2AuthProvider = class extends BaseA2AAuthProvider {
    */
   async authenticateInteractively() {
     if (!this.config.client_id) {
-      throw new Error(`OAuth2 authentication for agent "${this.agentName}" requires a client_id. Add client_id to the auth config in your agent definition.`);
+      throw new Error(
+        `OAuth2 authentication for agent "${this.agentName}" requires a client_id. Add client_id to the auth config in your agent definition.`
+      );
     }
     if (!this.authorizationUrl || !this.tokenUrl) {
-      throw new Error(`OAuth2 authentication for agent "${this.agentName}" requires authorization_url and token_url. Provide them in the auth config or ensure the agent card exposes an oauth2 security scheme.`);
+      throw new Error(
+        `OAuth2 authentication for agent "${this.agentName}" requires authorization_url and token_url. Provide them in the auth config or ensure the agent card exposes an oauth2 security scheme.`
+      );
     }
     const flowConfig = {
       clientId: this.config.client_id,
@@ -167,25 +186,36 @@ var OAuth2AuthProvider = class extends BaseA2AAuthProvider {
       redirectPort,
       /* resource= */
       void 0
+      // No MCP resource parameter for A2A.
+    );
+    const consent = await getConsentForOauth(
+      `Authentication required for A2A agent: '${this.agentName}'.`
     );
-    const consent = await getConsentForOauth(`Authentication required for A2A agent: '${this.agentName}'.`);
     if (!consent) {
       throw new FatalCancellationError("Authentication cancelled by user.");
     }
-    coreEvents.emitFeedback("info", `\u2192 Opening your browser for OAuth sign-in...
+    coreEvents.emitFeedback(
+      "info",
+      `\u2192 Opening your browser for OAuth sign-in...
 
 If the browser does not open, copy and paste this URL into your browser:
 ${authUrl}
 
 \u{1F4A1} TIP: Triple-click to select the entire URL, then copy and paste it into your browser.
-\u26A0\uFE0F  Make sure to copy the COMPLETE URL - it may wrap across multiple lines.`);
+\u26A0\uFE0F  Make sure to copy the COMPLETE URL - it may wrap across multiple lines.`
+    );
     try {
       await openBrowserSecurely(authUrl);
     } catch (error) {
-      debugLogger.warn("Failed to open browser automatically:", getErrorMessage(error));
+      debugLogger.warn(
+        "Failed to open browser automatically:",
+        getErrorMessage(error)
+      );
     }
     const { code } = await callbackServer.response;
-    debugLogger.debug("\u2713 Authorization code received, exchanging for tokens...");
+    debugLogger.debug(
+      "\u2713 Authorization code received, exchanging for tokens..."
+    );
     const tokenResponse = await exchangeCodeForToken(
       flowConfig,
       code,
@@ -222,9 +252,13 @@ ${authUrl}
    * Persist the current cached token to disk.
    */
   async persistToken() {
-    if (!this.cachedToken)
-      return;
-    await this.tokenStorage.saveToken(this.agentName, this.cachedToken, this.config.client_id, this.tokenUrl);
+    if (!this.cachedToken) return;
+    await this.tokenStorage.saveToken(
+      this.agentName,
+      this.cachedToken,
+      this.config.client_id,
+      this.tokenUrl
+    );
   }
 };
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google/gemini-cli",
-  "version": "0.36.0-preview.7",
+  "version": "0.36.0",
   "description": "Gemini CLI",
   "license": "Apache-2.0",
   "repository": {