Use std-env for agent detection in telemetry

Co-authored-by: valentinpalkovic <5889929+valentinpalkovic@users.noreply.github.com>

Author: Copilot

code/core/package.json

@@ -357,6 +357,7 @@
     "sirv": "^2.0.4",
     "slash": "^5.0.0",
     "source-map": "^0.7.4",
+    "std-env": "^4.0.0",
     "store2": "^2.14.2",
     "strip-ansi": "^7.1.0",
     "strip-json-comments": "^5.0.1",

code/core/src/telemetry/detect-agent.test.ts

@@ -1,95 +1,65 @@
-import { describe, expect, it } from 'vitest';
+import { afterEach, describe, expect, it, vi } from 'vitest';
 
 import { detectAgent } from './detect-agent';
 
 describe('detectAgent', () => {
-  it('detects amp via AGENT=amp (highest precedence)', () => {
-    expect(
-      detectAgent({
-        stdoutIsTTY: true,
-        env: {
-          AGENT: 'amp',
-          CLAUDECODE: '1',
-          GEMINI_CLI: '1',
-          CODEX_SANDBOX: '1',
-          CURSOR_AGENT: '1',
-        },
-      })
-    ).toEqual({ name: 'amp' });
+  afterEach(() => {
+    vi.unstubAllEnvs();
+  });
 
-    expect(
-      detectAgent({
-        stdoutIsTTY: true,
-        env: {
-          CLAUDECODE: '1',
-          GEMINI_CLI: '1',
-          CODEX_SANDBOX: '1',
-          CURSOR_AGENT: '1',
-          AGENT: 'something',
-        },
-      })
-    ).toEqual({ name: 'claude-code' });
+  it('detects claude via CLAUDECODE', () => {
+    vi.stubEnv('CLAUDECODE', '1');
+    expect(detectAgent()).toEqual({ name: 'claude' });
   });
 
-  it('detects Gemini CLI via GEMINI_CLI', () => {
-    expect(detectAgent({ stdoutIsTTY: true, env: { GEMINI_CLI: '1' } })).toEqual({
-      name: 'gemini-cli',
-    });
+  it('detects claude via CLAUDE_CODE', () => {
+    vi.stubEnv('CLAUDE_CODE', '1');
+    expect(detectAgent()).toEqual({ name: 'claude' });
   });
 
-  it('detects OpenAI Codex via CODEX_SANDBOX', () => {
-    expect(detectAgent({ stdoutIsTTY: true, env: { CODEX_SANDBOX: '1' } })).toEqual({
-      name: 'codex',
-    });
+  it('detects gemini via GEMINI_CLI', () => {
+    vi.stubEnv('GEMINI_CLI', '1');
+    expect(detectAgent()).toEqual({ name: 'gemini' });
   });
 
-  it('detects Cursor Agent via CURSOR_AGENT (even if AGENT is also set)', () => {
-    expect(
-      detectAgent({ stdoutIsTTY: true, env: { CURSOR_AGENT: '1', AGENT: 'something' } })
-    ).toEqual({
-      name: 'cursor',
-    });
+  it('detects codex via CODEX_SANDBOX', () => {
+    vi.stubEnv('CODEX_SANDBOX', '1');
+    expect(detectAgent()).toEqual({ name: 'codex' });
   });
 
-  it('treats generic AGENT as unknown', () => {
-    expect(detectAgent({ stdoutIsTTY: true, env: { AGENT: 'some-agent' } })).toEqual({
-      name: 'unknown',
-    });
+  it('detects codex via CODEX_THREAD_ID', () => {
+    vi.stubEnv('CODEX_THREAD_ID', '1');
+    expect(detectAgent()).toEqual({ name: 'codex' });
   });
 
-  it('does not use heuristics when stdout is a TTY', () => {
-    expect(detectAgent({ stdoutIsTTY: true, env: { TERM: 'dumb' } })).toEqual(undefined);
-    expect(detectAgent({ stdoutIsTTY: true, env: { GIT_PAGER: 'cat' } })).toEqual(undefined);
+  it('detects cursor via CURSOR_AGENT', () => {
+    vi.stubEnv('CURSOR_AGENT', '1');
+    expect(detectAgent()).toEqual({ name: 'cursor' });
   });
 
-  it('detects unknown agent via TERM=dumb when stdout is not a TTY', () => {
-    expect(detectAgent({ stdoutIsTTY: false, env: { TERM: 'dumb' } })).toEqual({
-      name: 'unknown',
-    });
+  it('detects opencode via OPENCODE', () => {
+    vi.stubEnv('OPENCODE', '1');
+    expect(detectAgent()).toEqual({ name: 'opencode' });
   });
 
-  it('detects unknown agent via GIT_PAGER=cat when stdout is not a TTY', () => {
-    expect(detectAgent({ stdoutIsTTY: false, env: { GIT_PAGER: 'cat' } })).toEqual({
-      name: 'unknown',
-    });
+  it('detects explicit agent via AI_AGENT env var', () => {
+    vi.stubEnv('AI_AGENT', 'copilot');
+    expect(detectAgent()).toEqual({ name: 'copilot' });
   });
 
-  it('returns isAgent=false when there are no signals', () => {
-    expect(detectAgent({ stdoutIsTTY: false, env: {} })).toEqual(undefined);
+  it('normalizes AI_AGENT to lowercase', () => {
+    vi.stubEnv('AI_AGENT', 'Copilot');
+    expect(detectAgent()).toEqual({ name: 'copilot' });
   });
 
-  it('applies heuristics even when CI is set (no CI special-casing)', () => {
-    expect(
-      detectAgent({
-        stdoutIsTTY: false,
-        env: { CI: 'true', TERM: 'dumb' },
-      })
-    ).toEqual({ name: 'unknown' });
+  it('AI_AGENT takes precedence over other env vars', () => {
+    vi.stubEnv('AI_AGENT', 'copilot');
+    vi.stubEnv('CLAUDECODE', '1');
+    vi.stubEnv('GEMINI_CLI', '1');
+    expect(detectAgent()).toEqual({ name: 'copilot' });
   });
 
-  it('still detects explicit agents in CI', () => {
-    expect(detectAgent({ stdoutIsTTY: false, env: { CI: 'true', CODEX_SANDBOX: '1' } })).toEqual({
-      name: 'codex',
-    });
+  it('returns undefined when there are no signals', () => {
+    expect(detectAgent()).toEqual(undefined);
   });
 });

code/core/src/telemetry/detect-agent.ts

@@ -1,90 +1,19 @@
-export type KnownAgentName =
-  | 'claude-code'
-  | 'gemini-cli'
-  | 'cursor'
-  | 'codex'
-  | 'opencode'
-  | 'amp'
-  | 'unknown';
+import { detectAgent as stdEnvDetectAgent } from 'std-env';
 
 export type AgentInfo = {
-  name: KnownAgentName;
+  /** The name of the detected AI coding agent (e.g. `claude`, `gemini`, `codex`, `cursor`).
+   * Can be any value supported by std-env or explicitly set via the `AI_AGENT` environment variable.
+   */
+  name: string;
 };
 
 export type AgentDetection = AgentInfo | undefined;
 
-type DetectAgentOptions = {
-  stdoutIsTTY: boolean;
-  env: NodeJS.ProcessEnv;
-};
-
-function detectExplicitAgent(env: NodeJS.ProcessEnv): AgentInfo | undefined {
-  // Amp
-  if (env.AGENT === 'amp') {
-    return {
-      name: 'amp',
-    };
-  }
-
-  // Claude Code
-  if (env.CLAUDECODE) {
-    return {
-      name: 'claude-code',
-    };
-  }
-
-  // Gemini CLI
-  if (env.GEMINI_CLI) {
-    return {
-      name: 'gemini-cli',
-    };
-  }
-
-  // OpenAI Codex
-  if (env.CODEX_SANDBOX) {
-    return {
-      name: 'codex',
-    };
-  }
-
-  // Cursor Agent (proposed / best-effort; Cursor often sets VSCode env vars too)
-  if (env.CURSOR_AGENT) {
-    return {
-      name: 'cursor',
-    };
-  }
-
-  // Generic "AGENT" marker (unknown implementation)
-  if (env.AGENT) {
-    return { name: 'unknown' };
-  }
-
-  return undefined;
-}
-
-/** Detect whether Storybook CLI is likely being invoked by an AI agent. */
-export const detectAgent = (options: DetectAgentOptions): AgentDetection => {
-  const env = options.env;
-
-  // 1) Explicit agent variables (strong signal; allow even in CI/TTY)
-  const explicit = detectExplicitAgent(env);
-  if (explicit) {
-    return explicit;
-  }
-
-  const stdoutIsTTY = options.stdoutIsTTY;
-
-  // 2) Behavioral / fingerprint heuristics (exclude CI to reduce false positives)
-  if (stdoutIsTTY) {
+/** Detect whether Storybook CLI is likely being invoked by an AI agent, using std-env. */
+export const detectAgent = (): AgentDetection => {
+  const { name } = stdEnvDetectAgent();
+  if (!name) {
     return undefined;
   }
-
-  const isDumbTerm = env.TERM === 'dumb';
-  const hasAgentPager = env.GIT_PAGER === 'cat';
-
-  if (isDumbTerm || hasAgentPager) {
-    return { name: 'unknown' };
-  }
-
-  return undefined;
+  return { name };
 };

code/core/src/telemetry/telemetry.ts

@@ -51,7 +51,7 @@ const getOperatingSystem = (): 'Windows' | 'macOS' | 'Linux' | `Other: ${string}
 // by the app. currently:
 // - cliVersion
 const inCI = isCI();
-const agentDetection = detectAgent({ stdoutIsTTY: process.stdout.isTTY, env: process.env });
+const agentDetection = detectAgent();
 const globalContext = {
   inCI,
   isTTY: process.stdout.isTTY,

yarn.lock

@@ -28255,6 +28255,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"std-env@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "std-env@npm:4.0.0"
+  checksum: 10c0/63b1716eae27947adde49e21b7225a0f75fb2c3d410273ae9de8333c07c7d5fc7a0628ae4c8af6b4b49b4274ed46c2bf118ed69b64f1261c9d8213d76ed1c16c
+  languageName: node
+  linkType: hard
+
 "steno@npm:^0.4.1":
   version: 0.4.4
   resolution: "steno@npm:0.4.4"
@@ -28422,6 +28429,7 @@ __metadata:
     sirv: "npm:^2.0.4"
     slash: "npm:^5.0.0"
     source-map: "npm:^0.7.4"
+    std-env: "npm:^4.0.0"
     store2: "npm:^2.14.2"
     strip-ansi: "npm:^7.1.0"
     strip-json-comments: "npm:^5.0.1"