@almightygpt/core 0.10.0 → 0.10.1

package/dist/auth/validator.js

@@ -82,7 +82,7 @@ async function validateOpenAI(key) {
             return {
                 ok: false,
                 statusCode: res.status,
-                error: normalizeOpenAIError(res.status, rawBody),
+                error: normalizeOpenAIError(res.status, rawBody, key),
                 rawBody,
             };
         }
@@ -117,7 +117,7 @@ async function validateAnthropic(key) {
             return {
                 ok: false,
                 statusCode: res.status,
-                error: normalizeAnthropicError(res.status, rawBody),
+                error: normalizeAnthropicError(res.status, rawBody, key),
                 rawBody,
             };
         }
@@ -167,26 +167,26 @@ async function validateGoogle(key) {
 // Parse known provider JSON error shapes into short, user-safe messages.
 // Never echo the raw key back even by accident (defense in depth: we
 // also redact anything that looks like the submitted key).
-function normalizeOpenAIError(status, rawBody) {
+function normalizeOpenAIError(status, rawBody, submittedKey) {
     // OpenAI shape: { "error": { "message": "...", "type": "...", "code": "..." } }
     try {
         const parsed = JSON.parse(rawBody);
         const msg = parsed.error?.message;
         if (msg)
-            return `[${status}] OpenAI: ${truncate(msg, 200)}`;
+            return `[${status}] OpenAI: ${truncate(redactKey(msg, submittedKey), 200)}`;
     }
     catch {
         /* fall through */
     }
     return statusOnlyMessage("OpenAI", status);
 }
-function normalizeAnthropicError(status, rawBody) {
+function normalizeAnthropicError(status, rawBody, submittedKey) {
     // Anthropic shape: { "type": "error", "error": { "type": "...", "message": "..." } }
     try {
         const parsed = JSON.parse(rawBody);
         const msg = parsed.error?.message;
         if (msg)
-            return `[${status}] Anthropic: ${truncate(msg, 200)}`;
+            return `[${status}] Anthropic: ${truncate(redactKey(msg, submittedKey), 200)}`;
     }
     catch {
         /* fall through */
@@ -197,21 +197,26 @@ function normalizeGoogleError(status, rawBody, submittedKey) {
     // Google shape: { "error": { "code": N, "message": "...", "status": "..." } }
     try {
         const parsed = JSON.parse(rawBody);
-        let msg = parsed.error?.message ?? "";
-        // Belt-and-braces redaction: Google sometimes echoes the key in
-        // error messages (e.g. "API key not valid. Pass a valid API key.")
-        // — we don't ship the actual key value if it ever ends up here.
-        if (submittedKey && msg.includes(submittedKey)) {
-            msg = msg.replace(submittedKey, "<redacted-key>");
-        }
+        const msg = parsed.error?.message ?? "";
         if (msg)
-            return `[${status}] Google: ${truncate(msg, 200)}`;
+            return `[${status}] Google: ${truncate(redactKey(msg, submittedKey), 200)}`;
     }
     catch {
         /* fall through */
     }
     return statusOnlyMessage("Google", status);
 }
+/**
+ * Belt-and-braces: if a provider echoes the submitted key in its
+ * error body, redact before surfacing to the user. Codex's v0.8 P2 #6
+ * found this gap (originally Google-only); now applied to all three
+ * providers via this shared helper.
+ */
+function redactKey(msg, key) {
+    if (!key || !msg.includes(key))
+        return msg;
+    return msg.split(key).join("<redacted-key>");
+}
 function statusOnlyMessage(provider, status) {
     if (status === 401 || status === 403) {
         return `[${status}] ${provider} rejected the key (unauthorized).`;

package/dist/auth/validator.js.map

@@ -1 +1 @@
-{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../src/auth/validator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../src/auth/validator.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@almightygpt/core",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "Core orchestrator, adapters, config, runs, and review logic for AlmightyGPT",
   "license": "MIT",
   "type": "module",
@@ -20,7 +20,9 @@
   "scripts": {
     "build": "tsc -p tsconfig.json",
     "clean": "rm -rf dist",
-    "watch": "tsc -p tsconfig.json --watch"
+    "watch": "tsc -p tsconfig.json --watch",
+    "test": "vitest run",
+    "test:watch": "vitest"
   },
   "dependencies": {
     "@anthropic-ai/sdk": "^0.30.0",

package/src/auth/__tests__/keychain.test.ts

@@ -0,0 +1,171 @@
+/**
+ * Keychain adapter tests.
+ *
+ * Strategy (addresses Codex's v0.8 plan-review R3 — "KeychainAdapter
+ * dependency injection"): we mock the dynamic import of
+ * `@napi-rs/keyring` itself, replacing the Entry class with a fake
+ * we control per test. This sidesteps needing to refactor the real
+ * code to accept an injected adapter — the dynamic-import boundary
+ * IS the seam we test against.
+ *
+ * Codex's main concern (P2 #4) was that read failures were silently
+ * converted into "absent". These tests prove the new behavior:
+ *   - found    → { kind: "found", key }
+ *   - absent   → { kind: "absent" }
+ *   - throws   → { kind: "error", message }  (was: silently dropped)
+ */
+
+import { describe, it, expect, beforeEach, vi } from "vitest";
+import { _resetKeychainCache } from "../keychain.js";
+
+// Track the entry methods per test so we can rewire mid-suite.
+let mockGetPassword: () => string | null;
+let mockSetPassword: (key: string) => void;
+let mockDeletePassword: () => boolean;
+let constructorThrows = false;
+let importThrows = false;
+
+vi.mock("@napi-rs/keyring", () => ({
+  get Entry() {
+    if (importThrows) throw new Error("synthetic import failure");
+    return class FakeEntry {
+      constructor(_service: string, _account: string) {
+        if (constructorThrows) {
+          throw new Error("native binding refused to initialize");
+        }
+      }
+      getPassword() {
+        return mockGetPassword();
+      }
+      setPassword(p: string) {
+        mockSetPassword(p);
+      }
+      deletePassword() {
+        return mockDeletePassword();
+      }
+    };
+  },
+}));
+
+import { getKeychain } from "../keychain.js";
+
+beforeEach(() => {
+  _resetKeychainCache();
+  mockGetPassword = () => null;
+  mockSetPassword = () => {};
+  mockDeletePassword = () => true;
+  constructorThrows = false;
+  importThrows = false;
+});
+
+describe("keychain adapter — availability", () => {
+  it("reports available=true when native binding loads cleanly", async () => {
+    const kc = await getKeychain();
+    expect(kc.available).toBe(true);
+    expect(kc.describeBackend()).not.toContain("unavailable");
+  });
+
+  it("reports available=false + reason when native binding throws on init", async () => {
+    constructorThrows = true;
+    const kc = await getKeychain();
+    expect(kc.available).toBe(false);
+    expect(kc.describeBackend()).toContain("unavailable");
+    expect(kc.describeBackend()).toMatch(/initialize|native/i);
+  });
+
+  it("get on unavailable adapter returns { kind: 'absent' } (not throw)", async () => {
+    constructorThrows = true;
+    const kc = await getKeychain();
+    const r = await kc.get("openai");
+    expect(r).toEqual({ kind: "absent" });
+  });
+
+  it("set on unavailable adapter throws with a clear hint", async () => {
+    constructorThrows = true;
+    const kc = await getKeychain();
+    await expect(kc.set("openai", "x")).rejects.toThrow(/unavailable|environment/i);
+  });
+});
+
+describe("keychain adapter — get behavior (Codex P2 #4 regression coverage)", () => {
+  it("found path returns { kind: 'found', key }", async () => {
+    mockGetPassword = () => "stored-secret";
+    const kc = await getKeychain();
+    const r = await kc.get("anthropic");
+    expect(r).toEqual({ kind: "found", key: "stored-secret" });
+  });
+
+  it("absent path returns { kind: 'absent' } when getPassword returns null", async () => {
+    mockGetPassword = () => null;
+    const kc = await getKeychain();
+    const r = await kc.get("openai");
+    expect(r).toEqual({ kind: "absent" });
+  });
+
+  it("error path returns { kind: 'error', message } when getPassword throws — NOT silently absent", async () => {
+    mockGetPassword = () => {
+      throw new Error("keyring locked by OS");
+    };
+    const kc = await getKeychain();
+    const r = await kc.get("openai");
+    expect(r.kind).toBe("error");
+    if (r.kind === "error") {
+      expect(r.message).toContain("keyring locked");
+    }
+  });
+
+  it("error path preserves non-Error throws via String(err)", async () => {
+    mockGetPassword = () => {
+      throw "raw string error";
+    };
+    const kc = await getKeychain();
+    const r = await kc.get("openai");
+    expect(r.kind).toBe("error");
+    if (r.kind === "error") {
+      expect(r.message).toContain("raw string error");
+    }
+  });
+});
+
+describe("keychain adapter — set / remove", () => {
+  it("set forwards the key to the underlying Entry", async () => {
+    const writes: string[] = [];
+    mockSetPassword = (p) => writes.push(p);
+    const kc = await getKeychain();
+    await kc.set("google", "new-key");
+    expect(writes).toEqual(["new-key"]);
+  });
+
+  it("remove returns true when entry existed", async () => {
+    mockDeletePassword = () => true;
+    const kc = await getKeychain();
+    const removed = await kc.remove("openai");
+    expect(removed).toBe(true);
+  });
+
+  it("remove returns false (not throws) when entry didn't exist", async () => {
+    mockDeletePassword = () => {
+      throw new Error("not found");
+    };
+    const kc = await getKeychain();
+    const removed = await kc.remove("openai");
+    expect(removed).toBe(false);
+  });
+});
+
+describe("keychain adapter — caching", () => {
+  it("getKeychain returns the same instance across calls (singleton)", async () => {
+    const a = await getKeychain();
+    const b = await getKeychain();
+    expect(a).toBe(b);
+  });
+
+  it("_resetKeychainCache forces a fresh load on next getKeychain", async () => {
+    const a = await getKeychain();
+    _resetKeychainCache();
+    constructorThrows = true; // change behavior between loads
+    const b = await getKeychain();
+    expect(a.available).toBe(true);
+    expect(b.available).toBe(false);
+  });
+});

package/src/auth/__tests__/resolver.test.ts

@@ -0,0 +1,231 @@
+/**
+ * Resolver tests — proves the priority chain.
+ *
+ * Codex's v0.8 security review (P1 #3) called out that without these
+ * tests, the resolver could silently regress and ship — because
+ * `npm run test` would pass vacuously.
+ *
+ * Each test isolates the keychain via vi.mock so we control its
+ * behavior per case. Env vars are reset in beforeEach so test order
+ * doesn't matter.
+ */
+
+import { describe, it, expect, beforeEach, afterEach, vi } from "vitest";
+import { resolveApiKey, requireApiKey } from "../resolver.js";
+import { AuthMissingError } from "../types.js";
+
+// Mock the keychain module before any test runs. Each test then
+// overrides the mock's return for getKeychain().
+vi.mock("../keychain.js", () => ({
+  getKeychain: vi.fn(),
+}));
+import { getKeychain } from "../keychain.js";
+
+const PROVIDER_ENV_VAR = {
+  openai: "OPENAI_API_KEY",
+  anthropic: "ANTHROPIC_API_KEY",
+  google: "GOOGLE_API_KEY",
+} as const;
+
+function makeKeychainStub(behavior: {
+  available: boolean;
+  get?: () => Promise<
+    | { kind: "found"; key: string }
+    | { kind: "absent" }
+    | { kind: "error"; message: string }
+  >;
+}) {
+  return {
+    available: behavior.available,
+    describeBackend: () => "test-backend",
+    get: behavior.get ?? (async () => ({ kind: "absent" as const })),
+    set: async () => {},
+    remove: async () => true,
+  };
+}
+
+describe("resolveApiKey — priority order", () => {
+  const savedEnv: Record<string, string | undefined> = {};
+
+  beforeEach(() => {
+    // Snapshot + clear all provider env vars so test inputs are
+    // deterministic.
+    for (const v of Object.values(PROVIDER_ENV_VAR)) {
+      savedEnv[v] = process.env[v];
+      delete process.env[v];
+    }
+    delete process.env.GEMINI_API_KEY;
+    vi.clearAllMocks();
+  });
+
+  afterEach(() => {
+    // Restore original env so we don't pollute the runner / sibling tests.
+    for (const [k, v] of Object.entries(savedEnv)) {
+      if (v === undefined) delete process.env[k];
+      else process.env[k] = v;
+    }
+  });
+
+  it("explicit param wins over env (which would otherwise win over keychain)", async () => {
+    process.env.OPENAI_API_KEY = "from-env";
+    vi.mocked(getKeychain).mockResolvedValue(
+      makeKeychainStub({
+        available: true,
+        get: async () => ({ kind: "found", key: "from-keychain" }),
+      }),
+    );
+    const r = await resolveApiKey("openai", { explicit: "from-explicit" });
+    expect(r.source).toBe("explicit");
+    expect(r.key).toBe("from-explicit");
+  });
+
+  it("env wins over keychain — prevents stale-keychain-key bug Codex flagged", async () => {
+    process.env.OPENAI_API_KEY = "from-env";
+    vi.mocked(getKeychain).mockResolvedValue(
+      makeKeychainStub({
+        available: true,
+        get: async () => ({ kind: "found", key: "from-keychain" }),
+      }),
+    );
+    const r = await resolveApiKey("openai");
+    expect(r.source).toBe("env");
+    expect(r.key).toBe("from-env");
+    expect(r.envVar).toBe("OPENAI_API_KEY");
+  });
+
+  it("keychain wins over missing", async () => {
+    vi.mocked(getKeychain).mockResolvedValue(
+      makeKeychainStub({
+        available: true,
+        get: async () => ({ kind: "found", key: "from-keychain" }),
+      }),
+    );
+    const r = await resolveApiKey("openai");
+    expect(r.source).toBe("keychain");
+    expect(r.key).toBe("from-keychain");
+  });
+
+  it("returns missing when no source has the key", async () => {
+    vi.mocked(getKeychain).mockResolvedValue(
+      makeKeychainStub({ available: true }),
+    );
+    const r = await resolveApiKey("openai");
+    expect(r.source).toBe("missing");
+    expect(r.key).toBeUndefined();
+  });
+
+  it("returns keychain_error (not missing) when keychain read fails", async () => {
+    vi.mocked(getKeychain).mockResolvedValue(
+      makeKeychainStub({
+        available: true,
+        get: async () => ({ kind: "error", message: "denied by OS" }),
+      }),
+    );
+    const r = await resolveApiKey("openai");
+    expect(r.source).toBe("keychain_error");
+    expect(r.keychainError).toBe("denied by OS");
+  });
+
+  it("keychain unavailability degrades to missing (not error) — backward compat", async () => {
+    vi.mocked(getKeychain).mockResolvedValue(
+      makeKeychainStub({ available: false }),
+    );
+    const r = await resolveApiKey("openai");
+    expect(r.source).toBe("missing");
+  });
+
+  it("skipKeychain option bypasses keychain entirely", async () => {
+    process.env.OPENAI_API_KEY = "from-env";
+    // Keychain mock would throw if called — proves skipKeychain takes effect.
+    vi.mocked(getKeychain).mockImplementation(() => {
+      throw new Error("getKeychain should not be called when skipKeychain is true");
+    });
+    const r = await resolveApiKey("openai", { skipKeychain: true });
+    expect(r.source).toBe("env");
+  });
+
+  it("Google provider checks BOTH GOOGLE_API_KEY and GEMINI_API_KEY", async () => {
+    delete process.env.GOOGLE_API_KEY;
+    process.env.GEMINI_API_KEY = "from-gemini-env";
+    vi.mocked(getKeychain).mockResolvedValue(
+      makeKeychainStub({ available: false }),
+    );
+    const r = await resolveApiKey("google");
+    expect(r.source).toBe("env");
+    expect(r.key).toBe("from-gemini-env");
+    expect(r.envVar).toBe("GEMINI_API_KEY");
+  });
+
+  it("Google prefers GOOGLE_API_KEY over GEMINI_API_KEY when both set", async () => {
+    process.env.GOOGLE_API_KEY = "primary";
+    process.env.GEMINI_API_KEY = "secondary";
+    vi.mocked(getKeychain).mockResolvedValue(
+      makeKeychainStub({ available: false }),
+    );
+    const r = await resolveApiKey("google");
+    expect(r.source).toBe("env");
+    expect(r.envVar).toBe("GOOGLE_API_KEY");
+    expect(r.key).toBe("primary");
+  });
+
+  it("empty env var is treated as not set (falls through to keychain)", async () => {
+    process.env.OPENAI_API_KEY = "";
+    vi.mocked(getKeychain).mockResolvedValue(
+      makeKeychainStub({
+        available: true,
+        get: async () => ({ kind: "found", key: "from-keychain" }),
+      }),
+    );
+    const r = await resolveApiKey("openai");
+    expect(r.source).toBe("keychain");
+  });
+});
+
+describe("requireApiKey — throws AuthMissingError on missing / keychain_error", () => {
+  const savedEnv: Record<string, string | undefined> = {};
+
+  beforeEach(() => {
+    for (const v of Object.values(PROVIDER_ENV_VAR)) {
+      savedEnv[v] = process.env[v];
+      delete process.env[v];
+    }
+    delete process.env.GEMINI_API_KEY;
+    vi.clearAllMocks();
+  });
+
+  afterEach(() => {
+    for (const [k, v] of Object.entries(savedEnv)) {
+      if (v === undefined) delete process.env[k];
+      else process.env[k] = v;
+    }
+  });
+
+  it("returns the key when found", async () => {
+    process.env.ANTHROPIC_API_KEY = "the-key";
+    vi.mocked(getKeychain).mockResolvedValue(
+      makeKeychainStub({ available: false }),
+    );
+    const key = await requireApiKey("anthropic");
+    expect(key).toBe("the-key");
+  });
+
+  it("throws AuthMissingError with provider + env var when missing", async () => {
+    vi.mocked(getKeychain).mockResolvedValue(
+      makeKeychainStub({ available: true }),
+    );
+    await expect(requireApiKey("anthropic")).rejects.toThrow(AuthMissingError);
+    await expect(requireApiKey("anthropic")).rejects.toThrow(/anthropic/);
+    await expect(requireApiKey("anthropic")).rejects.toThrow(/ANTHROPIC_API_KEY/);
+  });
+
+  it("throws AuthMissingError with a DIFFERENT message for keychain_error", async () => {
+    vi.mocked(getKeychain).mockResolvedValue(
+      makeKeychainStub({
+        available: true,
+        get: async () => ({ kind: "error", message: "keyring locked" }),
+      }),
+    );
+    await expect(requireApiKey("anthropic")).rejects.toThrow(/keyring locked/);
+    await expect(requireApiKey("anthropic")).rejects.toThrow(/Keychain read failed/);
+  });
+});