pi-llama-cpp 0.8.1 → 0.8.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-llama-cpp",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "description": "Pi extension for llama.cpp integration. Supports router, single and legacy models. Supports multiple servers.",
   "keywords": [
     "pi",
@@ -36,8 +36,8 @@
     "@earendil-works/pi-tui": "*"
   },
   "devDependencies": {
-    "@types/node": "^26.0.1",
+    "@types/node": "^26.1.1",
     "prettier-plugin-organize-imports": "^4.3.0",
-    "vitest": "^4.1.9"
+    "vitest": "^4.1.10"
   }
 }

package/src/resolver.ts

@@ -1,6 +1,6 @@
 import {
-  AuthStorage,
   getAgentDir,
+  readStoredCredential,
   SettingsManager,
 } from "@earendil-works/pi-coding-agent";
 import { readFile } from "node:fs/promises";
@@ -16,7 +16,6 @@ export class ConfigResolver {
   private warnings: string[] = [];
 
   private cachedUrls: string[] = [];
-  private authStorage = AuthStorage.create(join(getAgentDir(), "auth.json"));
   private settingsManager = SettingsManager.create(
     process.cwd(),
     getAgentDir(),
@@ -107,13 +106,11 @@ export class ConfigResolver {
   }
 
   /**
-   * Resolves API key for the provider ID using Pi's AuthStorage
+   * Resolves API key for the provider ID using Pi's stored credentials
    */
-  async resolveApiKey(providerId: string): Promise<string> {
-    this.authStorage.reload();
-    const apiKey = await this.authStorage.getApiKey(providerId);
-
-    return apiKey ?? API_KEY_PLACEHOLDER;
+  resolveApiKey(providerId: string): string {
+    const credential = readStoredCredential(providerId);
+    return credential?.apiKey ?? API_KEY_PLACEHOLDER;
   }
 
   /**

package/tests/resolver.test.ts

@@ -5,22 +5,18 @@ import {
 } from "../src/constants";
 
 // Hoisted mock instances — survives vi.resetModules()
-const mockAuthStorage = vi.hoisted(() => ({
-  reload: vi.fn(),
-  getApiKey: vi.fn(),
-}));
+const mockReadStoredCredential = vi.hoisted(() => vi.fn());
 
 const mockSettingsManager = vi.hoisted(() => ({
   getProjectSettings: vi.fn(),
   getGlobalSettings: vi.fn(),
 }));
 
-// Mock getAgentDir, AuthStorage, and SettingsManager before importing resolver
+// Mock getAgentDir, readStoredCredential, and SettingsManager before importing resolver
 vi.mock("@earendil-works/pi-coding-agent", () => ({
   getAgentDir: vi.fn().mockReturnValue("/fake/agent/dir"),
-  AuthStorage: {
-    create: vi.fn().mockReturnValue(mockAuthStorage),
-  },
+  readStoredCredential: (...args: unknown[]) =>
+    mockReadStoredCredential(...args),
   SettingsManager: {
     create: vi.fn().mockReturnValue(mockSettingsManager),
   },
@@ -145,50 +141,44 @@ describe("API key resolution", () => {
   beforeEach(() => {
     vi.clearAllMocks();
     mockGetAgentDir.mockReturnValue("/fake/agent/dir");
-    mockAuthStorage.reload.mockReturnValue(undefined);
-    mockAuthStorage.getApiKey.mockResolvedValue(undefined);
+    mockReadStoredCredential.mockReturnValue(undefined);
   });
 
-  it("should return placeholder when auth file does not exist", async () => {
-    mockAuthStorage.getApiKey.mockResolvedValue(undefined);
+  it("should return placeholder when credential is not found", () => {
+    mockReadStoredCredential.mockReturnValue(undefined);
 
     const resolver = new ConfigResolver();
-    const result = await resolver.resolveApiKey(
-      "llama-server=http://127.0.0.1:8080",
-    );
+    const result = resolver.resolveApiKey("llama-server=http://127.0.0.1:8080");
 
     expect(result).toEqual(API_KEY_PLACEHOLDER);
   });
 
-  it("should return placeholder when provider key is missing", async () => {
-    mockAuthStorage.getApiKey.mockResolvedValue(undefined);
+  it("should return placeholder when apiKey is missing from credential", () => {
+    mockReadStoredCredential.mockReturnValue({});
 
     const resolver = new ConfigResolver();
-    const result = await resolver.resolveApiKey(
-      "llama-server=http://127.0.0.1:8080",
-    );
+    const result = resolver.resolveApiKey("llama-server=http://127.0.0.1:8080");
 
     expect(result).toEqual(API_KEY_PLACEHOLDER);
   });
 
-  it("should return the provider key when present", async () => {
-    mockAuthStorage.getApiKey.mockResolvedValue("test-api-key");
+  it("should return the apiKey when present in credential", () => {
+    mockReadStoredCredential.mockReturnValue({ apiKey: "test-api-key" });
 
     const resolver = new ConfigResolver();
-    const result = await resolver.resolveApiKey(
-      "llama-server=http://127.0.0.1:8080",
-    );
+    const result = resolver.resolveApiKey("llama-server=http://127.0.0.1:8080");
 
     expect(result).toEqual("test-api-key");
   });
 
-  it("should call reload before each getApiKey", async () => {
-    mockAuthStorage.getApiKey.mockResolvedValue("cached-key");
+  it("should call readStoredCredential with the provider ID", () => {
+    mockReadStoredCredential.mockReturnValue({ apiKey: "test-key" });
 
     const resolver = new ConfigResolver();
-    await resolver.resolveApiKey("llama-server=http://127.0.0.1:8080");
-    await resolver.resolveApiKey("llama-server=http://127.0.0.1:8080");
+    resolver.resolveApiKey("llama-server=http://127.0.0.1:8080");
 
-    expect(mockAuthStorage.reload).toHaveBeenCalledTimes(2);
+    expect(mockReadStoredCredential).toHaveBeenCalledWith(
+      "llama-server=http://127.0.0.1:8080",
+    );
   });
 });