fix: forward forceDocument through sendPayload path (follow-up to #45111) (#47119)

Merged via squash.

Prepared head SHA: d791190f83
Co-authored-by: thepagent <262003297+thepagent@users.noreply.github.com>
Reviewed-by: @frankekn
This commit is contained in:
Frank Yang
2026-03-15 17:23:53 +08:00
committed by GitHub
parent 9616d1e8ba
commit 4bb8a65edd
6 changed files with 53 additions and 18 deletions

View File

@@ -695,6 +695,7 @@ async function deliverOutboundPayloadsCore(
const sendOverrides = {
replyToId: effectivePayload.replyToId ?? params.replyToId ?? undefined,
threadId: params.threadId ?? undefined,
forceDocument: params.forceDocument,
};
if (handler.sendPayload && effectivePayload.channelData) {
const delivery = await handler.sendPayload(effectivePayload, sendOverrides);

View File

@@ -2,7 +2,7 @@ import { completeSimple, type AssistantMessage } from "@mariozechner/pi-ai";
import { describe, expect, it, vi, beforeEach } from "vitest";
import { ensureCustomApiRegistered } from "../agents/custom-api-registry.js";
import { getApiKeyForModel } from "../agents/model-auth.js";
import { resolveModel } from "../agents/pi-embedded-runner/model.js";
import { resolveModelAsync } from "../agents/pi-embedded-runner/model.js";
import type { OpenClawConfig } from "../config/config.js";
import { withEnv } from "../test-utils/env.js";
import * as tts from "./tts.js";
@@ -20,13 +20,13 @@ vi.mock("@mariozechner/pi-ai/oauth", () => ({
getOAuthApiKey: vi.fn(async () => null),
}));
vi.mock("../agents/pi-embedded-runner/model.js", () => ({
resolveModel: vi.fn((provider: string, modelId: string) => ({
function createResolvedModel(provider: string, modelId: string, api = "openai-completions") {
return {
model: {
provider,
id: modelId,
name: modelId,
api: "openai-completions",
api,
reasoning: false,
input: ["text"],
cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
@@ -35,7 +35,16 @@ vi.mock("../agents/pi-embedded-runner/model.js", () => ({
},
authStorage: { profiles: {} },
modelRegistry: { find: vi.fn() },
})),
};
}
vi.mock("../agents/pi-embedded-runner/model.js", () => ({
resolveModel: vi.fn((provider: string, modelId: string) =>
createResolvedModel(provider, modelId),
),
resolveModelAsync: vi.fn(async (provider: string, modelId: string) =>
createResolvedModel(provider, modelId),
),
}));
vi.mock("../agents/model-auth.js", () => ({
@@ -411,25 +420,16 @@ describe("tts", () => {
timeoutMs: 30_000,
});
expect(resolveModel).toHaveBeenCalledWith("openai", "gpt-4.1-mini", undefined, cfg);
expect(resolveModelAsync).toHaveBeenCalledWith("openai", "gpt-4.1-mini", undefined, cfg);
});
it("registers the Ollama api before direct summarization", async () => {
vi.mocked(resolveModel).mockReturnValue({
vi.mocked(resolveModelAsync).mockResolvedValue({
...createResolvedModel("ollama", "qwen3:8b", "ollama"),
model: {
provider: "ollama",
id: "qwen3:8b",
name: "qwen3:8b",
api: "ollama",
...createResolvedModel("ollama", "qwen3:8b", "ollama").model,
baseUrl: "http://127.0.0.1:11434",
reasoning: false,
input: ["text"],
cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
contextWindow: 128000,
maxTokens: 8192,
},
authStorage: { profiles: {} } as never,
modelRegistry: { find: vi.fn() } as never,
} as never);
await summarizeText({