fix(auth): support official Command Code environment names

scripts/live-e2e-profile.mjs

@@ -39,10 +39,11 @@ function runProfile(profile, apiKey) {
   const model = process.env[modelVariable] ?? "deepseek/deepseek-v4-flash"
   const env = {
     ...process.env,
-    COMMANDCODE_API_KEY: apiKey,
+    COMMAND_CODE_API_KEY: apiKey,
     COMMANDCODE_E2E_MODEL: model,
     COMMANDCODE_E2E_PROFILE: profile,
   }
+  delete env.COMMANDCODE_API_KEY
   delete env.COMMANDCODE_E2E_GO_API_KEY
   delete env.COMMANDCODE_E2E_PROVIDER_API_KEY
 

scripts/pi-authenticated.mjs

@@ -11,6 +11,7 @@ const env = {
   ...process.env,
   PI_SKIP_VERSION_CHECK: "1",
 }
+delete env.COMMAND_CODE_API_KEY
 delete env.COMMANDCODE_API_KEY
 
 const child = spawn(

scripts/pi-isolated.mjs

@@ -22,6 +22,7 @@ const env = {
   PI_CODING_AGENT_SESSION_DIR: sessionDir,
   PI_SKIP_VERSION_CHECK: "1",
 }
+delete env.COMMAND_CODE_API_KEY
 delete env.COMMANDCODE_API_KEY
 
 let activeChild

src/api-key.ts

@@ -34,6 +34,7 @@ export function getConfiguredApiKey(
   } = {},
 ): string | undefined {
   const env = options.env ?? process.env
+  if (env.COMMAND_CODE_API_KEY) return env.COMMAND_CODE_API_KEY
   if (env.COMMANDCODE_API_KEY) return env.COMMANDCODE_API_KEY
 
   const home = options.homeDir?.() ?? homedir()

src/quota-command.ts

@@ -45,7 +45,7 @@ export function registerCommandCodeQuota(
       const apiKey = pickCommandCodeApiKey(registryKey, getConfiguredKey())
       if (!apiKey) {
         ctx.ui.notify(
-          "Command Code quota requires an API key. Run /login and select Command Code, or set COMMANDCODE_API_KEY.",
+          "Command Code quota requires an API key. Run /login and select Command Code, or set COMMAND_CODE_API_KEY.",
           "warning",
         )
         return

tests/test-api-key.ts

@@ -21,10 +21,17 @@ async function withAuthFile(
 }
 
 describe("getConfiguredApiKey()", () => {
-  it("prefers the environment variable", () => {
+  it("prefers the official environment variable and keeps the legacy alias", () => {
     assert.equal(
-      getConfiguredApiKey({ env: { COMMANDCODE_API_KEY: "env-key" }, authPaths: [] }),
-      "env-key",
+      getConfiguredApiKey({
+        env: { COMMAND_CODE_API_KEY: "official-key", COMMANDCODE_API_KEY: "legacy-key" },
+        authPaths: [],
+      }),
+      "official-key",
+    )
+    assert.equal(
+      getConfiguredApiKey({ env: { COMMANDCODE_API_KEY: "legacy-key" }, authPaths: [] }),
+      "legacy-key",
     )
   })
 

tests/test-live-e2e.mjs

@@ -48,6 +48,7 @@ function findPiBinary() {
 
 function hasAuthMetadata() {
   return (
+    Boolean(process.env.COMMAND_CODE_API_KEY) ||
     Boolean(process.env.COMMANDCODE_API_KEY) ||
     existsSync(join(homedir(), ".commandcode", "auth.json")) ||
     existsSync(join(homedir(), ".pi", "agent", "auth.json"))
@@ -70,6 +71,7 @@ function safeEnv(overrides = {}) {
     env.PI_CODING_AGENT_DIR = profileAgentDir
     env.COMMANDCODE_MODELS_CACHE = join(profileAgentDir, "commandcode-models.json")
   } else {
+    delete env.COMMAND_CODE_API_KEY
     delete env.COMMANDCODE_API_KEY
   }
   return env

tests/test-omp-compat.mjs

@@ -133,7 +133,7 @@ function runOmp(args, timeoutMs = 30_000) {
         HOME: tempHome,
         USERPROFILE: tempHome,
         PI_CODING_AGENT_DIR: join(tempHome, ".omp", "agent"),
-        COMMANDCODE_API_KEY: "mock-key",
+        COMMAND_CODE_API_KEY: "mock-key",
         COMMANDCODE_API_BASE: `${apiBase}/provider/v1`,
         COMMANDCODE_MODELS_URL: `${apiBase}/provider/v1/models`,
       },

tests/test-pi-authenticated.mjs

@@ -22,7 +22,7 @@ const { writeFileSync } = require("node:fs")
 writeFileSync(process.env.FAKE_PI_LOG, JSON.stringify({
   args: process.argv.slice(2),
   agentDir: process.env.PI_CODING_AGENT_DIR ?? null,
-  apiKey: process.env.COMMANDCODE_API_KEY ?? null,
+  apiKey: process.env.COMMAND_CODE_API_KEY ?? process.env.COMMANDCODE_API_KEY ?? null,
   skipVersionCheck: process.env.PI_SKIP_VERSION_CHECK,
 }))
 NODE
@@ -38,7 +38,8 @@ NODE
         PATH: `${fakeBin}${delimiter}${process.env.PATH ?? ""}`,
         FAKE_PI_LOG: logPath,
         PI_CODING_AGENT_DIR: "/existing/pi-agent",
-        COMMANDCODE_API_KEY: "existing-key",
+        COMMAND_CODE_API_KEY: "official-existing-key",
+        COMMANDCODE_API_KEY: "legacy-existing-key",
       },
       encoding: "utf8",
     })

tests/test-pi-isolated.mjs

@@ -26,7 +26,8 @@ appendFileSync(process.env.FAKE_PI_LOG, JSON.stringify({
   skipVersionCheck: process.env.PI_SKIP_VERSION_CHECK,
   home: process.env.HOME,
   userProfile: process.env.USERPROFILE,
-  inheritedApiKey: process.env.COMMANDCODE_API_KEY ?? null,
+  inheritedApiKey:
+    process.env.COMMAND_CODE_API_KEY ?? process.env.COMMANDCODE_API_KEY ?? null,
 }) + "\\n")
 NODE
 if [ "$1" = "install" ]; then exit 0; fi
@@ -42,7 +43,8 @@ exit ${exitStatus}
         ...process.env,
         PATH: `${fakeBin}${delimiter}${process.env.PATH ?? ""}`,
         FAKE_PI_LOG: logPath,
-        COMMANDCODE_API_KEY: "must-not-leak",
+        COMMAND_CODE_API_KEY: "must-not-leak-official",
+        COMMANDCODE_API_KEY: "must-not-leak-legacy",
       },
       encoding: "utf8",
     })

tests/test-pi-local.mjs

@@ -215,8 +215,8 @@ const env = {
   PI_CODING_AGENT_DIR: agentDir,
   PI_CODING_AGENT_SESSION_DIR: join(tempHome, "sessions"),
   COMMANDCODE_API_BASE: `${apiBase}/provider/v1`,
-  COMMANDCODE_API_KEY: "mock-key",
-  COMMANDCODE_ZDR: "1",
+  COMMAND_CODE_API_KEY: "mock-key",
+  CMD_ZDR: "1",
   COMMANDCODE_MODELS_URL: `${apiBase}/provider/v1/models`,
 }
 

tests/test-quota-command.ts

@@ -68,7 +68,7 @@ describe("commandcode-quota command", () => {
     })
 
     assert.ok(pi.handler)
-    const ctx = context("$COMMANDCODE_API_KEY")
+    const ctx = context("$COMMAND_CODE_API_KEY")
     await pi.handler("", ctx.value)
     assert.equal(ctx.waited(), true)
     assert.equal(requestKey, "fallback-key")

tests/test-smoke.mjs

@@ -7,7 +7,7 @@
  * 3. Can complete a simple prompt (requires Command Code auth)
  *
  * Run with: node tests/test-smoke.mjs
- * Requires: pi on PATH plus COMMANDCODE_API_KEY or live pi auth files.
+ * Requires: pi on PATH plus COMMAND_CODE_API_KEY (or legacy COMMANDCODE_API_KEY) or live pi auth files.
  */
 
 import { spawn } from "node:child_process"
@@ -48,6 +48,7 @@ const RPC_QUERY_TIMEOUT = 60_000
 
 function hasCommandCodeAuth() {
   return (
+    !!process.env.COMMAND_CODE_API_KEY ||
     !!process.env.COMMANDCODE_API_KEY ||
     existsSync(join(homedir(), ".commandcode", "auth.json")) ||
     existsSync(join(homedir(), ".pi", "agent", "auth.json"))