fix: keep telegram streamMode draft-only (#619) (thanks @rubyrunsstuff)
This commit is contained in:
@@ -38,6 +38,7 @@
|
|||||||
- Auth: default billing disable backoff to 5h (doubling, 24h cap) and surface disabled/cooldown profiles in `models list` + doctor. (#486) — thanks @steipete
|
- Auth: default billing disable backoff to 5h (doubling, 24h cap) and surface disabled/cooldown profiles in `models list` + doctor. (#486) — thanks @steipete
|
||||||
- Commands: harden slash command registry and list text-only commands in `/commands`.
|
- Commands: harden slash command registry and list text-only commands in `/commands`.
|
||||||
- Models/Auth: show per-agent auth candidates in `/model status`, and add `clawdbot models auth order {get,set,clear}` (per-agent auth rotation overrides). — thanks @steipete
|
- Models/Auth: show per-agent auth candidates in `/model status`, and add `clawdbot models auth order {get,set,clear}` (per-agent auth rotation overrides). — thanks @steipete
|
||||||
|
- Telegram: keep streamMode draft-only; avoid forcing block streaming. (#619) — thanks @rubyrunsstuff
|
||||||
- Debugging: add raw model stream logging flags and document gateway watch mode.
|
- Debugging: add raw model stream logging flags and document gateway watch mode.
|
||||||
- Gateway: decode dns-sd escaped UTF-8 in discovery output and show scan progress immediately. — thanks @steipete
|
- Gateway: decode dns-sd escaped UTF-8 in discovery output and show scan progress immediately. — thanks @steipete
|
||||||
- Agent: add claude-cli/opus-4.5 runner via Claude CLI with resume support (tools disabled).
|
- Agent: add claude-cli/opus-4.5 runner via Claude CLI with resume support (tools disabled).
|
||||||
|
|||||||
@@ -109,7 +109,6 @@ import {
|
|||||||
|
|
||||||
// Optional features can be implemented as Pi extensions that run in the same Node process.
|
// Optional features can be implemented as Pi extensions that run in the same Node process.
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Resolve provider-specific extraParams from model config.
|
* Resolve provider-specific extraParams from model config.
|
||||||
* Auto-enables thinking mode for GLM-4.x models unless explicitly disabled.
|
* Auto-enables thinking mode for GLM-4.x models unless explicitly disabled.
|
||||||
|
|||||||
@@ -273,4 +273,45 @@ describe("block streaming", () => {
|
|||||||
expect(sawAbort).toBe(true);
|
expect(sawAbort).toBe(true);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("does not enable block streaming for telegram streamMode block", async () => {
|
||||||
|
await withTempHome(async (home) => {
|
||||||
|
const onBlockReply = vi.fn().mockResolvedValue(undefined);
|
||||||
|
|
||||||
|
const impl = async () => ({
|
||||||
|
payloads: [{ text: "final" }],
|
||||||
|
meta: {
|
||||||
|
durationMs: 5,
|
||||||
|
agentMeta: { sessionId: "s", provider: "p", model: "m" },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
piEmbeddedMock.runEmbeddedPiAgent.mockImplementation(impl);
|
||||||
|
|
||||||
|
const res = await getReplyFromConfig(
|
||||||
|
{
|
||||||
|
Body: "ping",
|
||||||
|
From: "+1004",
|
||||||
|
To: "+2000",
|
||||||
|
MessageSid: "msg-126",
|
||||||
|
Provider: "telegram",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
onBlockReply,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
agents: {
|
||||||
|
defaults: {
|
||||||
|
model: "anthropic/claude-opus-4-5",
|
||||||
|
workspace: path.join(home, "clawd"),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
telegram: { allowFrom: ["*"], streamMode: "block" },
|
||||||
|
session: { store: path.join(home, "sessions.json") },
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(res?.text).toBe("final");
|
||||||
|
expect(onBlockReply).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -58,9 +58,7 @@ export function resolveBlockStreamingChunking(
|
|||||||
Math.floor(chunkCfg?.maxChars ?? DEFAULT_BLOCK_STREAM_MAX),
|
Math.floor(chunkCfg?.maxChars ?? DEFAULT_BLOCK_STREAM_MAX),
|
||||||
);
|
);
|
||||||
const maxChars = Math.max(1, Math.min(maxRequested, textLimit));
|
const maxChars = Math.max(1, Math.min(maxRequested, textLimit));
|
||||||
const telegramBlockStreaming =
|
const minFallback = DEFAULT_BLOCK_STREAM_MIN;
|
||||||
providerKey === "telegram" && cfg?.telegram?.streamMode === "block";
|
|
||||||
const minFallback = telegramBlockStreaming ? 1 : DEFAULT_BLOCK_STREAM_MIN;
|
|
||||||
const minRequested = Math.max(
|
const minRequested = Math.max(
|
||||||
1,
|
1,
|
||||||
Math.floor(chunkCfg?.minChars ?? minFallback),
|
Math.floor(chunkCfg?.minChars ?? minFallback),
|
||||||
@@ -135,13 +133,6 @@ export function resolveBlockStreamingCoalescing(
|
|||||||
})();
|
})();
|
||||||
const coalesceCfg =
|
const coalesceCfg =
|
||||||
providerCfg ?? cfg?.agents?.defaults?.blockStreamingCoalesce;
|
providerCfg ?? cfg?.agents?.defaults?.blockStreamingCoalesce;
|
||||||
if (
|
|
||||||
providerKey === "telegram" &&
|
|
||||||
cfg?.telegram?.streamMode === "block" &&
|
|
||||||
!coalesceCfg
|
|
||||||
) {
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
const minRequested = Math.max(
|
const minRequested = Math.max(
|
||||||
1,
|
1,
|
||||||
Math.floor(
|
Math.floor(
|
||||||
|
|||||||
@@ -826,15 +826,11 @@ export function createTelegramBot(opts: TelegramBotOptions) {
|
|||||||
onReplyStart: sendTyping,
|
onReplyStart: sendTyping,
|
||||||
});
|
});
|
||||||
|
|
||||||
const blockStreamingDisabledByConfig =
|
|
||||||
typeof telegramCfg.blockStreaming === "boolean"
|
|
||||||
? !telegramCfg.blockStreaming
|
|
||||||
: false;
|
|
||||||
const forceBlockStreaming = Boolean(
|
|
||||||
streamMode === "block" && !draftStream && !blockStreamingDisabledByConfig,
|
|
||||||
);
|
|
||||||
const disableBlockStreaming =
|
const disableBlockStreaming =
|
||||||
Boolean(draftStream) || blockStreamingDisabledByConfig ? true : undefined;
|
Boolean(draftStream) ||
|
||||||
|
(typeof telegramCfg.blockStreaming === "boolean"
|
||||||
|
? !telegramCfg.blockStreaming
|
||||||
|
: undefined);
|
||||||
|
|
||||||
const { queuedFinal } = await dispatchReplyFromConfig({
|
const { queuedFinal } = await dispatchReplyFromConfig({
|
||||||
ctx: ctxPayload,
|
ctx: ctxPayload,
|
||||||
@@ -851,9 +847,7 @@ export function createTelegramBot(opts: TelegramBotOptions) {
|
|||||||
if (payload.text) draftStream.update(payload.text);
|
if (payload.text) draftStream.update(payload.text);
|
||||||
}
|
}
|
||||||
: undefined,
|
: undefined,
|
||||||
disableBlockStreaming: forceBlockStreaming
|
disableBlockStreaming,
|
||||||
? false
|
|
||||||
: disableBlockStreaming,
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
markDispatchIdle();
|
markDispatchIdle();
|
||||||
|
|||||||
Reference in New Issue
Block a user