@google/gemini-cli-a2a-server 0.12.0-preview.0 → 0.13.0-nightly.20251030.42c79c64

package/dist/a2a-server.mjs

@@ -123359,32 +123359,32 @@ var require_Meter = __commonJS({
        */
       createGauge(name4, options2) {
         const descriptor = (0, InstrumentDescriptor_1.createInstrumentDescriptor)(name4, MetricData_1.InstrumentType.GAUGE, options2);
-        const storage = this._meterSharedState.registerMetricStorage(descriptor);
-        return new Instruments_1.GaugeInstrument(storage, descriptor);
+        const storage2 = this._meterSharedState.registerMetricStorage(descriptor);
+        return new Instruments_1.GaugeInstrument(storage2, descriptor);
       }
       /**
        * Create a {@link Histogram} instrument.
        */
       createHistogram(name4, options2) {
         const descriptor = (0, InstrumentDescriptor_1.createInstrumentDescriptor)(name4, MetricData_1.InstrumentType.HISTOGRAM, options2);
-        const storage = this._meterSharedState.registerMetricStorage(descriptor);
-        return new Instruments_1.HistogramInstrument(storage, descriptor);
+        const storage2 = this._meterSharedState.registerMetricStorage(descriptor);
+        return new Instruments_1.HistogramInstrument(storage2, descriptor);
       }
       /**
        * Create a {@link Counter} instrument.
        */
       createCounter(name4, options2) {
         const descriptor = (0, InstrumentDescriptor_1.createInstrumentDescriptor)(name4, MetricData_1.InstrumentType.COUNTER, options2);
-        const storage = this._meterSharedState.registerMetricStorage(descriptor);
-        return new Instruments_1.CounterInstrument(storage, descriptor);
+        const storage2 = this._meterSharedState.registerMetricStorage(descriptor);
+        return new Instruments_1.CounterInstrument(storage2, descriptor);
       }
       /**
        * Create a {@link UpDownCounter} instrument.
        */
       createUpDownCounter(name4, options2) {
         const descriptor = (0, InstrumentDescriptor_1.createInstrumentDescriptor)(name4, MetricData_1.InstrumentType.UP_DOWN_COUNTER, options2);
-        const storage = this._meterSharedState.registerMetricStorage(descriptor);
-        return new Instruments_1.UpDownCounterInstrument(storage, descriptor);
+        const storage2 = this._meterSharedState.registerMetricStorage(descriptor);
+        return new Instruments_1.UpDownCounterInstrument(storage2, descriptor);
       }
       /**
        * Create a {@link ObservableGauge} instrument.
@@ -123870,16 +123870,16 @@ var require_MetricStorageRegistry = __commonJS({
         }
         return storages;
       }
-      register(storage) {
-        this._registerStorage(storage, this._sharedRegistry);
+      register(storage2) {
+        this._registerStorage(storage2, this._sharedRegistry);
       }
-      registerForCollector(collector, storage) {
+      registerForCollector(collector, storage2) {
         let storageMap = this._perCollectorRegistry.get(collector);
         if (storageMap == null) {
           storageMap = /* @__PURE__ */ new Map();
           this._perCollectorRegistry.set(collector, storageMap);
         }
-        this._registerStorage(storage, storageMap);
+        this._registerStorage(storage2, storageMap);
       }
       findOrUpdateCompatibleStorage(expectedDescriptor) {
         const storages = this._sharedRegistry.get(expectedDescriptor.name);
@@ -123899,14 +123899,14 @@ var require_MetricStorageRegistry = __commonJS({
         }
         return this._findOrUpdateCompatibleStorage(expectedDescriptor, storages);
       }
-      _registerStorage(storage, storageMap) {
-        const descriptor = storage.getInstrumentDescriptor();
+      _registerStorage(storage2, storageMap) {
+        const descriptor = storage2.getInstrumentDescriptor();
         const storages = storageMap.get(descriptor.name);
         if (storages === void 0) {
-          storageMap.set(descriptor.name, [storage]);
+          storageMap.set(descriptor.name, [storage2]);
           return;
         }
-        storages.push(storage);
+        storages.push(storage2);
       }
       _findOrUpdateCompatibleStorage(expectedDescriptor, existingStorages) {
         let compatibleStorage = null;
@@ -124324,9 +124324,9 @@ var require_MeterSharedState = __commonJS({
             }
             const aggregator = aggregation.createAggregator(descriptor);
             const cardinalityLimit = collector.selectCardinalityLimit(descriptor.type);
-            const storage = new MetricStorageType(descriptor, aggregator, (0, AttributesProcessor_1.createNoopAttributesProcessor)(), [collector], cardinalityLimit);
-            this.metricStorageRegistry.registerForCollector(collector, storage);
-            return storage;
+            const storage2 = new MetricStorageType(descriptor, aggregator, (0, AttributesProcessor_1.createNoopAttributesProcessor)(), [collector], cardinalityLimit);
+            this.metricStorageRegistry.registerForCollector(collector, storage2);
+            return storage2;
           });
           storages = storages.concat(collectorStorages);
         }
@@ -233447,8 +233447,8 @@ var require_cache4 = __commonJS({
        */
       #queryCache(requestQuery, options2, targetStorage) {
         const resultList = [];
-        const storage = targetStorage ?? this.#relevantRequestResponseList;
-        for (const requestResponse of storage) {
+        const storage2 = targetStorage ?? this.#relevantRequestResponseList;
+        for (const requestResponse of storage2) {
           const [cachedRequest, cachedResponse] = requestResponse;
           if (this.#requestMatchesCachedItem(requestQuery, cachedRequest, cachedResponse, options2)) {
             resultList.push(requestResponse);
@@ -252648,11 +252648,11 @@ var SignerExceptionMessages;
 var DEFAULT_SIGNING_VERSION = "v2";
 var SEVEN_DAYS = 7 * 24 * 60 * 60;
 var URLSigner = class {
-  constructor(auth2, bucket, file, storage = new Storage()) {
+  constructor(auth2, bucket, file, storage2 = new Storage()) {
     this.auth = auth2;
     this.bucket = bucket;
     this.file = file;
-    this.storage = storage;
+    this.storage = storage2;
   }
   getSignedUrl(cfg) {
     const expiresInSeconds = this.parseExpires(cfg.expires);
@@ -257203,7 +257203,7 @@ var Bucket = class _Bucket extends ServiceObject {
   getFilesStream(query) {
     return new Readable2();
   }
-  constructor(storage, name4, options2) {
+  constructor(storage2, name4, options2) {
     var _a3, _b, _c, _d;
     options2 = options2 || {};
     name4 = name4.replace(/^gs:\/\//, "").replace(/\/+$/, "");
@@ -257565,14 +257565,14 @@ var Bucket = class _Bucket extends ServiceObject {
       }
     };
     super({
-      parent: storage,
+      parent: storage2,
       baseUrl: "/b",
       id: name4,
-      createMethod: storage.createBucket.bind(storage),
+      createMethod: storage2.createBucket.bind(storage2),
       methods
     });
     this.name = name4;
-    this.storage = storage;
+    this.storage = storage2;
     this.userProject = options2.userProject;
     this.acl = new Acl({
       request: this.request.bind(this),
@@ -257585,7 +257585,7 @@ var Bucket = class _Bucket extends ServiceObject {
     this.crc32cGenerator = options2.crc32cGenerator || this.storage.crc32cGenerator;
     this.iam = new Iam(this);
     this.getFilesStream = import_paginator.paginator.streamify("getFiles");
-    this.instanceRetryValue = storage.retryOptions.autoRetry;
+    this.instanceRetryValue = storage2.retryOptions.autoRetry;
     this.instancePreconditionOpts = options2 === null || options2 === void 0 ? void 0 : options2.preconditionOpts;
   }
   /**
@@ -260271,9 +260271,9 @@ import_paginator.paginator.extend(Bucket, "getFiles");
 // node_modules/@google-cloud/storage/build/esm/src/channel.js
 var import_promisify7 = __toESM(require_src14(), 1);
 var Channel = class extends ServiceObject {
-  constructor(storage, id, resourceId) {
+  constructor(storage2, id, resourceId) {
     const config2 = {
-      parent: storage,
+      parent: storage2,
       baseUrl: "/channels",
       // An ID shouldn't be included in the API requests.
       // RE:
@@ -260363,7 +260363,7 @@ var HmacKey = class extends ServiceObject {
    * const hmacKey = storage.hmacKey('access-id');
    * ```
    */
-  constructor(storage, accessId, options2) {
+  constructor(storage2, accessId, options2) {
     const methods = {
       /**
        * @typedef {object} DeleteHmacKeyOptions
@@ -260601,15 +260601,15 @@ var HmacKey = class extends ServiceObject {
         }
       }
     };
-    const projectId = options2 && options2.projectId || storage.projectId;
+    const projectId = options2 && options2.projectId || storage2.projectId;
     super({
-      parent: storage,
+      parent: storage2,
       id: accessId,
       baseUrl: `/projects/${projectId}/hmacKeys`,
       methods
     });
-    this.storage = storage;
-    this.instanceRetryValue = storage.retryOptions.autoRetry;
+    this.storage = storage2;
+    this.instanceRetryValue = storage2.retryOptions.autoRetry;
   }
   setMetadata(metadata2, optionsOrCallback, cb) {
     if (this.storage.retryOptions.idempotencyStrategy !== IdempotencyStrategy.RetryAlways) {
@@ -285567,28 +285567,28 @@ var HybridTokenStorage = class extends BaseTokenStorage {
     return await this.storageInitPromise;
   }
   async getCredentials(serverName) {
-    const storage = await this.getStorage();
-    return storage.getCredentials(serverName);
+    const storage2 = await this.getStorage();
+    return storage2.getCredentials(serverName);
   }
   async setCredentials(credentials) {
-    const storage = await this.getStorage();
-    await storage.setCredentials(credentials);
+    const storage2 = await this.getStorage();
+    await storage2.setCredentials(credentials);
   }
   async deleteCredentials(serverName) {
-    const storage = await this.getStorage();
-    await storage.deleteCredentials(serverName);
+    const storage2 = await this.getStorage();
+    await storage2.deleteCredentials(serverName);
   }
   async listServers() {
-    const storage = await this.getStorage();
-    return storage.listServers();
+    const storage2 = await this.getStorage();
+    return storage2.listServers();
   }
   async getAllCredentials() {
-    const storage = await this.getStorage();
-    return storage.getAllCredentials();
+    const storage2 = await this.getStorage();
+    return storage2.getAllCredentials();
   }
   async clearAll() {
-    const storage = await this.getStorage();
-    await storage.clearAll();
+    const storage2 = await this.getStorage();
+    await storage2.clearAll();
   }
   async getStorageType() {
     await this.getStorage();
@@ -285625,8 +285625,8 @@ var OAuthCredentialStorage = class {
       }
       return await this.migrateFromFileStorage();
     } catch (error) {
-      console.error(error);
-      throw new Error("Failed to load OAuth credentials");
+      coreEvents.emitFeedback("error", "Failed to load OAuth credentials", error);
+      throw new Error("Failed to load OAuth credentials", { cause: error });
     }
   }
   /**
@@ -285659,8 +285659,8 @@ var OAuthCredentialStorage = class {
       await fs21.rm(oldFilePath, { force: true }).catch(() => {
       });
     } catch (error) {
-      console.error(error);
-      throw new Error("Failed to clear OAuth credentials");
+      coreEvents.emitFeedback("error", "Failed to clear OAuth credentials", error);
+      throw new Error("Failed to clear OAuth credentials", { cause: error });
     }
   }
   /**
@@ -288967,8 +288967,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 = "cca41edc";
-var CLI_VERSION = "0.12.0-preview.0";
+var GIT_COMMIT_INFO = "42c79c64";
+var CLI_VERSION = "0.13.0-nightly.20251030.42c79c64";
 
 // packages/core/dist/src/ide/detect-ide.js
 var IDE_DEFINITIONS = {
@@ -289337,6 +289337,7 @@ var ClearcutLogger = class _ClearcutLogger {
         gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_EXTENSIONS_COUNT,
         value: event.extensions_count.toString()
       },
+      // We deliberately do not log the names of extensions here, to be safe.
       {
         gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_EXTENSION_IDS,
         value: event.extension_ids.toString()
@@ -291536,6 +291537,26 @@ async function createCodeAssistContentGenerator(httpOptions, authType, config2,
   throw new Error(`Unsupported authType: ${authType}`);
 }
 
+// packages/core/dist/src/core/apiKeyCredentialStorage.js
+var KEYCHAIN_SERVICE_NAME2 = "gemini-cli-api-key";
+var DEFAULT_API_KEY_ENTRY = "default-api-key";
+var storage = new HybridTokenStorage(KEYCHAIN_SERVICE_NAME2);
+async function loadApiKey() {
+  try {
+    const credentials = await storage.getCredentials(DEFAULT_API_KEY_ENTRY);
+    if (credentials?.token?.accessToken) {
+      return credentials.token.accessToken;
+    }
+    return null;
+  } catch (error) {
+    if (error instanceof Error && error.message === "Token file does not exist") {
+      return null;
+    }
+    debugLogger.error("Failed to load API key from storage:", error);
+    return null;
+  }
+}
+
 // packages/core/dist/src/core/fakeContentGenerator.js
 import { promises } from "node:fs";
 var FakeContentGenerator = class _FakeContentGenerator {
@@ -291659,8 +291680,8 @@ var AuthType2;
   AuthType3["USE_VERTEX_AI"] = "vertex-ai";
   AuthType3["CLOUD_SHELL"] = "cloud-shell";
 })(AuthType2 || (AuthType2 = {}));
-function createContentGeneratorConfig(config2, authType) {
-  const geminiApiKey = process.env["GEMINI_API_KEY"] || void 0;
+async function createContentGeneratorConfig(config2, authType) {
+  const geminiApiKey = await loadApiKey() || process.env["GEMINI_API_KEY"] || void 0;
   const googleApiKey = process.env["GOOGLE_API_KEY"] || void 0;
   const googleCloudProject = process.env["GOOGLE_CLOUD_PROJECT"] || process.env["GOOGLE_CLOUD_PROJECT_ID"] || void 0;
   const googleCloudLocation = process.env["GOOGLE_CLOUD_LOCATION"] || void 0;
@@ -291688,7 +291709,7 @@ async function createContentGenerator(config2, gcConfig, sessionId2) {
     if (gcConfig.fakeResponses) {
       return FakeContentGenerator.fromFile(gcConfig.fakeResponses);
     }
-    const version3 = "0.12.0-preview.0";
+    const version3 = "0.13.0-nightly.20251030.42c79c64";
     const userAgent = `GeminiCLI/${version3} (${process.platform}; ${process.arch})`;
     const baseHeaders = {
       "User-Agent": userAgent
@@ -332284,7 +332305,7 @@ var ShellToolInvocation = class extends BaseToolInvocation {
           const pgrepLines = fs41.readFileSync(tempFilePath, "utf8").split(EOL3).filter(Boolean);
           for (const line of pgrepLines) {
             if (!/^\d+$/.test(line)) {
-              console.error(`pgrep: ${line}`);
+              debugLogger.error(`pgrep: ${line}`);
             }
             const pid2 = Number(line);
             if (pid2 !== result.pid) {
@@ -332293,7 +332314,7 @@ var ShellToolInvocation = class extends BaseToolInvocation {
           }
         } else {
           if (!signal.aborted) {
-            console.error("missing pgrep output");
+            debugLogger.error("missing pgrep output");
           }
         }
       }
@@ -332445,7 +332466,7 @@ var ShellTool = class _ShellTool extends BaseDeclarativeTool {
     const commandCheck = isCommandAllowed(params.command, this.config);
     if (!commandCheck.allowed) {
       if (!commandCheck.reason) {
-        console.error("Unexpected: isCommandAllowed returned false without a reason");
+        debugLogger.error("Unexpected: isCommandAllowed returned false without a reason");
         return `Command is not allowed: ${params.command}`;
       }
       return commandCheck.reason;
@@ -346411,9 +346432,9 @@ var simpleGit = gitInstanceFactory;
 var GitService = class {
   projectRoot;
   storage;
-  constructor(projectRoot, storage) {
+  constructor(projectRoot, storage2) {
     this.projectRoot = path53.resolve(projectRoot);
-    this.storage = storage;
+    this.storage = storage2;
   }
   getHistoryDir() {
     return this.storage.getHistoryDir();
@@ -349692,7 +349713,7 @@ var Config = class {
     if (this.contentGeneratorConfig?.authType === AuthType2.USE_GEMINI && authMethod === AuthType2.LOGIN_WITH_GOOGLE) {
       this.geminiClient.stripThoughtsFromHistory();
     }
-    const newContentGeneratorConfig = createContentGeneratorConfig(this, authMethod);
+    const newContentGeneratorConfig = await createContentGeneratorConfig(this, authMethod);
     this.contentGenerator = await createContentGenerator(newContentGeneratorConfig, this, this.getSessionId());
     this.contentGeneratorConfig = newContentGeneratorConfig;
     this.baseLlmClient = new BaseLlmClient(this.contentGenerator, this);