pi-llama-cpp 0.14.0 → 0.16.0

package/tests/{health.test.ts → server/health.test.ts}

@@ -1,6 +1,6 @@
 import { afterEach, describe, expect, it, vi } from "vitest";
-import { ServerStatus } from "../src/enums/serverStatus";
-import { checkServerHealth } from "../src/utils/health";
+import { ServerStatus } from "../../src/enums/serverStatus";
+import { checkServerHealth } from "../../src/utils/health";
 
 /**
  * Stubs `global.fetch` for one test. The probe only reads the parsed body,
@@ -10,7 +10,7 @@ const stubFetch = (
   impl: (url: string, init?: RequestInit) => Promise<unknown>,
 ) => vi.stubGlobal("fetch", vi.fn(impl));
 
-const okResponse = () => ({ json: async () => ({ status: "ok" }) });
+const okResponse = () => ({ ok: true, json: async () => ({ status: "ok" }) });
 
 const URL_ = "http://127.0.0.1:8080";
 
@@ -20,7 +20,7 @@ afterEach(() => {
 
 describe("checkServerHealth", () => {
   it("should return READY when the payload status is ok", async () => {
-    stubFetch(async () => ({ json: async () => ({ status: "ok" }) }));
+    stubFetch(async () => ({ ok: true, json: async () => ({ status: "ok" }) }));
 
     expect(await checkServerHealth(URL_, 1000)).toBe(ServerStatus.READY);
   });

package/tests/{server.test.ts → server/server.test.ts}

@@ -1,9 +1,11 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { POLLING_TIMEOUT, SERVER_TIMEOUT } from "../src/constants";
-import { ServerStatus } from "../src/enums/serverStatus";
-import type { LlamaSettingsManager } from "../src/managers/settings";
-import { Server } from "../src/server";
-import { createMockServer, makeSettingsStub, mockRpc } from "./mocks";
+import { POLLING_TIMEOUT, SERVER_TIMEOUT } from "../../src/constants";
+import { Mode } from "../../src/enums/mode";
+import { ServerStatus } from "../../src/enums/serverStatus";
+import type { PropsEndpoint } from "../../src/interfaces/endpoints/props";
+import type { LlamaSettingsManager } from "../../src/managers/settings";
+import { Server } from "../../src/server";
+import { createMockServer, makeSettingsStub, mockRpc } from "../mocks";
 
 // Injected into every real Server below; fresh per test so per-case
 // overrides never leak. The Server constructor resolves the API key eagerly
@@ -133,9 +135,57 @@ describe("Server fetchServerProps", () => {
     const server = createMockServer();
     const result = await server.fetchServerProps();
 
-    expect(result.role).toBe("router");
+    // Test mocks return a PropsEndpoint shape
+    expect((result as PropsEndpoint).role).toBe("router");
     expect(mockRpc).toHaveBeenCalledWith("/props?autoload=false");
   });
+
+  it("should return LlamaSwapPropsError shape for llama-swap", async () => {
+    mockRpc.mockResolvedValueOnce({
+      src: "llama-swap",
+      error: {
+        message: "no model id could be identified",
+        type: "invalid_request_error",
+        param: null,
+        code: "not_found",
+      },
+    });
+
+    const server = createMockServer();
+    const result = await server.fetchServerProps();
+
+    expect((result as { src: string }).src).toBe("llama-swap");
+    expect(mockRpc).toHaveBeenCalledWith("/props?autoload=false");
+  });
+});
+
+describe("Server detectServerMode", () => {
+  it("should detect LLAMASWAP mode when /props returns src", async () => {
+    // initialize() calls fetchModels() first, then fetchServerProps()
+    mockRpc
+      .mockResolvedValueOnce({
+        data: [{ id: "test-model" }],
+        object: "list",
+      })
+      .mockResolvedValueOnce({
+        src: "llama-swap",
+        error: {
+          message: "no model id could be identified",
+          type: "invalid_request_error",
+          param: null,
+          code: "not_found",
+        },
+      });
+
+    const server = createMockServer({
+      initialize: async () => {
+        await Server.prototype.initialize.call(server);
+      },
+    });
+    await server.initialize();
+
+    expect(server.models[0].mode).toBe(Mode.LLAMASWAP);
+  });
 });
 
 describe("Server postRequest", () => {
@@ -214,7 +264,7 @@ describe("Server isReady", () => {
   });
 
   it("should return READY when health status is ok", async () => {
-    stubFetch(async () => ({ json: async () => ({ status: "ok" }) }));
+    stubFetch(async () => ({ ok: true, json: async () => ({ status: "ok" }) }));
 
     const server = createMockServer();
     const status = await server.isReady(1000);

package/tests/{serverManager.test.ts → server/serverManager.test.ts}

@@ -1,13 +1,13 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
-import { ServerManager } from "../src/managers/server";
-import { BaseModel } from "../src/models/baseModel";
-import { Server } from "../src/server";
+import { ServerManager } from "../../src/managers/server";
+import { BaseModel } from "../../src/models/baseModel";
+import { Server } from "../../src/server";
 import {
   createMockModel,
   createMockServer,
   makeSettingsStub,
   mockRpc,
-} from "./mocks";
+} from "../mocks";
 
 // Injected settings stub — the single instance passed to ServerManager and
 // to every real `new Server(...)` construction below (Server's eager