From 0f637b5e3099ba80261e044dd6309f971b561852 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Fri, 13 Mar 2026 20:56:35 +0000
Subject: [PATCH] refactor: share acp conversation text normalization

---
 src/acp/conversation-id.ts                   |  4 ++--
 src/auto-reply/reply/commands-acp/context.ts | 23 +++++++-------------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/src/acp/conversation-id.ts b/src/acp/conversation-id.ts
index 7281fef4924..9cf17c9a579 100644
--- a/src/acp/conversation-id.ts
+++ b/src/acp/conversation-id.ts
@@ -4,7 +4,7 @@ export type ParsedTelegramTopicConversation = {
   canonicalConversationId: string;
 };
 
-function normalizeText(value: unknown): string {
+export function normalizeConversationText(value: unknown): string {
   if (typeof value === "string") {
     return value.trim();
   }
@@ -15,7 +15,7 @@ function normalizeText(value: unknown): string {
 }
 
 export function parseTelegramChatIdFromTarget(raw: unknown): string | undefined {
-  const text = normalizeText(raw);
+  const text = normalizeConversationText(raw);
   if (!text) {
     return undefined;
   }
diff --git a/src/auto-reply/reply/commands-acp/context.ts b/src/auto-reply/reply/commands-acp/context.ts
index 16291713fda..fd90175f38a 100644
--- a/src/auto-reply/reply/commands-acp/context.ts
+++ b/src/auto-reply/reply/commands-acp/context.ts
@@ -1,5 +1,6 @@
 import {
   buildTelegramTopicConversationId,
+  normalizeConversationText,
   parseTelegramChatIdFromTarget,
 } from "../../../acp/conversation-id.js";
 import { DISCORD_THREAD_BINDING_CHANNEL } from "../../../channels/thread-bindings-policy.js";
@@ -8,33 +9,25 @@ import { parseAgentSessionKey } from "../../../routing/session-key.js";
 import type { HandleCommandsParams } from "../commands-types.js";
 import { resolveTelegramConversationId } from "../telegram-context.js";
 
-function normalizeString(value: unknown): string {
-  if (typeof value === "string") {
-    return value.trim();
-  }
-  if (typeof value === "number" || typeof value === "bigint" || typeof value === "boolean") {
-    return `${value}`.trim();
-  }
-  return "";
-}
-
 export function resolveAcpCommandChannel(params: HandleCommandsParams): string {
   const raw =
     params.ctx.OriginatingChannel ??
     params.command.channel ??
     params.ctx.Surface ??
     params.ctx.Provider;
-  return normalizeString(raw).toLowerCase();
+  return normalizeConversationText(raw).toLowerCase();
 }
 
 export function resolveAcpCommandAccountId(params: HandleCommandsParams): string {
-  const accountId = normalizeString(params.ctx.AccountId);
+  const accountId = normalizeConversationText(params.ctx.AccountId);
   return accountId || "default";
 }
 
 export function resolveAcpCommandThreadId(params: HandleCommandsParams): string | undefined {
   const threadId =
-    params.ctx.MessageThreadId != null ? normalizeString(String(params.ctx.MessageThreadId)) : "";
+    params.ctx.MessageThreadId != null
+      ? normalizeConversationText(String(params.ctx.MessageThreadId))
+      : "";
   return threadId || undefined;
 }
 
@@ -72,7 +65,7 @@ export function resolveAcpCommandConversationId(params: HandleCommandsParams): s
 }
 
 function parseDiscordParentChannelFromSessionKey(raw: unknown): string | undefined {
-  const sessionKey = normalizeString(raw);
+  const sessionKey = normalizeConversationText(raw);
   if (!sessionKey) {
     return undefined;
   }
@@ -85,7 +78,7 @@ function parseDiscordParentChannelFromSessionKey(raw: unknown): string | undefin
 }
 
 function parseDiscordParentChannelFromContext(raw: unknown): string | undefined {
-  const parentId = normalizeString(raw);
+  const parentId = normalizeConversationText(raw);
   if (!parentId) {
     return undefined;
   }