Adding better tracking of AI agents responsible for API calls

src/apiv2.ts

@@ -9,19 +9,25 @@
 
 import * as auth from "./auth";
 import { FirebaseError } from "./error";
+import { isFirebaseMcp, detectAIAgent } from "./env";
 import { logger } from "./logger";
 import { responseToError } from "./responseToError";
 import * as FormData from "form-data";
 
 // Using import would require resolveJsonModule, which seems to break the
 // build/output format.
 const pkg = require("../package.json");
 const CLI_VERSION: string = pkg.version;
 
+const agent = detectAIAgent();
+const agentStr = agent === "unknown" ? "None" : agent;
+const platform = isFirebaseMcp() ? "FirebaseMCP" : "FirebaseCLI";
+const clientVersion = `${platform}/${CLI_VERSION}/${agentStr}`;
+
 export const STANDARD_HEADERS: Record<string, string> = {
   Connection: "keep-alive",
-  "User-Agent": `FirebaseCLI/${CLI_VERSION}`,
-  "X-Client-Version": `FirebaseCLI/${CLI_VERSION}`,
+  "User-Agent": clientVersion,
+  "X-Client-Version": clientVersion,
 };
 
 const GOOG_QUOTA_USER_HEADER = "x-goog-quota-user";
@@ -124,7 +130,7 @@
 
 /**
  * Gets a singleton access token
  * @returns An access token
  */
 export async function getAccessToken(): Promise<string> {
   const valid = auth.haveValidTokens(refreshToken, []);
@@ -229,7 +235,7 @@
    * Makes a request as specified by the options.
    * By default, this will:
    *   - use content-type: application/json
    *   - assume the HTTP GET method
    *
    * @example
    * const res = apiv2.request<ResourceType>({
@@ -268,7 +274,7 @@
     }
     try {
       return await this.doRequest<ReqT, ResT>(internalReqOptions);
     } catch (thrown: any) {
       if (thrown instanceof FirebaseError) {
         throw thrown;
       }
@@ -277,7 +283,7 @@
       if (thrown instanceof Error) {
         err = thrown;
       } else {
         err = new Error(thrown);
       }
       throw new FirebaseError(`Failed to make request: ${err.message}`, { original: err });
     }
@@ -365,7 +371,7 @@
     }
 
     if (options.signal) {
       const signal = options.signal as any;
       signal.reason = "";
       signal.throwIfAborted = () => {
         throw new FirebaseError("Aborted");

src/env.ts

@@ -11,3 +11,15 @@ export function isFirebaseStudio() {
 export function isFirebaseMcp() {
   return !!process.env.IS_FIREBASE_MCP;
 }
+
+// Detect if the CLI was invoked by a coding agent, based on well-known env vars.
+export function detectAIAgent(): string {
+  if (process.env.ANTIGRAVITY_CLI_ALIAS) return "antigravity";
+  if (process.env.CLAUDECODE) return "claude_code";
+  if (process.env.CLINE_ACTIVE) return "cline";
+  if (process.env.CODEX_SANDBOX) return "codex_cli";
+  if (process.env.CURSOR_AGENT) return "cursor";
+  if (process.env.GEMINI_CLI) return "gemini_cli";
+  if (process.env.OPENCODE) return "open_code";
+  return "unknown";
+}

src/track.ts

@@ -4,20 +4,9 @@ import { getGlobalDefaultAccount } from "./auth";
 
 import { configstore } from "./configstore";
 import { logger } from "./logger";
-import { isFirebaseStudio } from "./env";
+import { isFirebaseStudio, detectAIAgent } from "./env";
 const pkg = require("../package.json");
 
-// Detect if the CLI was invoked by a coding agent, based on well-known env vars.
-function detectAIAgent(): string {
-  if (process.env.CLAUDECODE) return "claude_code";
-  if (process.env.CLINE_ACTIVE) return "cline";
-  if (process.env.CODEX_SANDBOX) return "codex_cli";
-  if (process.env.CURSOR_AGENT) return "cursor";
-  if (process.env.GEMINI_CLI) return "gemini_cli";
-  if (process.env.OPENCODE) return "open_code";
-  return "unknown";
-}
-
 type cliEventNames =
   | "command_execution"
   | "product_deploy"