fix(cli): match the GitHub CLI's coding agent detection table

Author: waleedlatif1

packages/sim-cli/src/telemetry/coding-agent.test.ts

@@ -12,21 +12,35 @@ describe('detectCodingAgent', () => {
     [{ CLAUDECODE: '1', CLAUDE_CODE_IS_COWORK: '1' }, 'cowork'],
     [{ CODEX_THREAD_ID: 'thr_1' }, 'codex'],
     [{ CODEX_SANDBOX: 'seatbelt' }, 'codex'],
+    [{ CODEX_CI: '1' }, 'codex'],
     [{ GEMINI_CLI: '1' }, 'gemini-cli'],
-    [{ CURSOR_AGENT: '1' }, 'cursor'],
+    [{ COPILOT_CLI: '1' }, 'copilot-cli'],
+    [{ OPENCODE: '1' }, 'opencode'],
+    [{ ANTIGRAVITY_AGENT: '1' }, 'antigravity'],
+    [{ AUGMENT_AGENT: '1' }, 'augment-cli'],
     [{ CURSOR_TRACE_ID: 'abc' }, 'cursor'],
-    [{ CURSOR_EXTENSION_HOST_ROLE: 'agent-exec' }, 'cursor'],
-    [{ OPENCODE: '1', AGENT: '1' }, 'opencode'],
-    [{ CLINE_ACTIVE: 'true' }, 'cline'],
-    [{ OZ_RUN_ID: 'run_1' }, 'warp'],
-    [{ PI_CODING_AGENT: 'true' }, 'pi'],
+    [{ CURSOR_AGENT: '1' }, 'cursor-cli'],
+    [{ CURSOR_EXTENSION_HOST_ROLE: 'agent-exec' }, 'cursor-cli'],
   ])('recognises %o as %s', (env, expected) => {
     expect(detectCodingAgent(env)).toBe(expected)
   })
 
   it('names Amp rather than the Claude Code marker it also sets', () => {
     expect(detectCodingAgent({ AGENT: 'amp', CLAUDECODE: '1' })).toBe('amp')
-    expect(detectCodingAgent({ AMP_CURRENT_THREAD_ID: 'T-1', CLAUDECODE: '1' })).toBe('amp')
+  })
+
+  it('names the Cursor IDE over the Cursor CLI signal', () => {
+    expect(detectCodingAgent({ CURSOR_TRACE_ID: 'abc', CURSOR_AGENT: '1' })).toBe('cursor')
+  })
+
+  it('reads the declaration Claude Code sets on its shells as claude-code', () => {
+    expect(
+      detectCodingAgent({
+        AI_AGENT: 'claude-code_2-1-270_agent',
+        CLAUDECODE: '1',
+        CLAUDE_CODE_ENTRYPOINT: 'cli',
+      })
+    ).toBe('claude-code')
   })
 
   it('lets an agent declare its own name over every vendor marker', () => {
@@ -52,10 +66,17 @@ describe('detectCodingAgent', () => {
     expect(detectCodingAgent({ AI_AGENT: 'x'.repeat(65) })).toBeUndefined()
   })
 
-  it('ignores markers that only mean an agent is installed', () => {
-    expect(detectCodingAgent({ REPL_ID: 'abc', GOOSE_PROVIDER: 'x', AIDER_API_KEY: 'k' })).toBe(
-      undefined
-    )
+  it('ignores signals that describe where a person works rather than an agent driving it', () => {
+    expect(
+      detectCodingAgent({
+        REPL_ID: 'abc',
+        GOOSE_PROVIDER: 'x',
+        TERM_PROGRAM: 'kiro',
+        PATH: '/home/me/.pi/agent/bin:/usr/bin',
+        AGENT: 'goose',
+        OPENCODE_CLIENT: 'vscode',
+      })
+    ).toBeUndefined()
   })
 
   it('ignores a cursor role that is not the agent executor', () => {

packages/sim-cli/src/telemetry/coding-agent.ts

@@ -3,19 +3,21 @@
  *
  * Agents mark the shells they spawn with an environment variable, and the CLI
  * reports that mark so usage driven by an agent can be told apart from a person
- * at a terminal. The checks, their order, and the names follow the GitHub CLI
- * (`internal/agents/detect.go`), which is the most complete verified table:
- * generic conventions first, then vendor markers, with the more specific
- * marker ahead of a broader one it implies (Amp sets `CLAUDECODE` too; Cowork
- * is Claude Code plus its own flag).
+ * at a terminal. The checks, their order, and the names follow the GitHub CLI's
+ * `internal/agents/detect.go` exactly: the generic `AI_AGENT` declaration
+ * first, then vendor markers, with a more specific agent ahead of a broader
+ * marker it also sets (Amp and Cowork both set `CLAUDECODE`).
  *
- * Only markers an agent sets on the shells it drives are consulted. Variables
- * that merely mean an agent is installed or configured — `REPL_ID`,
- * `GOOSE_PROVIDER`, `AIDER_*`, `COPILOT_*` — are deliberately absent, because
- * they would attribute a person's own command to an agent.
+ * Four of that table's signals are deliberately left out, each one the GitHub
+ * CLI itself marks as low confidence: `REPL_ID` (present in every Replit
+ * environment), `GOOSE_PROVIDER` (Goose is merely configured),
+ * `TERM_PROGRAM=kiro` (Kiro's terminal, which a person uses too), and a
+ * `.pi/agent` entry on `PATH`. Each describes where a person is working rather
+ * than an agent driving the command, so reporting it would attribute that
+ * person's own commands to an agent.
  */
 
-/** The value an agent may declare itself with under the generic conventions. */
+/** The value an agent may declare itself with under `AI_AGENT`. */
 const AGENT_NAME_PATTERN = /^[a-z0-9_-]+$/i
 const MAX_AGENT_NAME_LENGTH = 64
 
@@ -29,34 +31,25 @@ const anyOf =
   (env: NodeJS.ProcessEnv) =>
     variables.some((variable) => Boolean(env[variable]))
 
-/** Vendor markers, most specific first. */
+/** Vendor markers, in the GitHub CLI's order. */
 const AGENT_MARKERS: readonly AgentMarker[] = [
-  { name: 'amp', matches: (env) => env.AGENT === 'amp' || Boolean(env.AMP_CURRENT_THREAD_ID) },
-  {
-    name: 'codex',
-    matches: anyOf(
-      'CODEX_THREAD_ID',
-      'CODEX_SANDBOX',
-      'CODEX_CI',
-      'CODEX_SANDBOX_NETWORK_DISABLED'
-    ),
-  },
+  { name: 'amp', matches: (env) => env.AGENT === 'amp' },
+  /** Set by Codex on the commands it runs (`codex-rs/core`: `spawn.rs`, `exec_env.rs`, `unified_exec`). */
+  { name: 'codex', matches: anyOf('CODEX_SANDBOX', 'CODEX_CI', 'CODEX_THREAD_ID') },
   { name: 'gemini-cli', matches: anyOf('GEMINI_CLI') },
+  { name: 'copilot-cli', matches: anyOf('COPILOT_CLI') },
+  /** Not `OPENCODE_CALLER` or `OPENCODE_CLIENT`, which name what launched OpenCode. */
   { name: 'opencode', matches: anyOf('OPENCODE') },
   { name: 'antigravity', matches: anyOf('ANTIGRAVITY_AGENT') },
-  { name: 'augment', matches: anyOf('AUGMENT_AGENT') },
-  { name: 'cline', matches: anyOf('CLINE_ACTIVE') },
+  { name: 'augment-cli', matches: anyOf('AUGMENT_AGENT') },
   { name: 'cowork', matches: anyOf('CLAUDE_CODE_IS_COWORK') },
+  /** `CLAUDECODE` is documented in Claude Code's environment variable reference. */
   { name: 'claude-code', matches: anyOf('CLAUDECODE', 'CLAUDE_CODE') },
+  { name: 'cursor', matches: anyOf('CURSOR_TRACE_ID') },
   {
-    name: 'cursor',
-    matches: (env) =>
-      anyOf('CURSOR_AGENT', 'CURSOR_TRACE_ID')(env) ||
-      env.CURSOR_EXTENSION_HOST_ROLE === 'agent-exec',
+    name: 'cursor-cli',
+    matches: (env) => Boolean(env.CURSOR_AGENT) || env.CURSOR_EXTENSION_HOST_ROLE === 'agent-exec',
   },
-  { name: 'warp', matches: anyOf('OZ_RUN_ID') },
-  { name: 'pi', matches: anyOf('PI_CODING_AGENT') },
-  { name: 'crush', matches: anyOf('CRUSH') },
 ]
 
 /**
@@ -91,17 +84,11 @@ export const NO_CODING_AGENT = 'none'
 /**
  * The agent driving this shell, or `undefined` for a person at a terminal.
  *
- * `AI_AGENT` and `AGENT` are the two generic conventions agents have converged
- * on for naming themselves and win over vendor markers when set. `AGENT` is
- * consulted only when it carries a name: OpenCode sets it to `1`, which names
- * nothing, and its own marker handles it.
+ * `AI_AGENT` is the generic convention agents use to name themselves, and wins
+ * over every vendor marker when it holds a well-formed name.
  */
 export function detectCodingAgent(env: NodeJS.ProcessEnv = process.env): string | undefined {
-  const declared = declaredAgentName(env.AI_AGENT)
-  if (declared) return declared
-
-  const generic = declaredAgentName(env.AGENT)
-  if (generic && generic !== '1') return generic
-
-  return AGENT_MARKERS.find((marker) => marker.matches(env))?.name
+  return (
+    declaredAgentName(env.AI_AGENT) ?? AGENT_MARKERS.find((marker) => marker.matches(env))?.name
+  )
 }