Merge pull request #10 from kiran-4444/fix/config-placeholder-discovery

Ignore env-var placeholders during config key discovery

Author: VisargD

src/utils.js

@@ -386,7 +386,11 @@ export function readExistingConfig() {
     const baseUrl = jsonRead(filePath, "env.ANTHROPIC_BASE_URL");
     if (!baseUrl) continue;
 
-    const authToken = jsonRead(filePath, "env.ANTHROPIC_AUTH_TOKEN") || "";
+    const rawToken  = jsonRead(filePath, "env.ANTHROPIC_AUTH_TOKEN") || "";
+    // A committed config stores the env-var reference (e.g. "${PORTKEY_API_KEY}"),
+    // not a usable key. Treat that as "no key here" so discovery falls through to
+    // the real environment variable instead of using the placeholder literally.
+    const authToken = rawToken.includes("${") ? "" : rawToken;
     const headers   = jsonRead(filePath, "env.ANTHROPIC_CUSTOM_HEADERS") || "";
     const model     = jsonRead(filePath, "model") || "";
 

tests/utils.test.js

@@ -1,22 +1,23 @@
-import { describe, it, expect, beforeEach, afterEach, vi } from "vitest";
 import fs from "node:fs";
-import path from "node:path";
 import os from "node:os";
+import path from "node:path";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import {
-  mask,
-  normalizeProvider,
-  sortModels,
   isLikelyPortkeyApiKeyPermissionError,
   jsonRead,
-  settingsSetEnv,
+  mask,
+  normalizeProvider,
+  readExistingConfig,
+  removeShellRcBlock,
+  settingsReadMcp,
   settingsRemoveKeys,
-  settingsSetMcp,
   settingsRemoveMcp,
-  settingsReadMcp,
-  writeShellRc,
-  removeShellRcBlock,
-  writeFileSecure,
+  settingsSetEnv,
+  settingsSetMcp,
+  sortModels,
   warnIfFileGroupOrWorldReadable,
+  writeFileSecure,
+  writeShellRc,
 } from "../src/utils.js";
 
 function mode(file) {
@@ -146,7 +147,6 @@ describe("jsonRead", () => {
   });
 });
 
-// ── writeFileSecure (0600 for secret-bearing files) ───────────────────────────
 
 describe("writeFileSecure", () => {
   let dir;
@@ -371,3 +371,47 @@ describe("writeShellRc + removeShellRcBlock", () => {
     expect(removeShellRcBlock(file)).toBe(false);
   });
 });
+
+// ── readExistingConfig (key discovery + placeholder guard) ────────────────────
+
+describe("readExistingConfig", () => {
+  let dir, cwd;
+  beforeEach(() => {
+    dir = tmpDir();
+    fs.mkdirSync(path.join(dir, ".git"), { recursive: true });        // mark project root
+    fs.mkdirSync(path.join(dir, ".claude"), { recursive: true });
+    cwd = process.cwd();
+    process.chdir(dir);
+  });
+  afterEach(() => {
+    process.chdir(cwd);
+    fs.rmSync(dir, { recursive: true, force: true });
+  });
+
+  function writeSharedSettings(env) {
+    fs.writeFileSync(
+      path.join(dir, ".claude", "settings.json"),
+      JSON.stringify({ env }, null, 2)
+    );
+  }
+
+  it("recovers a literal key from an existing (pre-fix) config", () => {
+    writeSharedSettings({
+      ANTHROPIC_BASE_URL: "https://api.portkey.ai/v1",
+      ANTHROPIC_AUTH_TOKEN: "pk-live-REAL-KEY",
+    });
+    const cfg = readExistingConfig();
+    expect(cfg.found).toBe(true);
+    expect(cfg.portkeyKey).toBe("pk-live-REAL-KEY");
+  });
+
+  it("does NOT return the ${PORTKEY_API_KEY} placeholder as a usable key", () => {
+    writeSharedSettings({
+      ANTHROPIC_BASE_URL: "https://api.portkey.ai/v1",
+      ANTHROPIC_AUTH_TOKEN: "${PORTKEY_API_KEY}",
+    });
+    const cfg = readExistingConfig();
+    expect(cfg.found).toBe(true);
+    expect(cfg.portkeyKey).toBe("");
+  });
+});