fix(telegram): preserve rich progress command output

obviyus · obviyus · commit f5a9456219d4 · 2026-06-15T22:02:39.000+05:30
diff --git a/extensions/telegram/src/bot-message-dispatch.ts b/extensions/telegram/src/bot-message-dispatch.ts
@@ -2434,7 +2434,7 @@ export const dispatchTelegramMessage = async ({
                       return;
                     }
                     await pushStreamToolProgress(
-                      buildChannelProgressDraftLine({
+                      buildChannelProgressDraftLineForEntry(telegramCfg, {
                         event: "command-output",
                         itemId: payload.itemId,
                         toolCallId: payload.toolCallId,
diff --git a/src/channels/streaming.ts b/src/channels/streaming.ts
@@ -329,10 +329,14 @@ function buildNamedProgressLine(
   });
   const display = resolveToolDisplay({ name: normalizedName });
   const prefix = `${display.emoji} ${display.label}`;
-  const compactCommandPrefix =
+  const compactCommandDetail =
     (display.name === "exec" || display.name === "bash") && text.startsWith(`${display.emoji} `)
       ? text.slice(display.emoji.length + 1).trim()
       : undefined;
+  const compactCommandPrefix =
+    compactCommandDetail && compactCommandDetail !== display.label
+      ? compactCommandDetail
+      : undefined;
   const detail = text.startsWith(`${prefix}: `)
     ? text.slice(prefix.length + 2).trim()
     : compactCommandPrefix;
@@ -423,6 +427,39 @@ function patchMetas(input: Extract<ChannelProgressDraftLineInput, { event: "patc
   return compactStrings([input.summary, ...fileMetas, input.title]);
 }
 
+function buildCommandOutputProgressLine(
+  input: Extract<ChannelProgressDraftLineInput, { event: "command-output" }>,
+  status: string | undefined,
+  options?: ChannelProgressLineOptions,
+): ChannelProgressDraftLine | undefined {
+  const name = input.name ?? "exec";
+  const correlationKey = resolveCommandProgressCorrelationKey(input);
+  const detail = options?.commandText === "status" ? [] : compactStrings([input.title]);
+  const line = buildNamedProgressLine(input.event, name, detail, options, {
+    correlationKey,
+    id: resolveProgressDraftLineId(input, { useToolCallIdFallback: true }),
+    status,
+  });
+  if (!line || !status) {
+    return line;
+  }
+  if (!line.detail || line.detail === status) {
+    const statusLine = {
+      ...line,
+      detail: status,
+      text: formatToolAggregate(name, [status], { markdown: options?.markdown }),
+    };
+    setProgressDraftLineCorrelationKey(statusLine, correlationKey);
+    return statusLine;
+  }
+  const statusLine = {
+    ...line,
+    text: formatToolAggregate(name, [status, line.detail], { markdown: options?.markdown }),
+  };
+  setProgressDraftLineCorrelationKey(statusLine, correlationKey);
+  return statusLine;
+}
+
 function shouldPrefixProgressLine(line: string): boolean {
   return !EMOJI_PREFIX_RE.test(line);
 }
@@ -571,17 +608,7 @@ export function buildChannelProgressDraftLine(
           : input.exitCode != null
             ? `exit ${input.exitCode}`
             : input.status;
-      return buildNamedProgressLine(
-        input.event,
-        input.name ?? "exec",
-        [status, input.title],
-        options,
-        {
-          correlationKey: resolveCommandProgressCorrelationKey(input),
-          id: resolveProgressDraftLineId(input, { useToolCallIdFallback: true }),
-          status,
-        },
-      );
+      return buildCommandOutputProgressLine(input, status, options);
     }
     case "patch": {
       if (input.phase !== undefined && input.phase !== "end") {
@@ -1027,15 +1054,22 @@ function getProgressDraftLineText(line: string | ChannelProgressDraftLine): stri
   const prefix = icon ? `${icon} ` : "";
   const label = line.label.trim();
   const detail = line.detail?.trim();
+  const status = line.status?.trim();
   if (detail) {
     const compactCommandLine =
       line.toolName === "exec" || line.toolName === "bash" || line.toolName === "shell";
+    if (line.kind === "command-output" && status && detail !== status) {
+      const outputDetail = detail.startsWith(`${status};`) ? detail : `${status}; ${detail}`;
+      if (compactCommandLine) {
+        return `${prefix}${outputDetail}`;
+      }
+      return label ? `${prefix}${label}: ${outputDetail}` : `${prefix}${outputDetail}`;
+    }
     if (line.kind !== "patch" && label && !compactCommandLine) {
       return `${prefix}${label}: ${detail}`;
     }
     return `${prefix}${detail}`;
   }
-  const status = line.status?.trim();
   if (status) {
     if (label) {
       return `${prefix}${label}: ${status}`;
@@ -1054,7 +1088,8 @@ export function normalizeChannelProgressDraftLineIdentity(
   line: string | ChannelProgressDraftLine | undefined,
 ): string {
   const text = typeof line === "string" ? line : line?.text;
-  return text?.replace(/\s+/g, " ").trim() ?? "";
+  const status = typeof line === "object" ? line.status : undefined;
+  return compactStrings([text, status]).join(" ");
 }
 
 export function mergeChannelProgressDraftLine<TLine extends string | ChannelProgressDraftLine>(

Original file line number	Diff line number	Diff line change
`@@ -2434,7 +2434,7 @@ export const dispatchTelegramMessage = async ({`
`2434`	`2434`	`return;`
`2435`	`2435`	`}`
`2436`	`2436`	`await pushStreamToolProgress(`
`2437`		`- buildChannelProgressDraftLine({`
	`2437`	`+ buildChannelProgressDraftLineForEntry(telegramCfg, {`
`2438`	`2438`	`event: "command-output",`
`2439`	`2439`	`itemId: payload.itemId,`
`2440`	`2440`	`toolCallId: payload.toolCallId,`