mirror of
https://github.com/openclaw/openclaw.git
synced 2026-04-19 07:47:28 +00:00
refactor(test): share runReplyAgent typing heartbeat harness
This commit is contained in:
@@ -1,126 +1,18 @@
|
|||||||
import fs from "node:fs/promises";
|
import fs from "node:fs/promises";
|
||||||
import { tmpdir } from "node:os";
|
import { tmpdir } from "node:os";
|
||||||
import path from "node:path";
|
import path from "node:path";
|
||||||
import { describe, expect, it, vi } from "vitest";
|
import { describe, expect, it } from "vitest";
|
||||||
import type { SessionEntry } from "../../config/sessions.js";
|
|
||||||
import type { TypingMode } from "../../config/types.js";
|
|
||||||
import type { TemplateContext } from "../templating.js";
|
|
||||||
import type { GetReplyOptions } from "../types.js";
|
|
||||||
import type { FollowupRun, QueueSettings } from "./queue.js";
|
|
||||||
import * as sessions from "../../config/sessions.js";
|
import * as sessions from "../../config/sessions.js";
|
||||||
import { createMockTypingController } from "./test-helpers.js";
|
import {
|
||||||
|
createMinimalRun,
|
||||||
const runEmbeddedPiAgentMock = vi.fn();
|
getRunEmbeddedPiAgentMock,
|
||||||
|
installRunReplyAgentTypingHeartbeatTestHooks,
|
||||||
vi.mock("../../agents/model-fallback.js", () => ({
|
} from "./agent-runner.heartbeat-typing.test-harness.js";
|
||||||
runWithModelFallback: async ({
|
const runEmbeddedPiAgentMock = getRunEmbeddedPiAgentMock();
|
||||||
provider,
|
|
||||||
model,
|
|
||||||
run,
|
|
||||||
}: {
|
|
||||||
provider: string;
|
|
||||||
model: string;
|
|
||||||
run: (provider: string, model: string) => Promise<unknown>;
|
|
||||||
}) => ({
|
|
||||||
result: await run(provider, model),
|
|
||||||
provider,
|
|
||||||
model,
|
|
||||||
}),
|
|
||||||
}));
|
|
||||||
|
|
||||||
vi.mock("../../agents/pi-embedded.js", () => ({
|
|
||||||
queueEmbeddedPiMessage: vi.fn().mockReturnValue(false),
|
|
||||||
runEmbeddedPiAgent: (params: unknown) => runEmbeddedPiAgentMock(params),
|
|
||||||
}));
|
|
||||||
|
|
||||||
vi.mock("./queue.js", async () => {
|
|
||||||
const actual = await vi.importActual<typeof import("./queue.js")>("./queue.js");
|
|
||||||
return {
|
|
||||||
...actual,
|
|
||||||
enqueueFollowupRun: vi.fn(),
|
|
||||||
scheduleFollowupDrain: vi.fn(),
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
import { runReplyAgent } from "./agent-runner.js";
|
|
||||||
|
|
||||||
function createMinimalRun(params?: {
|
|
||||||
opts?: GetReplyOptions;
|
|
||||||
resolvedVerboseLevel?: "off" | "on";
|
|
||||||
sessionStore?: Record<string, SessionEntry>;
|
|
||||||
sessionEntry?: SessionEntry;
|
|
||||||
sessionKey?: string;
|
|
||||||
storePath?: string;
|
|
||||||
typingMode?: TypingMode;
|
|
||||||
blockStreamingEnabled?: boolean;
|
|
||||||
}) {
|
|
||||||
const typing = createMockTypingController();
|
|
||||||
const opts = params?.opts;
|
|
||||||
const sessionCtx = {
|
|
||||||
Provider: "whatsapp",
|
|
||||||
MessageSid: "msg",
|
|
||||||
} as unknown as TemplateContext;
|
|
||||||
const resolvedQueue = { mode: "interrupt" } as unknown as QueueSettings;
|
|
||||||
const sessionKey = params?.sessionKey ?? "main";
|
|
||||||
const followupRun = {
|
|
||||||
prompt: "hello",
|
|
||||||
summaryLine: "hello",
|
|
||||||
enqueuedAt: Date.now(),
|
|
||||||
run: {
|
|
||||||
sessionId: "session",
|
|
||||||
sessionKey,
|
|
||||||
messageProvider: "whatsapp",
|
|
||||||
sessionFile: "/tmp/session.jsonl",
|
|
||||||
workspaceDir: "/tmp",
|
|
||||||
config: {},
|
|
||||||
skillsSnapshot: {},
|
|
||||||
provider: "anthropic",
|
|
||||||
model: "claude",
|
|
||||||
thinkLevel: "low",
|
|
||||||
verboseLevel: params?.resolvedVerboseLevel ?? "off",
|
|
||||||
elevatedLevel: "off",
|
|
||||||
bashElevated: {
|
|
||||||
enabled: false,
|
|
||||||
allowed: false,
|
|
||||||
defaultLevel: "off",
|
|
||||||
},
|
|
||||||
timeoutMs: 1_000,
|
|
||||||
blockReplyBreak: "message_end",
|
|
||||||
},
|
|
||||||
} as unknown as FollowupRun;
|
|
||||||
|
|
||||||
return {
|
|
||||||
typing,
|
|
||||||
opts,
|
|
||||||
run: () =>
|
|
||||||
runReplyAgent({
|
|
||||||
commandBody: "hello",
|
|
||||||
followupRun,
|
|
||||||
queueKey: "main",
|
|
||||||
resolvedQueue,
|
|
||||||
shouldSteer: false,
|
|
||||||
shouldFollowup: false,
|
|
||||||
isActive: false,
|
|
||||||
isStreaming: false,
|
|
||||||
opts,
|
|
||||||
typing,
|
|
||||||
sessionEntry: params?.sessionEntry,
|
|
||||||
sessionStore: params?.sessionStore,
|
|
||||||
sessionKey,
|
|
||||||
storePath: params?.storePath,
|
|
||||||
sessionCtx,
|
|
||||||
defaultModel: "anthropic/claude-opus-4-5",
|
|
||||||
resolvedVerboseLevel: params?.resolvedVerboseLevel ?? "off",
|
|
||||||
isNewSession: false,
|
|
||||||
blockStreamingEnabled: params?.blockStreamingEnabled ?? false,
|
|
||||||
resolvedBlockStreamingBreak: "message_end",
|
|
||||||
shouldInjectGroupIntro: false,
|
|
||||||
typingMode: params?.typingMode ?? "instant",
|
|
||||||
}),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
describe("runReplyAgent typing (heartbeat)", () => {
|
describe("runReplyAgent typing (heartbeat)", () => {
|
||||||
|
installRunReplyAgentTypingHeartbeatTestHooks();
|
||||||
|
|
||||||
it("resets corrupted Gemini sessions and deletes transcripts", async () => {
|
it("resets corrupted Gemini sessions and deletes transcripts", async () => {
|
||||||
const prevStateDir = process.env.OPENCLAW_STATE_DIR;
|
const prevStateDir = process.env.OPENCLAW_STATE_DIR;
|
||||||
const stateDir = await fs.mkdtemp(path.join(tmpdir(), "openclaw-session-reset-"));
|
const stateDir = await fs.mkdtemp(path.join(tmpdir(), "openclaw-session-reset-"));
|
||||||
|
|||||||
@@ -1,129 +1,17 @@
|
|||||||
import fs from "node:fs/promises";
|
import fs from "node:fs/promises";
|
||||||
import { tmpdir } from "node:os";
|
import { tmpdir } from "node:os";
|
||||||
import path from "node:path";
|
import path from "node:path";
|
||||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
import { describe, expect, it } from "vitest";
|
||||||
import type { SessionEntry } from "../../config/sessions.js";
|
|
||||||
import type { TypingMode } from "../../config/types.js";
|
|
||||||
import type { TemplateContext } from "../templating.js";
|
|
||||||
import type { GetReplyOptions } from "../types.js";
|
|
||||||
import type { FollowupRun, QueueSettings } from "./queue.js";
|
|
||||||
import * as sessions from "../../config/sessions.js";
|
import * as sessions from "../../config/sessions.js";
|
||||||
import { createMockTypingController } from "./test-helpers.js";
|
import {
|
||||||
|
createMinimalRun,
|
||||||
const runEmbeddedPiAgentMock = vi.fn();
|
getRunEmbeddedPiAgentMock,
|
||||||
|
installRunReplyAgentTypingHeartbeatTestHooks,
|
||||||
vi.mock("../../agents/model-fallback.js", () => ({
|
} from "./agent-runner.heartbeat-typing.test-harness.js";
|
||||||
runWithModelFallback: async ({
|
const runEmbeddedPiAgentMock = getRunEmbeddedPiAgentMock();
|
||||||
provider,
|
|
||||||
model,
|
|
||||||
run,
|
|
||||||
}: {
|
|
||||||
provider: string;
|
|
||||||
model: string;
|
|
||||||
run: (provider: string, model: string) => Promise<unknown>;
|
|
||||||
}) => ({
|
|
||||||
result: await run(provider, model),
|
|
||||||
provider,
|
|
||||||
model,
|
|
||||||
}),
|
|
||||||
}));
|
|
||||||
|
|
||||||
vi.mock("../../agents/pi-embedded.js", () => ({
|
|
||||||
queueEmbeddedPiMessage: vi.fn().mockReturnValue(false),
|
|
||||||
runEmbeddedPiAgent: (params: unknown) => runEmbeddedPiAgentMock(params),
|
|
||||||
}));
|
|
||||||
|
|
||||||
vi.mock("./queue.js", async () => {
|
|
||||||
const actual = await vi.importActual<typeof import("./queue.js")>("./queue.js");
|
|
||||||
return {
|
|
||||||
...actual,
|
|
||||||
enqueueFollowupRun: vi.fn(),
|
|
||||||
scheduleFollowupDrain: vi.fn(),
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
import { runReplyAgent } from "./agent-runner.js";
|
|
||||||
|
|
||||||
function createMinimalRun(params?: {
|
|
||||||
opts?: GetReplyOptions;
|
|
||||||
resolvedVerboseLevel?: "off" | "on";
|
|
||||||
sessionStore?: Record<string, SessionEntry>;
|
|
||||||
sessionEntry?: SessionEntry;
|
|
||||||
sessionKey?: string;
|
|
||||||
storePath?: string;
|
|
||||||
typingMode?: TypingMode;
|
|
||||||
blockStreamingEnabled?: boolean;
|
|
||||||
}) {
|
|
||||||
const typing = createMockTypingController();
|
|
||||||
const opts = params?.opts;
|
|
||||||
const sessionCtx = {
|
|
||||||
Provider: "whatsapp",
|
|
||||||
MessageSid: "msg",
|
|
||||||
} as unknown as TemplateContext;
|
|
||||||
const resolvedQueue = { mode: "interrupt" } as unknown as QueueSettings;
|
|
||||||
const sessionKey = params?.sessionKey ?? "main";
|
|
||||||
const followupRun = {
|
|
||||||
prompt: "hello",
|
|
||||||
summaryLine: "hello",
|
|
||||||
enqueuedAt: Date.now(),
|
|
||||||
run: {
|
|
||||||
sessionId: "session",
|
|
||||||
sessionKey,
|
|
||||||
messageProvider: "whatsapp",
|
|
||||||
sessionFile: "/tmp/session.jsonl",
|
|
||||||
workspaceDir: "/tmp",
|
|
||||||
config: {},
|
|
||||||
skillsSnapshot: {},
|
|
||||||
provider: "anthropic",
|
|
||||||
model: "claude",
|
|
||||||
thinkLevel: "low",
|
|
||||||
verboseLevel: params?.resolvedVerboseLevel ?? "off",
|
|
||||||
elevatedLevel: "off",
|
|
||||||
bashElevated: {
|
|
||||||
enabled: false,
|
|
||||||
allowed: false,
|
|
||||||
defaultLevel: "off",
|
|
||||||
},
|
|
||||||
timeoutMs: 1_000,
|
|
||||||
blockReplyBreak: "message_end",
|
|
||||||
},
|
|
||||||
} as unknown as FollowupRun;
|
|
||||||
|
|
||||||
return {
|
|
||||||
typing,
|
|
||||||
opts,
|
|
||||||
run: () =>
|
|
||||||
runReplyAgent({
|
|
||||||
commandBody: "hello",
|
|
||||||
followupRun,
|
|
||||||
queueKey: "main",
|
|
||||||
resolvedQueue,
|
|
||||||
shouldSteer: false,
|
|
||||||
shouldFollowup: false,
|
|
||||||
isActive: false,
|
|
||||||
isStreaming: false,
|
|
||||||
opts,
|
|
||||||
typing,
|
|
||||||
sessionEntry: params?.sessionEntry,
|
|
||||||
sessionStore: params?.sessionStore,
|
|
||||||
sessionKey,
|
|
||||||
storePath: params?.storePath,
|
|
||||||
sessionCtx,
|
|
||||||
defaultModel: "anthropic/claude-opus-4-5",
|
|
||||||
resolvedVerboseLevel: params?.resolvedVerboseLevel ?? "off",
|
|
||||||
isNewSession: false,
|
|
||||||
blockStreamingEnabled: params?.blockStreamingEnabled ?? false,
|
|
||||||
resolvedBlockStreamingBreak: "message_end",
|
|
||||||
shouldInjectGroupIntro: false,
|
|
||||||
typingMode: params?.typingMode ?? "instant",
|
|
||||||
}),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
describe("runReplyAgent typing (heartbeat)", () => {
|
describe("runReplyAgent typing (heartbeat)", () => {
|
||||||
beforeEach(() => {
|
installRunReplyAgentTypingHeartbeatTestHooks();
|
||||||
runEmbeddedPiAgentMock.mockReset();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("retries after compaction failure by resetting the session", async () => {
|
it("retries after compaction failure by resetting the session", async () => {
|
||||||
const prevStateDir = process.env.OPENCLAW_STATE_DIR;
|
const prevStateDir = process.env.OPENCLAW_STATE_DIR;
|
||||||
|
|||||||
@@ -2,124 +2,16 @@ import fs from "node:fs/promises";
|
|||||||
import { tmpdir } from "node:os";
|
import { tmpdir } from "node:os";
|
||||||
import path from "node:path";
|
import path from "node:path";
|
||||||
import { describe, expect, it, vi } from "vitest";
|
import { describe, expect, it, vi } from "vitest";
|
||||||
import type { SessionEntry } from "../../config/sessions.js";
|
import {
|
||||||
import type { TypingMode } from "../../config/types.js";
|
createMinimalRun,
|
||||||
import type { TemplateContext } from "../templating.js";
|
getRunEmbeddedPiAgentMock,
|
||||||
import type { GetReplyOptions } from "../types.js";
|
installRunReplyAgentTypingHeartbeatTestHooks,
|
||||||
import type { FollowupRun, QueueSettings } from "./queue.js";
|
} from "./agent-runner.heartbeat-typing.test-harness.js";
|
||||||
import { createMockTypingController } from "./test-helpers.js";
|
const runEmbeddedPiAgentMock = getRunEmbeddedPiAgentMock();
|
||||||
|
|
||||||
const runEmbeddedPiAgentMock = vi.fn();
|
|
||||||
|
|
||||||
vi.mock("../../agents/model-fallback.js", () => ({
|
|
||||||
runWithModelFallback: async ({
|
|
||||||
provider,
|
|
||||||
model,
|
|
||||||
run,
|
|
||||||
}: {
|
|
||||||
provider: string;
|
|
||||||
model: string;
|
|
||||||
run: (provider: string, model: string) => Promise<unknown>;
|
|
||||||
}) => ({
|
|
||||||
result: await run(provider, model),
|
|
||||||
provider,
|
|
||||||
model,
|
|
||||||
}),
|
|
||||||
}));
|
|
||||||
|
|
||||||
vi.mock("../../agents/pi-embedded.js", () => ({
|
|
||||||
queueEmbeddedPiMessage: vi.fn().mockReturnValue(false),
|
|
||||||
runEmbeddedPiAgent: (params: unknown) => runEmbeddedPiAgentMock(params),
|
|
||||||
}));
|
|
||||||
|
|
||||||
vi.mock("./queue.js", async () => {
|
|
||||||
const actual = await vi.importActual<typeof import("./queue.js")>("./queue.js");
|
|
||||||
return {
|
|
||||||
...actual,
|
|
||||||
enqueueFollowupRun: vi.fn(),
|
|
||||||
scheduleFollowupDrain: vi.fn(),
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
import { runReplyAgent } from "./agent-runner.js";
|
|
||||||
|
|
||||||
function createMinimalRun(params?: {
|
|
||||||
opts?: GetReplyOptions;
|
|
||||||
resolvedVerboseLevel?: "off" | "on";
|
|
||||||
sessionStore?: Record<string, SessionEntry>;
|
|
||||||
sessionEntry?: SessionEntry;
|
|
||||||
sessionKey?: string;
|
|
||||||
storePath?: string;
|
|
||||||
typingMode?: TypingMode;
|
|
||||||
blockStreamingEnabled?: boolean;
|
|
||||||
}) {
|
|
||||||
const typing = createMockTypingController();
|
|
||||||
const opts = params?.opts;
|
|
||||||
const sessionCtx = {
|
|
||||||
Provider: "whatsapp",
|
|
||||||
MessageSid: "msg",
|
|
||||||
} as unknown as TemplateContext;
|
|
||||||
const resolvedQueue = { mode: "interrupt" } as unknown as QueueSettings;
|
|
||||||
const sessionKey = params?.sessionKey ?? "main";
|
|
||||||
const followupRun = {
|
|
||||||
prompt: "hello",
|
|
||||||
summaryLine: "hello",
|
|
||||||
enqueuedAt: Date.now(),
|
|
||||||
run: {
|
|
||||||
sessionId: "session",
|
|
||||||
sessionKey,
|
|
||||||
messageProvider: "whatsapp",
|
|
||||||
sessionFile: "/tmp/session.jsonl",
|
|
||||||
workspaceDir: "/tmp",
|
|
||||||
config: {},
|
|
||||||
skillsSnapshot: {},
|
|
||||||
provider: "anthropic",
|
|
||||||
model: "claude",
|
|
||||||
thinkLevel: "low",
|
|
||||||
verboseLevel: params?.resolvedVerboseLevel ?? "off",
|
|
||||||
elevatedLevel: "off",
|
|
||||||
bashElevated: {
|
|
||||||
enabled: false,
|
|
||||||
allowed: false,
|
|
||||||
defaultLevel: "off",
|
|
||||||
},
|
|
||||||
timeoutMs: 1_000,
|
|
||||||
blockReplyBreak: "message_end",
|
|
||||||
},
|
|
||||||
} as unknown as FollowupRun;
|
|
||||||
|
|
||||||
return {
|
|
||||||
typing,
|
|
||||||
opts,
|
|
||||||
run: () =>
|
|
||||||
runReplyAgent({
|
|
||||||
commandBody: "hello",
|
|
||||||
followupRun,
|
|
||||||
queueKey: "main",
|
|
||||||
resolvedQueue,
|
|
||||||
shouldSteer: false,
|
|
||||||
shouldFollowup: false,
|
|
||||||
isActive: false,
|
|
||||||
isStreaming: false,
|
|
||||||
opts,
|
|
||||||
typing,
|
|
||||||
sessionEntry: params?.sessionEntry,
|
|
||||||
sessionStore: params?.sessionStore,
|
|
||||||
sessionKey,
|
|
||||||
storePath: params?.storePath,
|
|
||||||
sessionCtx,
|
|
||||||
defaultModel: "anthropic/claude-opus-4-5",
|
|
||||||
resolvedVerboseLevel: params?.resolvedVerboseLevel ?? "off",
|
|
||||||
isNewSession: false,
|
|
||||||
blockStreamingEnabled: params?.blockStreamingEnabled ?? false,
|
|
||||||
resolvedBlockStreamingBreak: "message_end",
|
|
||||||
shouldInjectGroupIntro: false,
|
|
||||||
typingMode: params?.typingMode ?? "instant",
|
|
||||||
}),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
describe("runReplyAgent typing (heartbeat)", () => {
|
describe("runReplyAgent typing (heartbeat)", () => {
|
||||||
|
installRunReplyAgentTypingHeartbeatTestHooks();
|
||||||
|
|
||||||
it("signals typing on block replies", async () => {
|
it("signals typing on block replies", async () => {
|
||||||
const onBlockReply = vi.fn();
|
const onBlockReply = vi.fn();
|
||||||
runEmbeddedPiAgentMock.mockImplementationOnce(async (params: EmbeddedPiAgentParams) => {
|
runEmbeddedPiAgentMock.mockImplementationOnce(async (params: EmbeddedPiAgentParams) => {
|
||||||
|
|||||||
@@ -1,122 +1,15 @@
|
|||||||
import { describe, expect, it, vi } from "vitest";
|
import { describe, expect, it, vi } from "vitest";
|
||||||
import type { SessionEntry } from "../../config/sessions.js";
|
import {
|
||||||
import type { TypingMode } from "../../config/types.js";
|
createMinimalRun,
|
||||||
import type { TemplateContext } from "../templating.js";
|
getRunEmbeddedPiAgentMock,
|
||||||
import type { GetReplyOptions } from "../types.js";
|
installRunReplyAgentTypingHeartbeatTestHooks,
|
||||||
import type { FollowupRun, QueueSettings } from "./queue.js";
|
} from "./agent-runner.heartbeat-typing.test-harness.js";
|
||||||
import { createMockTypingController } from "./test-helpers.js";
|
|
||||||
|
|
||||||
const runEmbeddedPiAgentMock = vi.fn();
|
const runEmbeddedPiAgentMock = getRunEmbeddedPiAgentMock();
|
||||||
|
|
||||||
vi.mock("../../agents/model-fallback.js", () => ({
|
|
||||||
runWithModelFallback: async ({
|
|
||||||
provider,
|
|
||||||
model,
|
|
||||||
run,
|
|
||||||
}: {
|
|
||||||
provider: string;
|
|
||||||
model: string;
|
|
||||||
run: (provider: string, model: string) => Promise<unknown>;
|
|
||||||
}) => ({
|
|
||||||
result: await run(provider, model),
|
|
||||||
provider,
|
|
||||||
model,
|
|
||||||
}),
|
|
||||||
}));
|
|
||||||
|
|
||||||
vi.mock("../../agents/pi-embedded.js", () => ({
|
|
||||||
queueEmbeddedPiMessage: vi.fn().mockReturnValue(false),
|
|
||||||
runEmbeddedPiAgent: (params: unknown) => runEmbeddedPiAgentMock(params),
|
|
||||||
}));
|
|
||||||
|
|
||||||
vi.mock("./queue.js", async () => {
|
|
||||||
const actual = await vi.importActual<typeof import("./queue.js")>("./queue.js");
|
|
||||||
return {
|
|
||||||
...actual,
|
|
||||||
enqueueFollowupRun: vi.fn(),
|
|
||||||
scheduleFollowupDrain: vi.fn(),
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
import { runReplyAgent } from "./agent-runner.js";
|
|
||||||
|
|
||||||
function createMinimalRun(params?: {
|
|
||||||
opts?: GetReplyOptions;
|
|
||||||
resolvedVerboseLevel?: "off" | "on";
|
|
||||||
sessionStore?: Record<string, SessionEntry>;
|
|
||||||
sessionEntry?: SessionEntry;
|
|
||||||
sessionKey?: string;
|
|
||||||
storePath?: string;
|
|
||||||
typingMode?: TypingMode;
|
|
||||||
blockStreamingEnabled?: boolean;
|
|
||||||
}) {
|
|
||||||
const typing = createMockTypingController();
|
|
||||||
const opts = params?.opts;
|
|
||||||
const sessionCtx = {
|
|
||||||
Provider: "whatsapp",
|
|
||||||
MessageSid: "msg",
|
|
||||||
} as unknown as TemplateContext;
|
|
||||||
const resolvedQueue = { mode: "interrupt" } as unknown as QueueSettings;
|
|
||||||
const sessionKey = params?.sessionKey ?? "main";
|
|
||||||
const followupRun = {
|
|
||||||
prompt: "hello",
|
|
||||||
summaryLine: "hello",
|
|
||||||
enqueuedAt: Date.now(),
|
|
||||||
run: {
|
|
||||||
sessionId: "session",
|
|
||||||
sessionKey,
|
|
||||||
messageProvider: "whatsapp",
|
|
||||||
sessionFile: "/tmp/session.jsonl",
|
|
||||||
workspaceDir: "/tmp",
|
|
||||||
config: {},
|
|
||||||
skillsSnapshot: {},
|
|
||||||
provider: "anthropic",
|
|
||||||
model: "claude",
|
|
||||||
thinkLevel: "low",
|
|
||||||
verboseLevel: params?.resolvedVerboseLevel ?? "off",
|
|
||||||
elevatedLevel: "off",
|
|
||||||
bashElevated: {
|
|
||||||
enabled: false,
|
|
||||||
allowed: false,
|
|
||||||
defaultLevel: "off",
|
|
||||||
},
|
|
||||||
timeoutMs: 1_000,
|
|
||||||
blockReplyBreak: "message_end",
|
|
||||||
},
|
|
||||||
} as unknown as FollowupRun;
|
|
||||||
|
|
||||||
return {
|
|
||||||
typing,
|
|
||||||
opts,
|
|
||||||
run: () =>
|
|
||||||
runReplyAgent({
|
|
||||||
commandBody: "hello",
|
|
||||||
followupRun,
|
|
||||||
queueKey: "main",
|
|
||||||
resolvedQueue,
|
|
||||||
shouldSteer: false,
|
|
||||||
shouldFollowup: false,
|
|
||||||
isActive: false,
|
|
||||||
isStreaming: false,
|
|
||||||
opts,
|
|
||||||
typing,
|
|
||||||
sessionEntry: params?.sessionEntry,
|
|
||||||
sessionStore: params?.sessionStore,
|
|
||||||
sessionKey,
|
|
||||||
storePath: params?.storePath,
|
|
||||||
sessionCtx,
|
|
||||||
defaultModel: "anthropic/claude-opus-4-5",
|
|
||||||
resolvedVerboseLevel: params?.resolvedVerboseLevel ?? "off",
|
|
||||||
isNewSession: false,
|
|
||||||
blockStreamingEnabled: params?.blockStreamingEnabled ?? false,
|
|
||||||
resolvedBlockStreamingBreak: "message_end",
|
|
||||||
shouldInjectGroupIntro: false,
|
|
||||||
typingMode: params?.typingMode ?? "instant",
|
|
||||||
}),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
describe("runReplyAgent typing (heartbeat)", () => {
|
describe("runReplyAgent typing (heartbeat)", () => {
|
||||||
|
installRunReplyAgentTypingHeartbeatTestHooks();
|
||||||
|
|
||||||
it("signals typing for normal runs", async () => {
|
it("signals typing for normal runs", async () => {
|
||||||
const onPartialReply = vi.fn();
|
const onPartialReply = vi.fn();
|
||||||
runEmbeddedPiAgentMock.mockImplementationOnce(async (params: EmbeddedPiAgentParams) => {
|
runEmbeddedPiAgentMock.mockImplementationOnce(async (params: EmbeddedPiAgentParams) => {
|
||||||
|
|||||||
@@ -2,125 +2,17 @@ import fs from "node:fs/promises";
|
|||||||
import { tmpdir } from "node:os";
|
import { tmpdir } from "node:os";
|
||||||
import path from "node:path";
|
import path from "node:path";
|
||||||
import { describe, expect, it, vi } from "vitest";
|
import { describe, expect, it, vi } from "vitest";
|
||||||
import type { SessionEntry } from "../../config/sessions.js";
|
|
||||||
import type { TypingMode } from "../../config/types.js";
|
|
||||||
import type { TemplateContext } from "../templating.js";
|
|
||||||
import type { GetReplyOptions } from "../types.js";
|
|
||||||
import type { FollowupRun, QueueSettings } from "./queue.js";
|
|
||||||
import * as sessions from "../../config/sessions.js";
|
import * as sessions from "../../config/sessions.js";
|
||||||
import { createMockTypingController } from "./test-helpers.js";
|
import {
|
||||||
|
createMinimalRun,
|
||||||
const runEmbeddedPiAgentMock = vi.fn();
|
getRunEmbeddedPiAgentMock,
|
||||||
|
installRunReplyAgentTypingHeartbeatTestHooks,
|
||||||
vi.mock("../../agents/model-fallback.js", () => ({
|
} from "./agent-runner.heartbeat-typing.test-harness.js";
|
||||||
runWithModelFallback: async ({
|
const runEmbeddedPiAgentMock = getRunEmbeddedPiAgentMock();
|
||||||
provider,
|
|
||||||
model,
|
|
||||||
run,
|
|
||||||
}: {
|
|
||||||
provider: string;
|
|
||||||
model: string;
|
|
||||||
run: (provider: string, model: string) => Promise<unknown>;
|
|
||||||
}) => ({
|
|
||||||
result: await run(provider, model),
|
|
||||||
provider,
|
|
||||||
model,
|
|
||||||
}),
|
|
||||||
}));
|
|
||||||
|
|
||||||
vi.mock("../../agents/pi-embedded.js", () => ({
|
|
||||||
queueEmbeddedPiMessage: vi.fn().mockReturnValue(false),
|
|
||||||
runEmbeddedPiAgent: (params: unknown) => runEmbeddedPiAgentMock(params),
|
|
||||||
}));
|
|
||||||
|
|
||||||
vi.mock("./queue.js", async () => {
|
|
||||||
const actual = await vi.importActual<typeof import("./queue.js")>("./queue.js");
|
|
||||||
return {
|
|
||||||
...actual,
|
|
||||||
enqueueFollowupRun: vi.fn(),
|
|
||||||
scheduleFollowupDrain: vi.fn(),
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
import { runReplyAgent } from "./agent-runner.js";
|
|
||||||
|
|
||||||
function createMinimalRun(params?: {
|
|
||||||
opts?: GetReplyOptions;
|
|
||||||
resolvedVerboseLevel?: "off" | "on";
|
|
||||||
sessionStore?: Record<string, SessionEntry>;
|
|
||||||
sessionEntry?: SessionEntry;
|
|
||||||
sessionKey?: string;
|
|
||||||
storePath?: string;
|
|
||||||
typingMode?: TypingMode;
|
|
||||||
blockStreamingEnabled?: boolean;
|
|
||||||
}) {
|
|
||||||
const typing = createMockTypingController();
|
|
||||||
const opts = params?.opts;
|
|
||||||
const sessionCtx = {
|
|
||||||
Provider: "whatsapp",
|
|
||||||
MessageSid: "msg",
|
|
||||||
} as unknown as TemplateContext;
|
|
||||||
const resolvedQueue = { mode: "interrupt" } as unknown as QueueSettings;
|
|
||||||
const sessionKey = params?.sessionKey ?? "main";
|
|
||||||
const followupRun = {
|
|
||||||
prompt: "hello",
|
|
||||||
summaryLine: "hello",
|
|
||||||
enqueuedAt: Date.now(),
|
|
||||||
run: {
|
|
||||||
sessionId: "session",
|
|
||||||
sessionKey,
|
|
||||||
messageProvider: "whatsapp",
|
|
||||||
sessionFile: "/tmp/session.jsonl",
|
|
||||||
workspaceDir: "/tmp",
|
|
||||||
config: {},
|
|
||||||
skillsSnapshot: {},
|
|
||||||
provider: "anthropic",
|
|
||||||
model: "claude",
|
|
||||||
thinkLevel: "low",
|
|
||||||
verboseLevel: params?.resolvedVerboseLevel ?? "off",
|
|
||||||
elevatedLevel: "off",
|
|
||||||
bashElevated: {
|
|
||||||
enabled: false,
|
|
||||||
allowed: false,
|
|
||||||
defaultLevel: "off",
|
|
||||||
},
|
|
||||||
timeoutMs: 1_000,
|
|
||||||
blockReplyBreak: "message_end",
|
|
||||||
},
|
|
||||||
} as unknown as FollowupRun;
|
|
||||||
|
|
||||||
return {
|
|
||||||
typing,
|
|
||||||
opts,
|
|
||||||
run: () =>
|
|
||||||
runReplyAgent({
|
|
||||||
commandBody: "hello",
|
|
||||||
followupRun,
|
|
||||||
queueKey: "main",
|
|
||||||
resolvedQueue,
|
|
||||||
shouldSteer: false,
|
|
||||||
shouldFollowup: false,
|
|
||||||
isActive: false,
|
|
||||||
isStreaming: false,
|
|
||||||
opts,
|
|
||||||
typing,
|
|
||||||
sessionEntry: params?.sessionEntry,
|
|
||||||
sessionStore: params?.sessionStore,
|
|
||||||
sessionKey,
|
|
||||||
storePath: params?.storePath,
|
|
||||||
sessionCtx,
|
|
||||||
defaultModel: "anthropic/claude-opus-4-5",
|
|
||||||
resolvedVerboseLevel: params?.resolvedVerboseLevel ?? "off",
|
|
||||||
isNewSession: false,
|
|
||||||
blockStreamingEnabled: params?.blockStreamingEnabled ?? false,
|
|
||||||
resolvedBlockStreamingBreak: "message_end",
|
|
||||||
shouldInjectGroupIntro: false,
|
|
||||||
typingMode: params?.typingMode ?? "instant",
|
|
||||||
}),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
describe("runReplyAgent typing (heartbeat)", () => {
|
describe("runReplyAgent typing (heartbeat)", () => {
|
||||||
|
installRunReplyAgentTypingHeartbeatTestHooks();
|
||||||
|
|
||||||
it("still replies even if session reset fails to persist", async () => {
|
it("still replies even if session reset fails to persist", async () => {
|
||||||
const prevStateDir = process.env.OPENCLAW_STATE_DIR;
|
const prevStateDir = process.env.OPENCLAW_STATE_DIR;
|
||||||
const stateDir = await fs.mkdtemp(path.join(tmpdir(), "openclaw-session-reset-fail-"));
|
const stateDir = await fs.mkdtemp(path.join(tmpdir(), "openclaw-session-reset-fail-"));
|
||||||
|
|||||||
@@ -0,0 +1,129 @@
|
|||||||
|
import { beforeEach, vi } from "vitest";
|
||||||
|
import type { SessionEntry } from "../../config/sessions.js";
|
||||||
|
import type { TypingMode } from "../../config/types.js";
|
||||||
|
import type { TemplateContext } from "../templating.js";
|
||||||
|
import type { GetReplyOptions } from "../types.js";
|
||||||
|
import type { FollowupRun, QueueSettings } from "./queue.js";
|
||||||
|
import { createMockTypingController } from "./test-helpers.js";
|
||||||
|
|
||||||
|
const state = vi.hoisted(() => ({
|
||||||
|
runEmbeddedPiAgentMock: vi.fn(),
|
||||||
|
}));
|
||||||
|
|
||||||
|
export function getRunEmbeddedPiAgentMock() {
|
||||||
|
return state.runEmbeddedPiAgentMock;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function installRunReplyAgentTypingHeartbeatTestHooks() {
|
||||||
|
beforeEach(() => {
|
||||||
|
state.runEmbeddedPiAgentMock.mockReset();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
vi.mock("../../agents/model-fallback.js", () => ({
|
||||||
|
runWithModelFallback: async ({
|
||||||
|
provider,
|
||||||
|
model,
|
||||||
|
run,
|
||||||
|
}: {
|
||||||
|
provider: string;
|
||||||
|
model: string;
|
||||||
|
run: (provider: string, model: string) => Promise<unknown>;
|
||||||
|
}) => ({
|
||||||
|
result: await run(provider, model),
|
||||||
|
provider,
|
||||||
|
model,
|
||||||
|
}),
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("../../agents/pi-embedded.js", () => ({
|
||||||
|
queueEmbeddedPiMessage: vi.fn().mockReturnValue(false),
|
||||||
|
runEmbeddedPiAgent: (params: unknown) => state.runEmbeddedPiAgentMock(params),
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("./queue.js", async () => {
|
||||||
|
const actual = await vi.importActual<typeof import("./queue.js")>("./queue.js");
|
||||||
|
return {
|
||||||
|
...actual,
|
||||||
|
enqueueFollowupRun: vi.fn(),
|
||||||
|
scheduleFollowupDrain: vi.fn(),
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
export function createMinimalRun(params?: {
|
||||||
|
opts?: GetReplyOptions;
|
||||||
|
resolvedVerboseLevel?: "off" | "on";
|
||||||
|
sessionStore?: Record<string, SessionEntry>;
|
||||||
|
sessionEntry?: SessionEntry;
|
||||||
|
sessionKey?: string;
|
||||||
|
storePath?: string;
|
||||||
|
typingMode?: TypingMode;
|
||||||
|
blockStreamingEnabled?: boolean;
|
||||||
|
}) {
|
||||||
|
const typing = createMockTypingController();
|
||||||
|
const opts = params?.opts;
|
||||||
|
const sessionCtx = {
|
||||||
|
Provider: "whatsapp",
|
||||||
|
MessageSid: "msg",
|
||||||
|
} as unknown as TemplateContext;
|
||||||
|
const resolvedQueue = { mode: "interrupt" } as unknown as QueueSettings;
|
||||||
|
const sessionKey = params?.sessionKey ?? "main";
|
||||||
|
const followupRun = {
|
||||||
|
prompt: "hello",
|
||||||
|
summaryLine: "hello",
|
||||||
|
enqueuedAt: Date.now(),
|
||||||
|
run: {
|
||||||
|
sessionId: "session",
|
||||||
|
sessionKey,
|
||||||
|
messageProvider: "whatsapp",
|
||||||
|
sessionFile: "/tmp/session.jsonl",
|
||||||
|
workspaceDir: "/tmp",
|
||||||
|
config: {},
|
||||||
|
skillsSnapshot: {},
|
||||||
|
provider: "anthropic",
|
||||||
|
model: "claude",
|
||||||
|
thinkLevel: "low",
|
||||||
|
verboseLevel: params?.resolvedVerboseLevel ?? "off",
|
||||||
|
elevatedLevel: "off",
|
||||||
|
bashElevated: {
|
||||||
|
enabled: false,
|
||||||
|
allowed: false,
|
||||||
|
defaultLevel: "off",
|
||||||
|
},
|
||||||
|
timeoutMs: 1_000,
|
||||||
|
blockReplyBreak: "message_end",
|
||||||
|
},
|
||||||
|
} as unknown as FollowupRun;
|
||||||
|
|
||||||
|
return {
|
||||||
|
typing,
|
||||||
|
opts,
|
||||||
|
run: async () => {
|
||||||
|
const { runReplyAgent } = await import("./agent-runner.js");
|
||||||
|
return runReplyAgent({
|
||||||
|
commandBody: "hello",
|
||||||
|
followupRun,
|
||||||
|
queueKey: "main",
|
||||||
|
resolvedQueue,
|
||||||
|
shouldSteer: false,
|
||||||
|
shouldFollowup: false,
|
||||||
|
isActive: false,
|
||||||
|
isStreaming: false,
|
||||||
|
opts,
|
||||||
|
typing,
|
||||||
|
sessionEntry: params?.sessionEntry,
|
||||||
|
sessionStore: params?.sessionStore,
|
||||||
|
sessionKey,
|
||||||
|
storePath: params?.storePath,
|
||||||
|
sessionCtx,
|
||||||
|
defaultModel: "anthropic/claude-opus-4-5",
|
||||||
|
resolvedVerboseLevel: params?.resolvedVerboseLevel ?? "off",
|
||||||
|
isNewSession: false,
|
||||||
|
blockStreamingEnabled: params?.blockStreamingEnabled ?? false,
|
||||||
|
resolvedBlockStreamingBreak: "message_end",
|
||||||
|
shouldInjectGroupIntro: false,
|
||||||
|
typingMode: params?.typingMode ?? "instant",
|
||||||
|
});
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user