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
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 53 additions and 18 deletions

View File

@ -39,6 +39,7 @@ Docs: https://docs.openclaw.ai
- Docs/Mintlify: fix MDX marker syntax on Perplexity, Model Providers, Moonshot, and exec approvals pages so local docs preview no longer breaks rendering or leaves stale pages unpublished. (#46695) Thanks @velvet-shark. - Docs/Mintlify: fix MDX marker syntax on Perplexity, Model Providers, Moonshot, and exec approvals pages so local docs preview no longer breaks rendering or leaves stale pages unpublished. (#46695) Thanks @velvet-shark.
- Email/webhook wrapping: sanitize sender and subject metadata before external-content wrapping so metadata fields cannot break the wrapper structure. Thanks @vincentkoc. - Email/webhook wrapping: sanitize sender and subject metadata before external-content wrapping so metadata fields cannot break the wrapper structure. Thanks @vincentkoc.
- Node/startup: remove leftover debug `console.log("node host PATH: ...")` that printed the resolved PATH on every `openclaw node run` invocation. (#46411) - Node/startup: remove leftover debug `console.log("node host PATH: ...")` that printed the resolved PATH on every `openclaw node run` invocation. (#46411)
- Telegram/message send: forward `--force-document` through the `sendPayload` path as well as `sendMedia`, so Telegram payload sends with `channelData` keep uploading images as documents instead of silently falling back to compressed photo sends. (#47119) Thanks @thepagent.
## 2026.3.13 ## 2026.3.13

View File

@ -403,3 +403,30 @@ describe("telegramPlugin duplicate token guard", () => {
); );
}); });
}); });
describe("telegramPlugin outbound sendPayload forceDocument", () => {
it("forwards forceDocument to the underlying send call when channelData is present", async () => {
const sendMessageTelegram = installSendMessageRuntime(
vi.fn(async () => ({ messageId: "tg-fd" })),
);
await telegramPlugin.outbound!.sendPayload!({
cfg: createCfg(),
to: "12345",
text: "",
payload: {
text: "here is an image",
mediaUrls: ["https://example.com/photo.png"],
channelData: { telegram: {} },
},
accountId: "ops",
forceDocument: true,
});
expect(sendMessageTelegram).toHaveBeenCalledWith(
"12345",
expect.any(String),
expect.objectContaining({ forceDocument: true }),
);
});
});

View File

@ -96,6 +96,7 @@ function buildTelegramSendOptions(params: {
replyToId?: string | null; replyToId?: string | null;
threadId?: string | number | null; threadId?: string | number | null;
silent?: boolean | null; silent?: boolean | null;
forceDocument?: boolean | null;
}): TelegramSendOptions { }): TelegramSendOptions {
return { return {
verbose: false, verbose: false,
@ -106,6 +107,7 @@ function buildTelegramSendOptions(params: {
replyToMessageId: parseTelegramReplyToMessageId(params.replyToId), replyToMessageId: parseTelegramReplyToMessageId(params.replyToId),
accountId: params.accountId ?? undefined, accountId: params.accountId ?? undefined,
silent: params.silent ?? undefined, silent: params.silent ?? undefined,
forceDocument: params.forceDocument ?? undefined,
}; };
} }
@ -386,6 +388,7 @@ export const telegramPlugin: ChannelPlugin<ResolvedTelegramAccount, TelegramProb
replyToId, replyToId,
threadId, threadId,
silent, silent,
forceDocument,
}) => { }) => {
const send = const send =
resolveOutboundSendDep<TelegramSendFn>(deps, "telegram") ?? resolveOutboundSendDep<TelegramSendFn>(deps, "telegram") ??
@ -401,6 +404,7 @@ export const telegramPlugin: ChannelPlugin<ResolvedTelegramAccount, TelegramProb
replyToId, replyToId,
threadId, threadId,
silent, silent,
forceDocument,
}), }),
}); });
return { channel: "telegram", ...result }; return { channel: "telegram", ...result };

View File

@ -141,6 +141,7 @@ export const telegramOutbound: ChannelOutboundAdapter = {
deps, deps,
replyToId, replyToId,
threadId, threadId,
forceDocument,
}) => { }) => {
const { send, baseOpts } = resolveTelegramSendContext({ const { send, baseOpts } = resolveTelegramSendContext({
cfg, cfg,
@ -156,6 +157,7 @@ export const telegramOutbound: ChannelOutboundAdapter = {
baseOpts: { baseOpts: {
...baseOpts, ...baseOpts,
mediaLocalRoots, mediaLocalRoots,
forceDocument: forceDocument ?? false,
}, },
}); });
return { channel: "telegram", ...result }; return { channel: "telegram", ...result };

View File

@ -695,6 +695,7 @@ async function deliverOutboundPayloadsCore(
const sendOverrides = { const sendOverrides = {
replyToId: effectivePayload.replyToId ?? params.replyToId ?? undefined, replyToId: effectivePayload.replyToId ?? params.replyToId ?? undefined,
threadId: params.threadId ?? undefined, threadId: params.threadId ?? undefined,
forceDocument: params.forceDocument,
}; };
if (handler.sendPayload && effectivePayload.channelData) { if (handler.sendPayload && effectivePayload.channelData) {
const delivery = await handler.sendPayload(effectivePayload, sendOverrides); 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 { describe, expect, it, vi, beforeEach } from "vitest";
import { ensureCustomApiRegistered } from "../agents/custom-api-registry.js"; import { ensureCustomApiRegistered } from "../agents/custom-api-registry.js";
import { getApiKeyForModel } from "../agents/model-auth.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 type { OpenClawConfig } from "../config/config.js";
import { withEnv } from "../test-utils/env.js"; import { withEnv } from "../test-utils/env.js";
import * as tts from "./tts.js"; import * as tts from "./tts.js";
@ -20,13 +20,13 @@ vi.mock("@mariozechner/pi-ai/oauth", () => ({
getOAuthApiKey: vi.fn(async () => null), getOAuthApiKey: vi.fn(async () => null),
})); }));
vi.mock("../agents/pi-embedded-runner/model.js", () => ({ function createResolvedModel(provider: string, modelId: string, api = "openai-completions") {
resolveModel: vi.fn((provider: string, modelId: string) => ({ return {
model: { model: {
provider, provider,
id: modelId, id: modelId,
name: modelId, name: modelId,
api: "openai-completions", api,
reasoning: false, reasoning: false,
input: ["text"], input: ["text"],
cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 }, cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
@ -35,7 +35,16 @@ vi.mock("../agents/pi-embedded-runner/model.js", () => ({
}, },
authStorage: { profiles: {} }, authStorage: { profiles: {} },
modelRegistry: { find: vi.fn() }, 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", () => ({ vi.mock("../agents/model-auth.js", () => ({
@ -411,25 +420,16 @@ describe("tts", () => {
timeoutMs: 30_000, 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 () => { it("registers the Ollama api before direct summarization", async () => {
vi.mocked(resolveModel).mockReturnValue({ vi.mocked(resolveModelAsync).mockResolvedValue({
...createResolvedModel("ollama", "qwen3:8b", "ollama"),
model: { model: {
provider: "ollama", ...createResolvedModel("ollama", "qwen3:8b", "ollama").model,
id: "qwen3:8b",
name: "qwen3:8b",
api: "ollama",
baseUrl: "http://127.0.0.1:11434", 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); } as never);
await summarizeText({ await summarizeText({