pi-llama-cpp 0.9.2 → 0.10.0

package/src/resolver.ts

@@ -1,149 +0,0 @@
-import { ApiKeyCredential, ModelThinkingLevel } from "@earendil-works/pi-ai";
-import {
-  getAgentDir,
-  readStoredCredential,
-  SettingsManager,
-} from "@earendil-works/pi-coding-agent";
-import { readFile } from "node:fs/promises";
-import { join } from "node:path";
-import {
-  API_KEY_PLACEHOLDER,
-  DEFAULT_LLAMA_SERVER_URL,
-  DEFAULT_THINKING_BUDGETS,
-} from "./constants";
-
-export class ConfigResolver {
-  private warnings: string[] = [];
-
-  private cachedUrls: string[] = [];
-  private settingsManager = SettingsManager.create(
-    process.cwd(),
-    getAgentDir(),
-  );
-
-  /**
-   * Resolves the llama-server URL by searching in the global settings.json
-   */
-  private async resolveGlobalUrl(): Promise<string | null> {
-    const settings = this.settingsManager.getGlobalSettings();
-    const { llamaServerUrl = null } = settings as Record<string, string>;
-
-    return llamaServerUrl;
-  }
-
-  /**
-   * Resolves the llama-server URL by searching in the project's .pi/settings.json
-   */
-  private async resolveProjectUrl(): Promise<string | null> {
-    // Warn the user for deprecation
-    try {
-      const filePath = join(process.cwd(), ".pi", "llama-server.json");
-      const { url = null } = JSON.parse(await readFile(filePath, "utf-8"));
-
-      const messages = [
-        "[pi-llama-cpp]",
-        "The project-level `.pi/llama-server.json` file has been deprecated.",
-        "It will work for now, but you must follow these instructions as soon as possible:",
-        '- Move your url to the project-level `.pi/settings.json` file as {"llamaServerUrl": "<url>"}.',
-        "- Remove the old `.pi/llama-server.json` file.",
-      ];
-
-      this.warnings.push(messages.join("\n"));
-
-      return url;
-    } catch {
-      // No old file available, continue as normal
-    }
-
-    const settings = this.settingsManager.getProjectSettings();
-    const { llamaServerUrl = null } = settings as Record<string, string>;
-
-    return llamaServerUrl;
-  }
-
-  /**
-   * Resolves the llama-server URL from the environment
-   */
-  private async resolveEnvUrl(): Promise<string | null> {
-    return process.env.LLAMA_SERVER_URL ?? null;
-  }
-
-  /**
-   * Tries all possible ways to retrieve the llama-server URL(s)
-   */
-  private async extractJoinedUrls(): Promise<string> {
-    // 1. per-project config
-    let response = await this.resolveProjectUrl();
-    if (response) return response;
-
-    // 2. env
-    response = await this.resolveEnvUrl();
-    if (response) return response;
-
-    // 3. global settings
-    response = await this.resolveGlobalUrl();
-    if (response) return response;
-
-    // 4. default
-    return DEFAULT_LLAMA_SERVER_URL;
-  }
-
-  /**
-   * Resolves URLs where llama-servers are running (cached)
-   */
-  async resolveUrls(): Promise<string[]> {
-    if (this.cachedUrls.length > 0) return this.cachedUrls;
-
-    const raw = await this.extractJoinedUrls();
-    const urls = raw
-      .split(";")
-      .map((u) => u.trim())
-      .filter((u) => u.length > 0)
-      .map((u) => u.replace(/\/+$/, ""));
-
-    this.cachedUrls = urls;
-    return this.cachedUrls;
-  }
-
-  /**
-   * Resolves API key for the provider ID using Pi's stored credentials
-   */
-  resolveApiKey(providerId: string): string {
-    const credential = readStoredCredential(providerId) as ApiKeyCredential;
-    return credential?.key ?? API_KEY_PLACEHOLDER;
-  }
-
-  /**
-   * Returns warnings collected during URL resolution.
-   */
-  getWarnings(): string[] {
-    const warnings = [...this.warnings];
-    this.warnings.length = 0;
-
-    return warnings;
-  }
-
-  /*
-   * Resolves the current thinking level from Pi.
-   *
-   * @returns Selected level
-   */
-  resolveThinkingLevel(): ModelThinkingLevel | undefined {
-    return this.settingsManager.getDefaultThinkingLevel();
-  }
-
-  /**
-   * Resolves the effective thinking budgets from settings
-   *
-   * @returns Thinking budgets
-   */
-  resolveThinkingBudgets(): Record<ModelThinkingLevel, number> {
-    const settingsBudgets = this.settingsManager.getThinkingBudgets() ?? {};
-    const availableBudgets = {
-      ...DEFAULT_THINKING_BUDGETS,
-      ...settingsBudgets,
-    };
-
-    return availableBudgets;
-  }
-}

package/tests/resolver.test.ts

