@@ -671,15 +671,28 @@ export const dispatchTelegramMessage = async ({
671671}
672672const rawText = typeof line === "string" ? line : line?.text;
673673const normalized = sanitizeProgressMarkdownText(rawText?.replace(/\s+/g, " ").trim() ?? "");
674+if (streamToolProgressSuppressed) {
675+return false;
676+}
677+if (streamMode !== "progress" && !streamToolProgressEnabled) {
678+return false;
679+}
680+const shouldUpdateProgressLines =
681+streamToolProgressEnabled && !streamToolProgressSuppressed && Boolean(normalized);
682+if (!shouldUpdateProgressLines && streamMode !== "progress") {
683+return false;
684+}
674685const progressLine =
675686typeof line === "object" && line !== undefined ? { ...line, text: normalized } : normalized;
676-if (nativeToolProgressDraft && !streamToolProgressSuppressed && normalized) {
677-const nextLines = mergeChannelProgressDraftLine(streamToolProgressLines, progressLine, {
678-maxLines: resolveChannelProgressDraftMaxLines(telegramCfg),
679-});
680-if (nextLines === streamToolProgressLines) {
681-return false;
682-}
687+const nextLines = shouldUpdateProgressLines
688+ ? mergeChannelProgressDraftLine(streamToolProgressLines, progressLine, {
689+maxLines: resolveChannelProgressDraftMaxLines(telegramCfg),
690+})
691+ : streamToolProgressLines;
692+if (shouldUpdateProgressLines && nextLines === streamToolProgressLines) {
693+return false;
694+}
695+if (nativeToolProgressDraft && shouldUpdateProgressLines) {
683696const streamText = formatChannelProgressDraftText({
684697entry: telegramCfg,
685698lines: nextLines,
@@ -691,15 +704,6 @@ export const dispatchTelegramMessage = async ({
691704}
692705}
693706if (streamMode !== "progress") {
694-if (!streamToolProgressEnabled || streamToolProgressSuppressed || !normalized) {
695-return false;
696-}
697-const nextLines = mergeChannelProgressDraftLine(streamToolProgressLines, progressLine, {
698-maxLines: resolveChannelProgressDraftMaxLines(telegramCfg),
699-});
700-if (nextLines === streamToolProgressLines) {
701-return false;
702-}
703707streamToolProgressLines = nextLines;
704708const streamText = formatChannelProgressDraftText({
705709entry: telegramCfg,
@@ -714,21 +718,8 @@ export const dispatchTelegramMessage = async ({
714718answerLane.stream.update(streamText);
715719return true;
716720}
717-if (streamToolProgressEnabled && !streamToolProgressSuppressed && normalized) {
718-streamToolProgressLines = mergeChannelProgressDraftLine(
719-streamToolProgressLines,
720-progressLine,
721-{
722-maxLines: resolveChannelProgressDraftMaxLines(telegramCfg),
723-},
724-);
725-}
726-if (
727-options?.startImmediately &&
728-streamToolProgressEnabled &&
729-!streamToolProgressSuppressed &&
730-normalized
731-) {
721+streamToolProgressLines = nextLines;
722+if (options?.startImmediately) {
732723const alreadyStarted = progressDraftGate.hasStarted;
733724await progressDraftGate.startNow();
734725if (alreadyStarted && progressDraftGate.hasStarted) {
此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。 原文来自 — 版权归原作者所有。