mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-06 07:30:43 +00:00
fix(auto-reply): run message_sending before inbound delivery
Run inbound auto-reply delivery through message_sending hooks before sending replies. Co-authored-by: Jamil Zakirov <15848838+jzakirov@users.noreply.github.com>
This commit is contained in:
@@ -239,6 +239,7 @@ Docs: https://docs.openclaw.ai
|
||||
- Heartbeat: include async exec completion details in heartbeat prompts so command-finished notifications relay the actual output. (#71213) Thanks @GodsBoy.
|
||||
- Memory search: apply session visibility and agent-to-agent policy to session transcript hits, and keep `corpus=sessions` ranking scoped to session collections before result limiting. (#70761) Thanks @nefainl.
|
||||
- Agents/sessions: stop session write-lock timeouts from entering model failover, so local lock contention surfaces directly instead of cascading across providers. (#68700) Thanks @MonkeyLeeT.
|
||||
- Auto-reply: run inbound reply delivery through `message_sending` hooks so plugins can transform or cancel generated replies before they are sent. (#70118) Thanks @jzakirov.
|
||||
|
||||
## 2026.4.23
|
||||
|
||||
|
||||
@@ -427,6 +427,9 @@ describe("dispatchTelegramMessage draft streaming", () => {
|
||||
);
|
||||
expect(dispatchReplyWithBufferedBlockDispatcher).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
dispatcherOptions: expect.objectContaining({
|
||||
beforeDeliver: expect.any(Function),
|
||||
}),
|
||||
replyOptions: expect.objectContaining({
|
||||
disableBlockStreaming: true,
|
||||
}),
|
||||
|
||||
@@ -761,6 +761,7 @@ export const dispatchTelegramMessage = async ({
|
||||
cfg,
|
||||
dispatcherOptions: {
|
||||
...replyPipeline,
|
||||
beforeDeliver: async (payload) => payload,
|
||||
deliver: async (payload, info) => {
|
||||
if (isDispatchSuperseded()) {
|
||||
return;
|
||||
|
||||
@@ -449,6 +449,9 @@ describe("registerTelegramNativeCommands — session metadata", () => {
|
||||
await runPromise;
|
||||
|
||||
expect(replyMocks.dispatchReplyWithBufferedBlockDispatcher).toHaveBeenCalledTimes(1);
|
||||
expect(
|
||||
replyMocks.dispatchReplyWithBufferedBlockDispatcher.mock.calls[0]?.[0].dispatcherOptions,
|
||||
).toEqual(expect.objectContaining({ beforeDeliver: expect.any(Function) }));
|
||||
});
|
||||
|
||||
it("does not inject approval buttons for native command replies once the monitor owns approvals", async () => {
|
||||
|
||||
@@ -940,6 +940,7 @@ export const registerTelegramNativeCommands = ({
|
||||
cfg: executionCfg,
|
||||
dispatcherOptions: {
|
||||
...replyPipeline,
|
||||
beforeDeliver: async (payload) => payload,
|
||||
deliver: async (payload, _info) => {
|
||||
if (
|
||||
shouldSuppressLocalTelegramExecApprovalPrompt({
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { describe, expect, it, vi } from "vitest";
|
||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||
import type { OpenClawConfig } from "../config/config.js";
|
||||
import type { ReplyDispatcher } from "./reply/reply-dispatcher.js";
|
||||
import { buildTestCtx } from "./reply/test-ctx.js";
|
||||
@@ -6,12 +6,19 @@ import { buildTestCtx } from "./reply/test-ctx.js";
|
||||
type DispatchReplyFromConfigFn =
|
||||
typeof import("./reply/dispatch-from-config.js").dispatchReplyFromConfig;
|
||||
type FinalizeInboundContextFn = typeof import("./reply/inbound-context.js").finalizeInboundContext;
|
||||
type DeriveInboundMessageHookContextFn =
|
||||
typeof import("../hooks/message-hook-mappers.js").deriveInboundMessageHookContext;
|
||||
type GetGlobalHookRunnerFn = typeof import("../plugins/hook-runner-global.js").getGlobalHookRunner;
|
||||
type CreateReplyDispatcherFn = typeof import("./reply/reply-dispatcher.js").createReplyDispatcher;
|
||||
type CreateReplyDispatcherWithTypingFn =
|
||||
typeof import("./reply/reply-dispatcher.js").createReplyDispatcherWithTyping;
|
||||
|
||||
const hoisted = vi.hoisted(() => ({
|
||||
dispatchReplyFromConfigMock: vi.fn(),
|
||||
finalizeInboundContextMock: vi.fn((ctx: unknown, _opts?: unknown) => ctx),
|
||||
deriveInboundMessageHookContextMock: vi.fn(),
|
||||
getGlobalHookRunnerMock: vi.fn(),
|
||||
createReplyDispatcherMock: vi.fn(),
|
||||
createReplyDispatcherWithTypingMock: vi.fn(),
|
||||
}));
|
||||
|
||||
@@ -25,12 +32,33 @@ vi.mock("./reply/inbound-context.js", () => ({
|
||||
hoisted.finalizeInboundContextMock(...args),
|
||||
}));
|
||||
|
||||
vi.mock("../hooks/message-hook-mappers.js", () => ({
|
||||
deriveInboundMessageHookContext: (...args: Parameters<DeriveInboundMessageHookContextFn>) =>
|
||||
hoisted.deriveInboundMessageHookContextMock(...args),
|
||||
toPluginMessageContext: (canonical: {
|
||||
channelId?: string;
|
||||
accountId?: string;
|
||||
conversationId?: string;
|
||||
}) => ({
|
||||
channelId: canonical.channelId,
|
||||
accountId: canonical.accountId,
|
||||
conversationId: canonical.conversationId,
|
||||
}),
|
||||
}));
|
||||
|
||||
vi.mock("../plugins/hook-runner-global.js", () => ({
|
||||
getGlobalHookRunner: (...args: Parameters<GetGlobalHookRunnerFn>) =>
|
||||
hoisted.getGlobalHookRunnerMock(...args),
|
||||
}));
|
||||
|
||||
vi.mock("./reply/reply-dispatcher.js", async () => {
|
||||
const actual = await vi.importActual<typeof import("./reply/reply-dispatcher.js")>(
|
||||
"./reply/reply-dispatcher.js",
|
||||
);
|
||||
return {
|
||||
...actual,
|
||||
createReplyDispatcher: (...args: Parameters<CreateReplyDispatcherFn>) =>
|
||||
hoisted.createReplyDispatcherMock(...args),
|
||||
createReplyDispatcherWithTyping: (...args: Parameters<CreateReplyDispatcherWithTypingFn>) =>
|
||||
hoisted.createReplyDispatcherWithTypingMock(...args),
|
||||
};
|
||||
@@ -38,6 +66,7 @@ vi.mock("./reply/reply-dispatcher.js", async () => {
|
||||
|
||||
const {
|
||||
dispatchInboundMessage,
|
||||
dispatchInboundMessageWithDispatcher,
|
||||
dispatchInboundMessageWithBufferedDispatcher,
|
||||
withReplyDispatcher,
|
||||
} = await import("./dispatch.js");
|
||||
@@ -59,6 +88,22 @@ function createDispatcher(record: string[]): ReplyDispatcher {
|
||||
}
|
||||
|
||||
describe("withReplyDispatcher", () => {
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks();
|
||||
hoisted.finalizeInboundContextMock.mockImplementation((ctx: unknown) => ctx);
|
||||
hoisted.deriveInboundMessageHookContextMock.mockReturnValue({
|
||||
channelId: "threads",
|
||||
accountId: "acct-1",
|
||||
conversationId: "conv-1",
|
||||
isGroup: false,
|
||||
to: "thread:1",
|
||||
});
|
||||
hoisted.getGlobalHookRunnerMock.mockReturnValue({
|
||||
hasHooks: vi.fn(() => false),
|
||||
runMessageSending: vi.fn(async () => undefined),
|
||||
});
|
||||
});
|
||||
|
||||
it("dispatchInboundMessage owns dispatcher lifecycle", async () => {
|
||||
const order: string[] = [];
|
||||
const dispatcher = {
|
||||
@@ -168,6 +213,76 @@ describe("withReplyDispatcher", () => {
|
||||
expect(typing.markDispatchIdle).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("runs message_sending hooks before inbound dispatcher delivery", async () => {
|
||||
const runMessageSending = vi.fn(async () => ({ content: "sanitized reply" }));
|
||||
hoisted.getGlobalHookRunnerMock.mockReturnValue({
|
||||
hasHooks: vi.fn((hookName?: string) => hookName === "message_sending"),
|
||||
runMessageSending,
|
||||
});
|
||||
hoisted.createReplyDispatcherMock.mockReturnValueOnce(createDispatcher([]));
|
||||
hoisted.dispatchReplyFromConfigMock.mockResolvedValueOnce({ text: "ok" });
|
||||
|
||||
await dispatchInboundMessageWithDispatcher({
|
||||
ctx: buildTestCtx({
|
||||
From: "whatsapp:+15551234567",
|
||||
To: "whatsapp:+15557654321",
|
||||
OriginatingTo: "whatsapp:+15551234567",
|
||||
}),
|
||||
cfg: {} as OpenClawConfig,
|
||||
dispatcherOptions: {
|
||||
deliver: async () => undefined,
|
||||
},
|
||||
replyResolver: async () => ({ text: "ok" }),
|
||||
});
|
||||
|
||||
const dispatcherOptions = hoisted.createReplyDispatcherMock.mock.calls[0]?.[0];
|
||||
expect(dispatcherOptions?.beforeDeliver).toEqual(expect.any(Function));
|
||||
|
||||
const payload = await dispatcherOptions.beforeDeliver(
|
||||
{ text: "original reply" },
|
||||
{ kind: "final" },
|
||||
);
|
||||
|
||||
expect(payload).toEqual({ text: "sanitized reply" });
|
||||
expect(runMessageSending).toHaveBeenCalledWith(
|
||||
{ content: "original reply", to: "whatsapp:+15551234567" },
|
||||
{
|
||||
channelId: "threads",
|
||||
accountId: "acct-1",
|
||||
conversationId: "conv-1",
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
it("reconciles queuedFinal and counts after dispatcher-side cancellation", async () => {
|
||||
const dispatcher = {
|
||||
sendToolResult: () => true,
|
||||
sendBlockReply: () => true,
|
||||
sendFinalReply: () => true,
|
||||
getQueuedCounts: () => ({ tool: 0, block: 0, final: 0 }),
|
||||
getCancelledCounts: () => ({ tool: 0, block: 0, final: 1 }),
|
||||
getFailedCounts: () => ({ tool: 0, block: 0, final: 0 }),
|
||||
markComplete: () => undefined,
|
||||
waitForIdle: async () => undefined,
|
||||
} satisfies ReplyDispatcher;
|
||||
hoisted.dispatchReplyFromConfigMock.mockResolvedValueOnce({
|
||||
queuedFinal: true,
|
||||
counts: { tool: 0, block: 0, final: 1 },
|
||||
});
|
||||
|
||||
const result = await dispatchInboundMessage({
|
||||
ctx: buildTestCtx(),
|
||||
cfg: {} as OpenClawConfig,
|
||||
dispatcher,
|
||||
replyResolver: async () => ({ text: "ok" }),
|
||||
});
|
||||
|
||||
expect(result).toEqual({
|
||||
queuedFinal: false,
|
||||
counts: { tool: 0, block: 0, final: 0 },
|
||||
});
|
||||
});
|
||||
|
||||
it("uses CommandTargetSessionKey for silent-reply policy on native command turns", async () => {
|
||||
hoisted.createReplyDispatcherWithTypingMock.mockReturnValueOnce({
|
||||
dispatcher: createDispatcher([]),
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
import { normalizeChatType } from "../channels/chat-type.js";
|
||||
import type { OpenClawConfig } from "../config/types.openclaw.js";
|
||||
import {
|
||||
deriveInboundMessageHookContext,
|
||||
toPluginMessageContext,
|
||||
} from "../hooks/message-hook-mappers.js";
|
||||
import { getGlobalHookRunner } from "../plugins/hook-runner-global.js";
|
||||
import type { SilentReplyConversationType } from "../shared/silent-reply-policy.js";
|
||||
import { withReplyDispatcher } from "./dispatch-dispatcher.js";
|
||||
import { dispatchReplyFromConfig } from "./reply/dispatch-from-config.js";
|
||||
@@ -9,12 +14,13 @@ import { finalizeInboundContext } from "./reply/inbound-context.js";
|
||||
import {
|
||||
createReplyDispatcher,
|
||||
createReplyDispatcherWithTyping,
|
||||
type ReplyDispatchBeforeDeliver,
|
||||
type ReplyDispatcherOptions,
|
||||
type ReplyDispatcherWithTypingOptions,
|
||||
} from "./reply/reply-dispatcher.js";
|
||||
import type { ReplyDispatcher } from "./reply/reply-dispatcher.types.js";
|
||||
import type { FinalizedMsgContext, MsgContext } from "./templating.js";
|
||||
import type { GetReplyOptions } from "./types.js";
|
||||
import type { GetReplyOptions, ReplyPayload } from "./types.js";
|
||||
|
||||
function resolveDispatcherSilentReplyContext(
|
||||
ctx: MsgContext | FinalizedMsgContext,
|
||||
@@ -44,9 +50,74 @@ function resolveDispatcherSilentReplyContext(
|
||||
};
|
||||
}
|
||||
|
||||
function resolveInboundReplyHookTarget(
|
||||
finalized: FinalizedMsgContext,
|
||||
hookCtx: ReturnType<typeof deriveInboundMessageHookContext>,
|
||||
): string {
|
||||
if (typeof finalized.OriginatingTo === "string" && finalized.OriginatingTo.trim()) {
|
||||
return finalized.OriginatingTo;
|
||||
}
|
||||
if (hookCtx.isGroup) {
|
||||
return hookCtx.conversationId ?? hookCtx.to ?? hookCtx.from;
|
||||
}
|
||||
return hookCtx.from || hookCtx.conversationId || hookCtx.to || "";
|
||||
}
|
||||
|
||||
function buildMessageSendingBeforeDeliver(
|
||||
ctx: MsgContext | FinalizedMsgContext,
|
||||
): ReplyDispatchBeforeDeliver | undefined {
|
||||
const hookRunner = getGlobalHookRunner();
|
||||
if (!hookRunner?.hasHooks("message_sending")) {
|
||||
return undefined;
|
||||
}
|
||||
|
||||
const finalized = finalizeInboundContext(ctx);
|
||||
const hookCtx = deriveInboundMessageHookContext(finalized);
|
||||
const replyTarget = resolveInboundReplyHookTarget(finalized, hookCtx);
|
||||
|
||||
return async (payload: ReplyPayload): Promise<ReplyPayload | null> => {
|
||||
if (!payload.text) {
|
||||
return payload;
|
||||
}
|
||||
|
||||
const result = await hookRunner.runMessageSending(
|
||||
{ content: payload.text, to: replyTarget },
|
||||
toPluginMessageContext(hookCtx),
|
||||
);
|
||||
|
||||
if (result?.cancel) {
|
||||
return null;
|
||||
}
|
||||
if (result?.content != null) {
|
||||
return { ...payload, text: result.content };
|
||||
}
|
||||
return payload;
|
||||
};
|
||||
}
|
||||
|
||||
export type DispatchInboundResult = DispatchFromConfigResult;
|
||||
export { withReplyDispatcher } from "./dispatch-dispatcher.js";
|
||||
|
||||
function finalizeDispatchResult(
|
||||
result: DispatchFromConfigResult,
|
||||
dispatcher: ReplyDispatcher,
|
||||
): DispatchFromConfigResult {
|
||||
const cancelledCounts = dispatcher.getCancelledCounts?.();
|
||||
if (!cancelledCounts) {
|
||||
return result;
|
||||
}
|
||||
|
||||
const counts = {
|
||||
tool: Math.max(0, result.counts.tool - cancelledCounts.tool),
|
||||
block: Math.max(0, result.counts.block - cancelledCounts.block),
|
||||
final: Math.max(0, result.counts.final - cancelledCounts.final),
|
||||
};
|
||||
return {
|
||||
queuedFinal: result.queuedFinal && counts.final > 0,
|
||||
counts,
|
||||
};
|
||||
}
|
||||
|
||||
export async function dispatchInboundMessage(params: {
|
||||
ctx: MsgContext | FinalizedMsgContext;
|
||||
cfg: OpenClawConfig;
|
||||
@@ -55,7 +126,7 @@ export async function dispatchInboundMessage(params: {
|
||||
replyResolver?: GetReplyFromConfig;
|
||||
}): Promise<DispatchInboundResult> {
|
||||
const finalized = finalizeInboundContext(params.ctx);
|
||||
return await withReplyDispatcher({
|
||||
const result = await withReplyDispatcher({
|
||||
dispatcher: params.dispatcher,
|
||||
run: () =>
|
||||
dispatchReplyFromConfig({
|
||||
@@ -66,6 +137,7 @@ export async function dispatchInboundMessage(params: {
|
||||
replyResolver: params.replyResolver,
|
||||
}),
|
||||
});
|
||||
return finalizeDispatchResult(result, params.dispatcher);
|
||||
}
|
||||
|
||||
export async function dispatchInboundMessageWithBufferedDispatcher(params: {
|
||||
@@ -76,9 +148,12 @@ export async function dispatchInboundMessageWithBufferedDispatcher(params: {
|
||||
replyResolver?: GetReplyFromConfig;
|
||||
}): Promise<DispatchInboundResult> {
|
||||
const silentReplyContext = resolveDispatcherSilentReplyContext(params.ctx, params.cfg);
|
||||
const beforeDeliver =
|
||||
params.dispatcherOptions.beforeDeliver ?? buildMessageSendingBeforeDeliver(params.ctx);
|
||||
const { dispatcher, replyOptions, markDispatchIdle, markRunComplete } =
|
||||
createReplyDispatcherWithTyping({
|
||||
...params.dispatcherOptions,
|
||||
beforeDeliver,
|
||||
silentReplyContext: params.dispatcherOptions.silentReplyContext ?? silentReplyContext,
|
||||
});
|
||||
try {
|
||||
@@ -108,6 +183,8 @@ export async function dispatchInboundMessageWithDispatcher(params: {
|
||||
const silentReplyContext = resolveDispatcherSilentReplyContext(params.ctx, params.cfg);
|
||||
const dispatcher = createReplyDispatcher({
|
||||
...params.dispatcherOptions,
|
||||
beforeDeliver:
|
||||
params.dispatcherOptions.beforeDeliver ?? buildMessageSendingBeforeDeliver(params.ctx),
|
||||
silentReplyContext: params.dispatcherOptions.silentReplyContext ?? silentReplyContext,
|
||||
});
|
||||
return await dispatchInboundMessage({
|
||||
|
||||
68
src/auto-reply/reply/before-deliver.test.ts
Normal file
68
src/auto-reply/reply/before-deliver.test.ts
Normal file
@@ -0,0 +1,68 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
import type { ReplyPayload } from "../types.js";
|
||||
import { createReplyDispatcher } from "./reply-dispatcher.js";
|
||||
|
||||
describe("beforeDeliver in reply dispatcher", () => {
|
||||
it("cancels delivery when beforeDeliver returns null", async () => {
|
||||
const delivered: string[] = [];
|
||||
|
||||
const dispatcher = createReplyDispatcher({
|
||||
deliver: async (payload) => {
|
||||
delivered.push(payload.text ?? "");
|
||||
},
|
||||
beforeDeliver: async (payload: ReplyPayload) => {
|
||||
if (payload.text?.includes("blocked")) {
|
||||
return null;
|
||||
}
|
||||
return payload;
|
||||
},
|
||||
});
|
||||
|
||||
dispatcher.sendFinalReply({ text: "blocked reply" });
|
||||
dispatcher.sendFinalReply({ text: "safe reply" });
|
||||
dispatcher.markComplete();
|
||||
await dispatcher.waitForIdle();
|
||||
|
||||
expect(delivered).toEqual(["safe reply"]);
|
||||
expect(dispatcher.getQueuedCounts()).toEqual({ tool: 0, block: 0, final: 2 });
|
||||
expect(dispatcher.getCancelledCounts?.()).toEqual({ tool: 0, block: 0, final: 1 });
|
||||
});
|
||||
|
||||
it("allows modifying payload in beforeDeliver", async () => {
|
||||
const delivered: string[] = [];
|
||||
|
||||
const dispatcher = createReplyDispatcher({
|
||||
deliver: async (payload) => {
|
||||
delivered.push(payload.text ?? "");
|
||||
},
|
||||
beforeDeliver: async (payload: ReplyPayload) => {
|
||||
if (payload.text?.includes("error")) {
|
||||
return { ...payload, text: "replaced" };
|
||||
}
|
||||
return payload;
|
||||
},
|
||||
});
|
||||
|
||||
dispatcher.sendFinalReply({ text: "some error occurred" });
|
||||
dispatcher.markComplete();
|
||||
await dispatcher.waitForIdle();
|
||||
|
||||
expect(delivered).toEqual(["replaced"]);
|
||||
});
|
||||
|
||||
it("delivers normally without beforeDeliver", async () => {
|
||||
const delivered: string[] = [];
|
||||
|
||||
const dispatcher = createReplyDispatcher({
|
||||
deliver: async (payload) => {
|
||||
delivered.push(payload.text ?? "");
|
||||
},
|
||||
});
|
||||
|
||||
dispatcher.sendFinalReply({ text: "plain reply" });
|
||||
dispatcher.markComplete();
|
||||
await dispatcher.waitForIdle();
|
||||
|
||||
expect(delivered).toEqual(["plain reply"]);
|
||||
});
|
||||
});
|
||||
@@ -31,6 +31,11 @@ type ReplyDispatchDeliverer = (
|
||||
info: { kind: ReplyDispatchKind },
|
||||
) => Promise<void>;
|
||||
|
||||
export type ReplyDispatchBeforeDeliver = (
|
||||
payload: ReplyPayload,
|
||||
info: { kind: ReplyDispatchKind },
|
||||
) => Promise<ReplyPayload | null> | ReplyPayload | null;
|
||||
|
||||
const DEFAULT_HUMAN_DELAY_MIN_MS = 800;
|
||||
const DEFAULT_HUMAN_DELAY_MAX_MS = 2500;
|
||||
const silentReplyLogger = createSubsystemLogger("silent-reply/dispatcher");
|
||||
@@ -73,6 +78,7 @@ export type ReplyDispatcherOptions = {
|
||||
onSkip?: ReplyDispatchSkipHandler;
|
||||
/** Human-like delay between block replies for natural rhythm. */
|
||||
humanDelay?: HumanDelayConfig;
|
||||
beforeDeliver?: ReplyDispatchBeforeDeliver;
|
||||
};
|
||||
|
||||
export type ReplyDispatcherWithTypingOptions = Omit<ReplyDispatcherOptions, "onIdle"> & {
|
||||
@@ -190,6 +196,11 @@ export function createReplyDispatcher(options: ReplyDispatcherOptions): ReplyDis
|
||||
block: 0,
|
||||
final: 0,
|
||||
};
|
||||
const cancelledCounts: Record<ReplyDispatchKind, number> = {
|
||||
tool: 0,
|
||||
block: 0,
|
||||
final: 0,
|
||||
};
|
||||
|
||||
// Register this dispatcher globally for gateway restart coordination.
|
||||
const { unregister } = registerDispatcher({
|
||||
@@ -242,9 +253,15 @@ export function createReplyDispatcher(options: ReplyDispatcherOptions): ReplyDis
|
||||
await sleep(delayMs);
|
||||
}
|
||||
}
|
||||
// Safe: deliver is called inside an async .then() callback, so even a synchronous
|
||||
// throw becomes a rejection that flows through .catch()/.finally(), ensuring cleanup.
|
||||
await options.deliver(normalized, { kind });
|
||||
let deliverPayload: ReplyPayload | null = normalized;
|
||||
if (options.beforeDeliver) {
|
||||
deliverPayload = await options.beforeDeliver(normalized, { kind });
|
||||
if (!deliverPayload) {
|
||||
cancelledCounts[kind] += 1;
|
||||
return;
|
||||
}
|
||||
}
|
||||
await options.deliver(deliverPayload, { kind });
|
||||
})
|
||||
.catch((err) => {
|
||||
failedCounts[kind] += 1;
|
||||
@@ -294,6 +311,7 @@ export function createReplyDispatcher(options: ReplyDispatcherOptions): ReplyDis
|
||||
sendFinalReply: (payload) => enqueue("final", payload),
|
||||
waitForIdle: () => sendChain,
|
||||
getQueuedCounts: () => ({ ...queuedCounts }),
|
||||
getCancelledCounts: () => ({ ...cancelledCounts }),
|
||||
getFailedCounts: () => ({ ...failedCounts }),
|
||||
markComplete,
|
||||
};
|
||||
|
||||
@@ -8,6 +8,7 @@ export type ReplyDispatcher = {
|
||||
sendFinalReply: (payload: ReplyPayload) => boolean;
|
||||
waitForIdle: () => Promise<void>;
|
||||
getQueuedCounts: () => Record<ReplyDispatchKind, number>;
|
||||
getCancelledCounts?: () => Record<ReplyDispatchKind, number>;
|
||||
getFailedCounts: () => Record<ReplyDispatchKind, number>;
|
||||
markComplete: () => void;
|
||||
};
|
||||
|
||||
@@ -228,7 +228,10 @@ describe("resolvePluginCapabilityProviders", () => {
|
||||
|
||||
const providers = resolvePluginCapabilityProviders({
|
||||
key: "speechProviders",
|
||||
cfg: { messages: { tts: { provider: "edge" } } } as OpenClawConfig,
|
||||
cfg: {
|
||||
plugins: { entries: { microsoft: { enabled: true } } },
|
||||
messages: { tts: { provider: "edge" } },
|
||||
} as OpenClawConfig,
|
||||
});
|
||||
|
||||
expectResolvedCapabilityProviderIds(providers, ["microsoft"]);
|
||||
@@ -238,6 +241,48 @@ describe("resolvePluginCapabilityProviders", () => {
|
||||
});
|
||||
});
|
||||
|
||||
it("keeps active capability providers when cfg has no explicit plugin config", () => {
|
||||
const active = createEmptyPluginRegistry();
|
||||
active.speechProviders.push({
|
||||
pluginId: "acme",
|
||||
pluginName: "acme",
|
||||
source: "test",
|
||||
provider: {
|
||||
id: "acme",
|
||||
label: "acme",
|
||||
isConfigured: () => true,
|
||||
synthesize: async () => ({
|
||||
audioBuffer: Buffer.from("x"),
|
||||
outputFormat: "mp3",
|
||||
voiceCompatible: false,
|
||||
fileExtension: ".mp3",
|
||||
}),
|
||||
},
|
||||
} as never);
|
||||
mocks.loadPluginManifestRegistry.mockReturnValue({
|
||||
plugins: [
|
||||
{
|
||||
id: "microsoft",
|
||||
origin: "bundled",
|
||||
contracts: { speechProviders: ["microsoft"] },
|
||||
},
|
||||
] as never,
|
||||
diagnostics: [],
|
||||
});
|
||||
mocks.resolveRuntimePluginRegistry.mockReturnValue(active);
|
||||
|
||||
const providers = resolvePluginCapabilityProviders({
|
||||
key: "speechProviders",
|
||||
cfg: { messages: { tts: { provider: "acme" } } } as OpenClawConfig,
|
||||
});
|
||||
|
||||
expectResolvedCapabilityProviderIds(providers, ["acme"]);
|
||||
expect(mocks.resolveRuntimePluginRegistry).toHaveBeenCalledWith();
|
||||
expect(mocks.resolveRuntimePluginRegistry).not.toHaveBeenCalledWith({
|
||||
config: expect.anything(),
|
||||
});
|
||||
});
|
||||
|
||||
it("merges active and allowlisted bundled capability providers when cfg is passed", () => {
|
||||
const active = createEmptyPluginRegistry();
|
||||
active.speechProviders.push({
|
||||
|
||||
@@ -4,6 +4,7 @@ import {
|
||||
withBundledPluginEnablementCompat,
|
||||
withBundledPluginVitestCompat,
|
||||
} from "./bundled-compat.js";
|
||||
import { hasExplicitPluginConfig } from "./config-policy.js";
|
||||
import { resolveRuntimePluginRegistry } from "./loader.js";
|
||||
import { loadPluginManifestRegistry } from "./manifest-registry.js";
|
||||
import type { PluginRegistry } from "./registry-types.js";
|
||||
@@ -158,7 +159,11 @@ export function resolvePluginCapabilityProviders<K extends CapabilityProviderReg
|
||||
}): CapabilityProviderForKey<K>[] {
|
||||
const activeRegistry = resolveRuntimePluginRegistry();
|
||||
const activeProviders = activeRegistry?.[params.key] ?? [];
|
||||
if (activeProviders.length > 0 && params.key !== "memoryEmbeddingProviders" && !params.cfg) {
|
||||
if (
|
||||
activeProviders.length > 0 &&
|
||||
params.key !== "memoryEmbeddingProviders" &&
|
||||
!hasExplicitPluginConfig(params.cfg?.plugins)
|
||||
) {
|
||||
return activeProviders.map((entry) => entry.provider) as CapabilityProviderForKey<K>[];
|
||||
}
|
||||
const compatConfig = resolveCapabilityProviderConfig({ key: params.key, cfg: params.cfg });
|
||||
|
||||
Reference in New Issue
Block a user