@@ -1,184 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import {
-  API_KEY_PLACEHOLDER,
-  DEFAULT_LLAMA_SERVER_URL,
-} from "../src/constants";
-
-// Hoisted mock instances — survives vi.resetModules()
-const mockReadStoredCredential = vi.hoisted(() => vi.fn());
-
-const mockSettingsManager = vi.hoisted(() => ({
-  getProjectSettings: vi.fn(),
-  getGlobalSettings: vi.fn(),
-}));
-
-// Mock getAgentDir, readStoredCredential, and SettingsManager before importing resolver
-vi.mock("@earendil-works/pi-coding-agent", () => ({
-  getAgentDir: vi.fn().mockReturnValue("/fake/agent/dir"),
-  readStoredCredential: (...args: unknown[]) =>
-    mockReadStoredCredential(...args),
-  SettingsManager: {
-    create: vi.fn().mockReturnValue(mockSettingsManager),
-  },
-}));
-
-vi.mock("node:fs/promises", () => ({
-  readFile: vi.fn(),
-}));
-
-// Import mocked modules
-import { getAgentDir } from "@earendil-works/pi-coding-agent";
-import { readFile } from "node:fs/promises";
-import { ConfigResolver } from "../src/resolver";
-
-describe("URL resolution fallback chain", () => {
-  const mockReadFile = vi.mocked(readFile);
-  const mockGetAgentDir = vi.mocked(getAgentDir);
-  const mockGetProjectSettings = vi.mocked(
-    mockSettingsManager.getProjectSettings,
-  );
-  const mockGetGlobalSettings = vi.mocked(
-    mockSettingsManager.getGlobalSettings,
-  );
-
-  afterEach(() => {
-    delete process.env.LLAMA_SERVER_URL;
-    vi.resetModules();
-  });
-
-  beforeEach(() => {
-    vi.clearAllMocks();
-    mockGetAgentDir.mockReturnValue("/fake/agent/dir");
-    // Default: no settings found
-    mockGetProjectSettings.mockReturnValue({});
-    mockGetGlobalSettings.mockReturnValue({});
-  });
-
-  it("should return default URL when no config is found", async () => {
-    const resolver = new ConfigResolver();
-    const result = await resolver.resolveUrls();
-
-    expect(result).toEqual([DEFAULT_LLAMA_SERVER_URL]);
-  });
-
-  it("should prioritize project config over env variable", async () => {
-    mockGetProjectSettings.mockReturnValue({
-      llamaServerUrl: "http://localhost:9999",
-    });
-    process.env.LLAMA_SERVER_URL = "http://env-url:8080";
-
-    const resolver = new ConfigResolver();
-    const result = await resolver.resolveUrls();
-
-    expect(result).toEqual(["http://localhost:9999"]);
-  });
-
-  it("should use env variable when no project config exists", async () => {
-    mockGetProjectSettings.mockReturnValue({});
-    process.env.LLAMA_SERVER_URL = "http://env-url:8080";
-
-    const resolver = new ConfigResolver();
-    const result = await resolver.resolveUrls();
-
-    expect(result).toEqual(["http://env-url:8080"]);
-  });
-
-  it("should use global settings when no project config or env exists", async () => {
-    mockGetProjectSettings.mockReturnValue({});
-    mockGetGlobalSettings.mockReturnValue({
-      llamaServerUrl: "http://global:8080",
-    });
-
-    const resolver = new ConfigResolver();
-    const result = await resolver.resolveUrls();
-
-    expect(result).toEqual(["http://global:8080"]);
-  });
-
-  it("should strip trailing slashes from resolved URL", async () => {
-    mockGetProjectSettings.mockReturnValue({
-      llamaServerUrl: "http://localhost:8080/",
-    });
-
-    const resolver = new ConfigResolver();
-    const result = await resolver.resolveUrls();
-
-    expect(result).toEqual(["http://localhost:8080"]);
-  });
-
-  it("should cache the resolved URL on subsequent calls", async () => {
-    mockGetProjectSettings.mockReturnValue({
-      llamaServerUrl: "http://first:8080",
-    });
-
-    const resolver = new ConfigResolver();
-    const result1 = await resolver.resolveUrls();
-    const result2 = await resolver.resolveUrls();
-
-    expect(result1).toEqual(["http://first:8080"]);
-    expect(result2).toEqual(["http://first:8080"]);
-  });
-
-  it("should handle multiple URLs separated by semicolons", async () => {
-    mockGetProjectSettings.mockReturnValue({
-      llamaServerUrl: "http://first:8080;http://second:9090/",
-    });
-
-    const resolver = new ConfigResolver();
-    const result = await resolver.resolveUrls();
-
-    expect(result).toEqual(["http://first:8080", "http://second:9090"]);
-  });
-});
-
-describe("API key resolution", () => {
-  const mockGetAgentDir = vi.mocked(getAgentDir);
-
-  afterEach(() => {
-    vi.resetModules();
-  });
-
-  beforeEach(() => {
-    vi.clearAllMocks();
-    mockGetAgentDir.mockReturnValue("/fake/agent/dir");
-    mockReadStoredCredential.mockReturnValue(undefined);
-  });
-
-  it("should return placeholder when credential is not found", () => {
-    mockReadStoredCredential.mockReturnValue(undefined);
-
-    const resolver = new ConfigResolver();
-    const result = resolver.resolveApiKey("llama-server=http://127.0.0.1:8080");
-
-    expect(result).toEqual(API_KEY_PLACEHOLDER);
-  });
-
-  it("should return placeholder when apiKey is missing from credential", () => {
-    mockReadStoredCredential.mockReturnValue({});
-
-    const resolver = new ConfigResolver();
-    const result = resolver.resolveApiKey("llama-server=http://127.0.0.1:8080");
-
-    expect(result).toEqual(API_KEY_PLACEHOLDER);
-  });
-
-  it("should return the apiKey when present in credential", () => {
-    mockReadStoredCredential.mockReturnValue({ key: "test-api-key" });
-
-    const resolver = new ConfigResolver();
-    const result = resolver.resolveApiKey("llama-server=http://127.0.0.1:8080");
-
-    expect(result).toEqual("test-api-key");
-  });
-
-  it("should call readStoredCredential with the provider ID", () => {
-    mockReadStoredCredential.mockReturnValue({ apiKey: "test-key" });
-
-    const resolver = new ConfigResolver();
-    resolver.resolveApiKey("llama-server=http://127.0.0.1:8080");
-
-    expect(mockReadStoredCredential).toHaveBeenCalledWith(
-      "llama-server=http://127.0.0.1:8080",
-    );
-  });
-});