fix(telegram): wrap destinations in <code> for approvals and mutations

Extends the /policy show fix to the other Telegram surfaces that
render destinations or URLs: approval prompts and policy mutation
confirmations (allow/deny). Without this, Telegram auto-links the
destination in strings like 'HTTPS api.github.com:443' or 'Added
allow rule: example.com' as a clickable blue URL.

- bot.go FormatApprovalMessage: wrap dest:port and the rendered
  request URL in <code>. MCP tool name also in <code>.
- commands.go policyAllow / policyDeny: wrap dest in <code> on both
  store and in-memory paths.
- Consolidate the duplicated htmlEscape helpers: commands.go now uses
  the existing htmlEscape from bot.go, local wrapper removed.
- Update bot_test.go expectations to match the <code>-wrapped output.

Author: nnemirovsky

internal/telegram/bot.go

@@ -57,7 +57,7 @@ var protoDisplayName = map[string]string{
 // Callers must set ParseMode to HTML when sending the message.
 func FormatApprovalMessage(req channel.ApprovalRequest) string {
 	if req.Protocol == "mcp" {
-		msg := "OpenClaw wants to call tool:\n\n" + htmlEscape(req.Destination)
+		msg := "OpenClaw wants to call tool:\n\n" + htmlCode(req.Destination)
 		if req.ToolArgs != "" {
 			pretty := prettyJSONOrRaw(req.ToolArgs)
 			msg += "\n\nArguments:\n<pre><code class=\"language-json\">" + htmlEscape(pretty) + "</code></pre>"
@@ -69,20 +69,21 @@ func FormatApprovalMessage(req channel.ApprovalRequest) string {
 	if display == "" {
 		display = req.Protocol
 	}
+	destPort := fmt.Sprintf("%s:%d", req.Destination, req.Port)
 	if req.Method != "" {
 		ver := ""
 		if req.HTTPVersion != "" {
 			ver = " (" + htmlEscape(req.HTTPVersion) + ")"
 		}
 		return fmt.Sprintf(
-			"OpenClaw wants to connect to:\n\n%s %s:%d\n%s %s%s\n\nAllow this request?",
-			htmlEscape(display), htmlEscape(req.Destination), req.Port,
-			htmlEscape(req.Method), htmlEscape(buildRequestURL(req)), ver,
+			"OpenClaw wants to connect to:\n\n%s %s\n%s %s%s\n\nAllow this request?",
+			htmlEscape(display), htmlCode(destPort),
+			htmlEscape(req.Method), htmlCode(buildRequestURL(req)), ver,
 		)
 	}
 	return fmt.Sprintf(
-		"OpenClaw wants to connect to:\n\n%s %s:%d\n\nAllow this connection?",
-		htmlEscape(display), htmlEscape(req.Destination), req.Port,
+		"OpenClaw wants to connect to:\n\n%s %s\n\nAllow this connection?",
+		htmlEscape(display), htmlCode(destPort),
 	)
 }
 

internal/telegram/bot_test.go

@@ -77,8 +77,8 @@ func TestFormatApprovalMessage(t *testing.T) {
 			Protocol:    "http",
 		}
 		msg := FormatApprovalMessage(req)
-		if !strings.Contains(msg, "HTTP example.com:8080") {
-			t.Errorf("expected 'HTTP example.com:8080' in message, got: %s", msg)
+		if !strings.Contains(msg, "HTTP <code>example.com:8080</code>") {
+			t.Errorf("expected 'HTTP <code>example.com:8080</code>' in message, got: %s", msg)
 		}
 	})
 
@@ -167,10 +167,10 @@ func TestFormatApprovalMessage(t *testing.T) {
 			Path:        "/users/me",
 		}
 		msg := FormatApprovalMessage(req)
-		if !strings.Contains(msg, "HTTPS api.example.com:443") {
+		if !strings.Contains(msg, "HTTPS <code>api.example.com:443</code>") {
 			t.Errorf("expected destination line in message, got: %s", msg)
 		}
-		if !strings.Contains(msg, "GET https://api.example.com/users/me") {
+		if !strings.Contains(msg, "GET <code>https://api.example.com/users/me</code>") {
 			t.Errorf("expected request line in message, got: %s", msg)
 		}
 		if !strings.Contains(msg, "Allow this request?") {
@@ -187,7 +187,7 @@ func TestFormatApprovalMessage(t *testing.T) {
 			Path:        "/api/submit",
 		}
 		msg := FormatApprovalMessage(req)
-		if !strings.Contains(msg, "POST http://localhost:8080/api/submit") {
+		if !strings.Contains(msg, "POST <code>http://localhost:8080/api/submit</code>") {
 			t.Errorf("expected URL with explicit port, got: %s", msg)
 		}
 	})
@@ -201,7 +201,7 @@ func TestFormatApprovalMessage(t *testing.T) {
 			Path:        "",
 		}
 		msg := FormatApprovalMessage(req)
-		if !strings.Contains(msg, "HEAD https://example.com/") {
+		if !strings.Contains(msg, "HEAD <code>https://example.com/</code>") {
 			t.Errorf("expected URL with default path '/', got: %s", msg)
 		}
 	})

internal/telegram/commands.go

@@ -253,21 +253,11 @@ func (h *CommandHandler) policyShow() string {
 	return b.String()
 }
 
-// htmlEscapeText escapes the three characters that Telegram's HTML parse mode
-// requires in text nodes: &, <, >. Quotes and apostrophes are left alone
-// since we don't use them in tag attributes.
-func htmlEscapeText(s string) string {
-	s = strings.ReplaceAll(s, "&", "&amp;")
-	s = strings.ReplaceAll(s, "<", "&lt;")
-	s = strings.ReplaceAll(s, ">", "&gt;")
-	return s
-}
-
 // htmlCode wraps s in <code>...</code> after HTML-escaping it. Inside <code>
 // Telegram will not auto-detect URLs, so destinations like api.github.com
 // render as monospace text rather than clickable blue links.
 func htmlCode(s string) string {
-	return "<code>" + htmlEscapeText(s) + "</code>"
+	return "<code>" + htmlEscape(s) + "</code>"
 }
 
 func (h *CommandHandler) policyShowFromStore() string {
@@ -329,10 +319,10 @@ func (h *CommandHandler) policyShowFromStore() string {
 				fmt.Fprintf(&b, " -> %s", htmlCode(r.Replacement))
 			}
 			if r.Name != "" {
-				fmt.Fprintf(&b, " (%s)", htmlEscapeText(r.Name))
+				fmt.Fprintf(&b, " (%s)", htmlEscape(r.Name))
 			}
 			if r.Source != "" {
-				fmt.Fprintf(&b, " [%s]", htmlEscapeText(r.Source))
+				fmt.Fprintf(&b, " [%s]", htmlEscape(r.Source))
 			}
 			b.WriteString("\n")
 		}
@@ -364,14 +354,14 @@ func (h *CommandHandler) policyAllow(dest string) string {
 		if err := h.recompileAndSwap(); err != nil {
 			return fmt.Sprintf("Added allow rule but failed to recompile: %v", err)
 		}
-		return fmt.Sprintf("Added allow rule: %s", dest)
+		return "Added allow rule: " + htmlCode(dest)
 	}
 
 	// Fallback to in-memory mutation when store is not configured.
 	if err := h.engine.Load().AddAllowRule(dest); err != nil { //nolint:staticcheck // backward compat fallback when no store
 		return fmt.Sprintf("Failed to add allow rule: %v", err)
 	}
-	return fmt.Sprintf("Added allow rule: %s%s", dest, inMemoryWarning)
+	return "Added allow rule: " + htmlCode(dest) + inMemoryWarning
 }
 
 func (h *CommandHandler) policyDeny(dest string) string {
@@ -389,13 +379,13 @@ func (h *CommandHandler) policyDeny(dest string) string {
 		if err := h.recompileAndSwap(); err != nil {
 			return fmt.Sprintf("Added deny rule but failed to recompile: %v", err)
 		}
-		return fmt.Sprintf("Added deny rule: %s", dest)
+		return "Added deny rule: " + htmlCode(dest)
 	}
 
 	if err := h.engine.Load().AddDenyRule(dest); err != nil { //nolint:staticcheck // backward compat fallback when no store
 		return fmt.Sprintf("Failed to add deny rule: %v", err)
 	}
-	return fmt.Sprintf("Added deny rule: %s%s", dest, inMemoryWarning)
+	return "Added deny rule: " + htmlCode(dest) + inMemoryWarning
 }
 
 func (h *CommandHandler) policyRemove(idStr string) string {