diff --git a/src/browser/server-context.remote-tab-ops.test.ts b/src/browser/server-context.remote-tab-ops.test.ts index e6994ca0ad3..a791bd10ec7 100644 --- a/src/browser/server-context.remote-tab-ops.test.ts +++ b/src/browser/server-context.remote-tab-ops.test.ts @@ -1,5 +1,8 @@ -import { describe, expect, it, vi } from "vitest"; +import { afterEach, describe, expect, it, vi } from "vitest"; import type { BrowserServerState } from "./server-context.js"; +import * as cdpModule from "./cdp.js"; +import * as pwAiModule from "./pw-ai-module.js"; +import { createBrowserRouteContext } from "./server-context.js"; vi.mock("./chrome.js", () => ({ isChromeCdpReady: vi.fn(async () => true), @@ -11,6 +14,13 @@ vi.mock("./chrome.js", () => ({ stopOpenClawChrome: vi.fn(async () => {}), })); +const originalFetch = globalThis.fetch; + +afterEach(() => { + globalThis.fetch = originalFetch; + vi.restoreAllMocks(); +}); + function makeState( profile: "remote" | "openclaw", ): BrowserServerState & { profiles: Map } { @@ -46,7 +56,6 @@ function makeState( describe("browser server-context remote profile tab operations", () => { it("uses Playwright tab operations when available", async () => { - vi.resetModules(); const listPagesViaPlaywright = vi.fn(async () => [ { targetId: "T1", title: "Tab 1", url: "https://a.example", type: "page" }, ]); @@ -58,11 +67,11 @@ describe("browser server-context remote profile tab operations", () => { })); const closePageByTargetIdViaPlaywright = vi.fn(async () => {}); - vi.doMock("./pw-ai.js", () => ({ + vi.spyOn(pwAiModule, "getPwAiModule").mockResolvedValue({ listPagesViaPlaywright, createPageViaPlaywright, closePageByTargetIdViaPlaywright, - })); + } as Awaited>); const fetchMock = vi.fn(async () => { throw new Error("unexpected fetch"); @@ -70,7 +79,6 @@ describe("browser server-context remote profile tab operations", () => { global.fetch = fetchMock; - const { createBrowserRouteContext } = await import("./server-context.js"); const state = makeState("remote"); const ctx = createBrowserRouteContext({ getState: () => state }); const remote = ctx.forProfile("remote"); @@ -91,7 +99,6 @@ describe("browser server-context remote profile tab operations", () => { }); it("prefers lastTargetId for remote profiles when targetId is omitted", async () => { - vi.resetModules(); const responses = [ // ensureTabAvailable() calls listTabs twice [ @@ -121,7 +128,7 @@ describe("browser server-context remote profile tab operations", () => { return next; }); - vi.doMock("./pw-ai.js", () => ({ + vi.spyOn(pwAiModule, "getPwAiModule").mockResolvedValue({ listPagesViaPlaywright, createPageViaPlaywright: vi.fn(async () => { throw new Error("unexpected create"); @@ -129,7 +136,7 @@ describe("browser server-context remote profile tab operations", () => { closePageByTargetIdViaPlaywright: vi.fn(async () => { throw new Error("unexpected close"); }), - })); + } as Awaited>); const fetchMock = vi.fn(async () => { throw new Error("unexpected fetch"); @@ -137,7 +144,6 @@ describe("browser server-context remote profile tab operations", () => { global.fetch = fetchMock; - const { createBrowserRouteContext } = await import("./server-context.js"); const state = makeState("remote"); const ctx = createBrowserRouteContext({ getState: () => state }); const remote = ctx.forProfile("remote"); @@ -149,16 +155,15 @@ describe("browser server-context remote profile tab operations", () => { }); it("uses Playwright focus for remote profiles when available", async () => { - vi.resetModules(); const listPagesViaPlaywright = vi.fn(async () => [ { targetId: "T1", title: "Tab 1", url: "https://a.example", type: "page" }, ]); const focusPageByTargetIdViaPlaywright = vi.fn(async () => {}); - vi.doMock("./pw-ai.js", () => ({ + vi.spyOn(pwAiModule, "getPwAiModule").mockResolvedValue({ listPagesViaPlaywright, focusPageByTargetIdViaPlaywright, - })); + } as Awaited>); const fetchMock = vi.fn(async () => { throw new Error("unexpected fetch"); @@ -166,7 +171,6 @@ describe("browser server-context remote profile tab operations", () => { global.fetch = fetchMock; - const { createBrowserRouteContext } = await import("./server-context.js"); const state = makeState("remote"); const ctx = createBrowserRouteContext({ getState: () => state }); const remote = ctx.forProfile("remote"); @@ -181,12 +185,11 @@ describe("browser server-context remote profile tab operations", () => { }); it("does not swallow Playwright runtime errors for remote profiles", async () => { - vi.resetModules(); - vi.doMock("./pw-ai.js", () => ({ + vi.spyOn(pwAiModule, "getPwAiModule").mockResolvedValue({ listPagesViaPlaywright: vi.fn(async () => { throw new Error("boom"); }), - })); + } as Awaited>); const fetchMock = vi.fn(async () => { throw new Error("unexpected fetch"); @@ -194,7 +197,6 @@ describe("browser server-context remote profile tab operations", () => { global.fetch = fetchMock; - const { createBrowserRouteContext } = await import("./server-context.js"); const state = makeState("remote"); const ctx = createBrowserRouteContext({ getState: () => state }); const remote = ctx.forProfile("remote"); @@ -204,12 +206,7 @@ describe("browser server-context remote profile tab operations", () => { }); it("falls back to /json/list when Playwright is not available", async () => { - vi.resetModules(); - vi.doMock("./pw-ai.js", () => ({ - listPagesViaPlaywright: undefined, - createPageViaPlaywright: undefined, - closePageByTargetIdViaPlaywright: undefined, - })); + vi.spyOn(pwAiModule, "getPwAiModule").mockResolvedValue(null); const fetchMock = vi.fn(async (url: unknown) => { const u = String(url); @@ -232,7 +229,6 @@ describe("browser server-context remote profile tab operations", () => { global.fetch = fetchMock; - const { createBrowserRouteContext } = await import("./server-context.js"); const state = makeState("remote"); const ctx = createBrowserRouteContext({ getState: () => state }); const remote = ctx.forProfile("remote"); @@ -245,15 +241,7 @@ describe("browser server-context remote profile tab operations", () => { describe("browser server-context tab selection state", () => { it("updates lastTargetId when openTab is created via CDP", async () => { - vi.resetModules(); - vi.doUnmock("./pw-ai.js"); - vi.doMock("./cdp.js", async () => { - const actual = await vi.importActual("./cdp.js"); - return { - ...actual, - createTargetViaCdp: vi.fn(async () => ({ targetId: "CREATED" })), - }; - }); + vi.spyOn(cdpModule, "createTargetViaCdp").mockResolvedValue({ targetId: "CREATED" }); const fetchMock = vi.fn(async (url: unknown) => { const u = String(url); @@ -276,7 +264,6 @@ describe("browser server-context tab selection state", () => { global.fetch = fetchMock; - const { createBrowserRouteContext } = await import("./server-context.js"); const state = makeState("openclaw"); const ctx = createBrowserRouteContext({ getState: () => state }); const openclaw = ctx.forProfile("openclaw"); diff --git a/src/memory/embeddings.test.ts b/src/memory/embeddings.test.ts index 491480d7771..c9326da43cf 100644 --- a/src/memory/embeddings.test.ts +++ b/src/memory/embeddings.test.ts @@ -1,5 +1,7 @@ -import { afterEach, beforeAll, describe, expect, it, vi } from "vitest"; +import { afterEach, describe, expect, it, vi } from "vitest"; +import * as authModule from "../agents/model-auth.js"; import { DEFAULT_GEMINI_EMBEDDING_MODEL } from "./embeddings-gemini.js"; +import { createEmbeddingProvider } from "./embeddings.js"; vi.mock("../agents/model-auth.js", () => ({ resolveApiKeyForProvider: vi.fn(), @@ -11,6 +13,11 @@ vi.mock("../agents/model-auth.js", () => ({ }, })); +const importNodeLlamaCppMock = vi.fn(); +vi.mock("./node-llama.js", () => ({ + importNodeLlamaCpp: (...args: unknown[]) => importNodeLlamaCppMock(...args), +})); + const createFetchMock = () => vi.fn(async () => ({ ok: true, @@ -27,9 +34,6 @@ describe("embedding provider remote overrides", () => { it("uses remote baseUrl/apiKey and merges headers", async () => { const fetchMock = createFetchMock(); vi.stubGlobal("fetch", fetchMock); - - const { createEmbeddingProvider } = await import("./embeddings.js"); - const authModule = await import("../agents/model-auth.js"); vi.mocked(authModule.resolveApiKeyForProvider).mockResolvedValue({ apiKey: "provider-key", mode: "api-key", @@ -81,9 +85,6 @@ describe("embedding provider remote overrides", () => { it("falls back to resolved api key when remote apiKey is blank", async () => { const fetchMock = createFetchMock(); vi.stubGlobal("fetch", fetchMock); - - const { createEmbeddingProvider } = await import("./embeddings.js"); - const authModule = await import("../agents/model-auth.js"); vi.mocked(authModule.resolveApiKeyForProvider).mockResolvedValue({ apiKey: "provider-key", mode: "api-key", @@ -125,9 +126,6 @@ describe("embedding provider remote overrides", () => { json: async () => ({ embedding: { values: [1, 2, 3] } }), })) as unknown as typeof fetch; vi.stubGlobal("fetch", fetchMock); - - const { createEmbeddingProvider } = await import("./embeddings.js"); - const authModule = await import("../agents/model-auth.js"); vi.mocked(authModule.resolveApiKeyForProvider).mockResolvedValue({ apiKey: "provider-key", mode: "api-key", @@ -173,8 +171,6 @@ describe("embedding provider auto selection", () => { }); it("prefers openai when a key resolves", async () => { - const { createEmbeddingProvider } = await import("./embeddings.js"); - const authModule = await import("../agents/model-auth.js"); vi.mocked(authModule.resolveApiKeyForProvider).mockImplementation(async ({ provider }) => { if (provider === "openai") { return { apiKey: "openai-key", source: "env: OPENAI_API_KEY", mode: "api-key" }; @@ -200,9 +196,6 @@ describe("embedding provider auto selection", () => { json: async () => ({ embedding: { values: [1, 2, 3] } }), })) as unknown as typeof fetch; vi.stubGlobal("fetch", fetchMock); - - const { createEmbeddingProvider } = await import("./embeddings.js"); - const authModule = await import("../agents/model-auth.js"); vi.mocked(authModule.resolveApiKeyForProvider).mockImplementation(async ({ provider }) => { if (provider === "openai") { throw new Error('No API key found for provider "openai".'); @@ -236,9 +229,6 @@ describe("embedding provider auto selection", () => { json: async () => ({ data: [{ embedding: [1, 2, 3] }] }), })) as unknown as typeof fetch; vi.stubGlobal("fetch", fetchMock); - - const { createEmbeddingProvider } = await import("./embeddings.js"); - const authModule = await import("../agents/model-auth.js"); vi.mocked(authModule.resolveApiKeyForProvider).mockImplementation(async ({ provider }) => { if (provider === "openai") { return { apiKey: "openai-key", source: "env: OPENAI_API_KEY", mode: "api-key" }; @@ -264,31 +254,21 @@ describe("embedding provider auto selection", () => { }); describe("embedding provider local fallback", () => { - beforeAll(() => { - vi.resetModules(); - }); - afterEach(() => { vi.resetAllMocks(); - vi.resetModules(); vi.unstubAllGlobals(); - vi.doUnmock("./node-llama.js"); }); it("falls back to openai when node-llama-cpp is missing", async () => { - vi.doMock("./node-llama.js", () => ({ - importNodeLlamaCpp: async () => { - throw Object.assign(new Error("Cannot find package 'node-llama-cpp'"), { - code: "ERR_MODULE_NOT_FOUND", - }); - }, - })); + importNodeLlamaCppMock.mockRejectedValue( + Object.assign(new Error("Cannot find package 'node-llama-cpp'"), { + code: "ERR_MODULE_NOT_FOUND", + }), + ); const fetchMock = createFetchMock(); vi.stubGlobal("fetch", fetchMock); - const { createEmbeddingProvider } = await import("./embeddings.js"); - const authModule = await import("../agents/model-auth.js"); vi.mocked(authModule.resolveApiKeyForProvider).mockResolvedValue({ apiKey: "provider-key", mode: "api-key", @@ -308,15 +288,11 @@ describe("embedding provider local fallback", () => { }); it("throws a helpful error when local is requested and fallback is none", async () => { - vi.doMock("./node-llama.js", () => ({ - importNodeLlamaCpp: async () => { - throw Object.assign(new Error("Cannot find package 'node-llama-cpp'"), { - code: "ERR_MODULE_NOT_FOUND", - }); - }, - })); - - const { createEmbeddingProvider } = await import("./embeddings.js"); + importNodeLlamaCppMock.mockRejectedValue( + Object.assign(new Error("Cannot find package 'node-llama-cpp'"), { + code: "ERR_MODULE_NOT_FOUND", + }), + ); await expect( createEmbeddingProvider({ @@ -332,31 +308,25 @@ describe("embedding provider local fallback", () => { describe("local embedding normalization", () => { afterEach(() => { vi.resetAllMocks(); - vi.resetModules(); vi.unstubAllGlobals(); - vi.doUnmock("./node-llama.js"); }); it("normalizes local embeddings to magnitude ~1.0", async () => { const unnormalizedVector = [2.35, 3.45, 0.63, 4.3, 1.2, 5.1, 2.8, 3.9]; - vi.doMock("./node-llama.js", () => ({ - importNodeLlamaCpp: async () => ({ - getLlama: async () => ({ - loadModel: vi.fn().mockResolvedValue({ - createEmbeddingContext: vi.fn().mockResolvedValue({ - getEmbeddingFor: vi.fn().mockResolvedValue({ - vector: new Float32Array(unnormalizedVector), - }), + importNodeLlamaCppMock.mockResolvedValue({ + getLlama: async () => ({ + loadModel: vi.fn().mockResolvedValue({ + createEmbeddingContext: vi.fn().mockResolvedValue({ + getEmbeddingFor: vi.fn().mockResolvedValue({ + vector: new Float32Array(unnormalizedVector), }), }), }), - resolveModelFile: async () => "/fake/model.gguf", - LlamaLogLevel: { error: 0 }, }), - })); - - const { createEmbeddingProvider } = await import("./embeddings.js"); + resolveModelFile: async () => "/fake/model.gguf", + LlamaLogLevel: { error: 0 }, + }); const result = await createEmbeddingProvider({ config: {} as never, @@ -375,23 +345,19 @@ describe("local embedding normalization", () => { it("handles zero vector without division by zero", async () => { const zeroVector = [0, 0, 0, 0]; - vi.doMock("./node-llama.js", () => ({ - importNodeLlamaCpp: async () => ({ - getLlama: async () => ({ - loadModel: vi.fn().mockResolvedValue({ - createEmbeddingContext: vi.fn().mockResolvedValue({ - getEmbeddingFor: vi.fn().mockResolvedValue({ - vector: new Float32Array(zeroVector), - }), + importNodeLlamaCppMock.mockResolvedValue({ + getLlama: async () => ({ + loadModel: vi.fn().mockResolvedValue({ + createEmbeddingContext: vi.fn().mockResolvedValue({ + getEmbeddingFor: vi.fn().mockResolvedValue({ + vector: new Float32Array(zeroVector), }), }), }), - resolveModelFile: async () => "/fake/model.gguf", - LlamaLogLevel: { error: 0 }, }), - })); - - const { createEmbeddingProvider } = await import("./embeddings.js"); + resolveModelFile: async () => "/fake/model.gguf", + LlamaLogLevel: { error: 0 }, + }); const result = await createEmbeddingProvider({ config: {} as never, @@ -409,23 +375,19 @@ describe("local embedding normalization", () => { it("sanitizes non-finite values before normalization", async () => { const nonFiniteVector = [1, Number.NaN, Number.POSITIVE_INFINITY, Number.NEGATIVE_INFINITY]; - vi.doMock("./node-llama.js", () => ({ - importNodeLlamaCpp: async () => ({ - getLlama: async () => ({ - loadModel: vi.fn().mockResolvedValue({ - createEmbeddingContext: vi.fn().mockResolvedValue({ - getEmbeddingFor: vi.fn().mockResolvedValue({ - vector: new Float32Array(nonFiniteVector), - }), + importNodeLlamaCppMock.mockResolvedValue({ + getLlama: async () => ({ + loadModel: vi.fn().mockResolvedValue({ + createEmbeddingContext: vi.fn().mockResolvedValue({ + getEmbeddingFor: vi.fn().mockResolvedValue({ + vector: new Float32Array(nonFiniteVector), }), }), }), - resolveModelFile: async () => "/fake/model.gguf", - LlamaLogLevel: { error: 0 }, }), - })); - - const { createEmbeddingProvider } = await import("./embeddings.js"); + resolveModelFile: async () => "/fake/model.gguf", + LlamaLogLevel: { error: 0 }, + }); const result = await createEmbeddingProvider({ config: {} as never, @@ -447,25 +409,21 @@ describe("local embedding normalization", () => { [1.0, 1.0, 1.0, 1.0], ]; - vi.doMock("./node-llama.js", () => ({ - importNodeLlamaCpp: async () => ({ - getLlama: async () => ({ - loadModel: vi.fn().mockResolvedValue({ - createEmbeddingContext: vi.fn().mockResolvedValue({ - getEmbeddingFor: vi - .fn() - .mockResolvedValueOnce({ vector: new Float32Array(unnormalizedVectors[0]) }) - .mockResolvedValueOnce({ vector: new Float32Array(unnormalizedVectors[1]) }) - .mockResolvedValueOnce({ vector: new Float32Array(unnormalizedVectors[2]) }), - }), + importNodeLlamaCppMock.mockResolvedValue({ + getLlama: async () => ({ + loadModel: vi.fn().mockResolvedValue({ + createEmbeddingContext: vi.fn().mockResolvedValue({ + getEmbeddingFor: vi + .fn() + .mockResolvedValueOnce({ vector: new Float32Array(unnormalizedVectors[0]) }) + .mockResolvedValueOnce({ vector: new Float32Array(unnormalizedVectors[1]) }) + .mockResolvedValueOnce({ vector: new Float32Array(unnormalizedVectors[2]) }), }), }), - resolveModelFile: async () => "/fake/model.gguf", - LlamaLogLevel: { error: 0 }, }), - })); - - const { createEmbeddingProvider } = await import("./embeddings.js"); + resolveModelFile: async () => "/fake/model.gguf", + LlamaLogLevel: { error: 0 }, + }); const result = await createEmbeddingProvider({ config: {} as never,