Fit final edit payloads; status info & misc fixes

Add logic to ensure final edit payloads fit within Matrix event size limits by estimating content size and progressively compacting: clear formatted body, drop link previews, compact or drop AI UI metadata, drop other extra fields, and trim body as a last resort. Introduce MaxMatrixEventContentBytes, FitFinalEditPayload, related helpers, fit result logging (used in Turn.buildFinalEdit), and tests for the behavior.

Also add MatrixMessageStatusEventInfo helper to populate/fallback room IDs and use it in message status sending paths (bridges/ai client and handler and SendMatrixMessageStatus), and bump maxAgentLoopToolTurns from 10 to 50. Include new unit tests for status helper and final edit fitting.

Author: batuhan

bridges/ai/agent_loop_runtime.go

@@ -8,7 +8,7 @@ import (
 	"maunium.net/go/mautrix/event"
 )
 
-const maxAgentLoopToolTurns = 10
+const maxAgentLoopToolTurns = 50
 
 func runAgentLoopStreamStep[T any](
 	ctx context.Context,

bridges/ai/client.go

@@ -601,7 +601,9 @@ func (oc *AIClient) sendQueueRejectedStatus(ctx context.Context, portal *bridgev
 		WithIsCertain(true).
 		WithSendNotice(false)
 	for _, statusEvt := range queueStatusEvents(evt, extras) {
-		portal.Bridge.Matrix.SendMessageStatus(ctx, &msgStatus, bridgev2.StatusEventInfoFromEvent(statusEvt))
+		if info := agentremote.MatrixMessageStatusEventInfo(portal, statusEvt); info != nil {
+			portal.Bridge.Matrix.SendMessageStatus(ctx, &msgStatus, info)
+		}
 	}
 }
 

bridges/ai/handleai.go

@@ -59,10 +59,14 @@ func (oc *AIClient) notifyMatrixSendFailure(ctx context.Context, portal *bridgev
 			WithMessage(errorMessage).
 			WithIsCertain(true).
 			WithSendNotice(true)
-		portal.Bridge.Matrix.SendMessageStatus(ctx, &msgStatus, bridgev2.StatusEventInfoFromEvent(evt))
+		if info := agentremote.MatrixMessageStatusEventInfo(portal, evt); info != nil {
+			portal.Bridge.Matrix.SendMessageStatus(ctx, &msgStatus, info)
+		}
 		for _, extra := range statusEventsFromContext(ctx) {
 			if extra != nil {
-				portal.Bridge.Matrix.SendMessageStatus(ctx, &msgStatus, bridgev2.StatusEventInfoFromEvent(extra))
+				if info := agentremote.MatrixMessageStatusEventInfo(portal, extra); info != nil {
+					portal.Bridge.Matrix.SendMessageStatus(ctx, &msgStatus, info)
+				}
 			}
 		}
 	}

sdk/final_edit.go

@@ -1,12 +1,20 @@
 package sdk
 
 import (
+	"encoding/json"
+	"fmt"
 	"maps"
+	"reflect"
 	"strings"
 
 	"github.com/beeper/agentremote/pkg/matrixevents"
+	"github.com/beeper/agentremote/turns"
+	"maunium.net/go/mautrix/event"
+	"maunium.net/go/mautrix/id"
 )
 
+const MaxMatrixEventContentBytes = 60000
+
 // BuildCompactFinalUIMessage removes streaming-only parts from a UI message so
 // the payload is suitable for attachment to the final Matrix edit.
 func BuildCompactFinalUIMessage(uiMessage map[string]any) map[string]any {
@@ -44,6 +52,24 @@ func BuildCompactFinalUIMessage(uiMessage map[string]any) map[string]any {
 	return out
 }
 
+// BuildMinimalFinalUIMessage removes optional detail from a UI message while
+// preserving stable identifiers and metadata.
+func BuildMinimalFinalUIMessage(uiMessage map[string]any) map[string]any {
+	if len(uiMessage) == 0 {
+		return nil
+	}
+	out := map[string]any{}
+	for _, key := range []string{"id", "role", "metadata"} {
+		if value, ok := uiMessage[key]; ok && value != nil {
+			out[key] = value
+		}
+	}
+	if len(out) == 0 {
+		return nil
+	}
+	return out
+}
+
 // BuildDefaultFinalEditExtra builds the SDK's default replacement payload
 // that should live inside m.new_content for terminal final edits.
 func BuildDefaultFinalEditExtra(uiMessage map[string]any) map[string]any {
@@ -107,3 +133,180 @@ func withFinalEditFinishReason(uiMessage map[string]any, finishReason string) ma
 	out["metadata"] = metadata
 	return out
 }
+
+type FinalEditFitDetails struct {
+	OriginalSize         int
+	FinalSize            int
+	ClearedFormattedBody bool
+	DroppedLinkPreviews  bool
+	CompactedUIMessage   bool
+	DroppedUIMessage     bool
+	DroppedExtra         bool
+	TrimmedBody          bool
+}
+
+func (d FinalEditFitDetails) Changed() bool {
+	return d.ClearedFormattedBody || d.DroppedLinkPreviews || d.CompactedUIMessage || d.DroppedUIMessage || d.DroppedExtra || d.TrimmedBody
+}
+
+func (d FinalEditFitDetails) Summary() string {
+	steps := make([]string, 0, 6)
+	if d.ClearedFormattedBody {
+		steps = append(steps, "cleared_formatted_body")
+	}
+	if d.DroppedLinkPreviews {
+		steps = append(steps, "dropped_link_previews")
+	}
+	if d.CompactedUIMessage {
+		steps = append(steps, "compacted_ui_message")
+	}
+	if d.DroppedUIMessage {
+		steps = append(steps, "dropped_ui_message")
+	}
+	if d.DroppedExtra {
+		steps = append(steps, "dropped_extra")
+	}
+	if d.TrimmedBody {
+		steps = append(steps, "trimmed_body")
+	}
+	if len(steps) == 0 {
+		return ""
+	}
+	return strings.Join(steps, ",")
+}
+
+func cloneFinalEditPayload(payload *FinalEditPayload) *FinalEditPayload {
+	if payload == nil {
+		return nil
+	}
+	cloned := &FinalEditPayload{
+		Extra:         maps.Clone(payload.Extra),
+		TopLevelExtra: maps.Clone(payload.TopLevelExtra),
+	}
+	if payload.Content != nil {
+		content := *payload.Content
+		if payload.Content.Mentions != nil {
+			mentions := *payload.Content.Mentions
+			if len(mentions.UserIDs) > 0 {
+				mentions.UserIDs = append([]id.UserID(nil), mentions.UserIDs...)
+			}
+			content.Mentions = &mentions
+		}
+		cloned.Content = &content
+	}
+	return cloned
+}
+
+func estimateFinalEditContentSize(payload *FinalEditPayload, target id.EventID) int {
+	if payload == nil || payload.Content == nil {
+		return 0
+	}
+	content := *payload.Content
+	if content.Mentions == nil {
+		content.Mentions = &event.Mentions{}
+	}
+	content.SetEdit(target)
+	raw := maps.Clone(payload.TopLevelExtra)
+	if raw == nil {
+		raw = map[string]any{}
+	}
+	if payload.Extra != nil {
+		raw["m.new_content"] = payload.Extra
+	}
+	data, err := json.Marshal(&event.Content{
+		Parsed: &content,
+		Raw:    raw,
+	})
+	if err != nil {
+		return MaxMatrixEventContentBytes + 1
+	}
+	return len(data)
+}
+
+func FitFinalEditPayload(payload *FinalEditPayload, target id.EventID) (*FinalEditPayload, FinalEditFitDetails) {
+	fitted := cloneFinalEditPayload(payload)
+	if fitted == nil || fitted.Content == nil {
+		return fitted, FinalEditFitDetails{}
+	}
+	details := FinalEditFitDetails{
+		OriginalSize: estimateFinalEditContentSize(fitted, target),
+	}
+	size := details.OriginalSize
+	if size <= MaxMatrixEventContentBytes {
+		details.FinalSize = size
+		return fitted, details
+	}
+
+	if fitted.Content.Format != "" || fitted.Content.FormattedBody != "" {
+		fitted.Content.Format = ""
+		fitted.Content.FormattedBody = ""
+		details.ClearedFormattedBody = true
+		size = estimateFinalEditContentSize(fitted, target)
+	}
+	if size > MaxMatrixEventContentBytes && fitted.Extra != nil {
+		if _, ok := fitted.Extra["com.beeper.linkpreviews"]; ok {
+			delete(fitted.Extra, "com.beeper.linkpreviews")
+			details.DroppedLinkPreviews = true
+			size = estimateFinalEditContentSize(fitted, target)
+		}
+	}
+	if size > MaxMatrixEventContentBytes && fitted.Extra != nil {
+		if rawUI, ok := fitted.Extra[matrixevents.BeeperAIKey].(map[string]any); ok {
+			minimalUI := BuildMinimalFinalUIMessage(rawUI)
+			switch {
+			case minimalUI == nil:
+				delete(fitted.Extra, matrixevents.BeeperAIKey)
+				details.DroppedUIMessage = true
+			case !reflect.DeepEqual(minimalUI, rawUI):
+				fitted.Extra[matrixevents.BeeperAIKey] = minimalUI
+				details.CompactedUIMessage = true
+			}
+			size = estimateFinalEditContentSize(fitted, target)
+		}
+	}
+	if size > MaxMatrixEventContentBytes && fitted.Extra != nil {
+		if _, ok := fitted.Extra[matrixevents.BeeperAIKey]; ok {
+			delete(fitted.Extra, matrixevents.BeeperAIKey)
+			details.DroppedUIMessage = true
+			size = estimateFinalEditContentSize(fitted, target)
+		}
+	}
+	if size > MaxMatrixEventContentBytes && len(fitted.Extra) > 0 {
+		fitted.Extra = nil
+		details.DroppedExtra = true
+		size = estimateFinalEditContentSize(fitted, target)
+	}
+	if size > MaxMatrixEventContentBytes && fitted.Content != nil && fitted.Content.Body != "" {
+		best := strings.TrimSpace(fitted.Content.Body)
+		low, high := 1, len(fitted.Content.Body)
+		for low <= high {
+			mid := (low + high) / 2
+			candidate, _ := turns.SplitAtMarkdownBoundary(fitted.Content.Body, mid)
+			candidate = strings.TrimSpace(candidate)
+			if candidate == "" {
+				high = mid - 1
+				continue
+			}
+			fitted.Content.Body = candidate
+			candidateSize := estimateFinalEditContentSize(fitted, target)
+			if candidateSize <= MaxMatrixEventContentBytes {
+				best = candidate
+				low = mid + 1
+			} else {
+				high = mid - 1
+			}
+		}
+		fitted.Content.Body = best
+		details.TrimmedBody = best != strings.TrimSpace(payload.Content.Body)
+		size = estimateFinalEditContentSize(fitted, target)
+	}
+	details.FinalSize = size
+	return fitted, details
+}
+
+func FormatFinalEditFitLog(details FinalEditFitDetails) string {
+	if !details.Changed() {
+		return ""
+	}
+	return fmt.Sprintf("%d->%d bytes (%s)", details.OriginalSize, details.FinalSize, details.Summary())
+}

sdk/final_edit_test.go

@@ -0,0 +1,92 @@
+package sdk
+
+import (
+	"strings"
+	"testing"
+
+	"github.com/beeper/agentremote/pkg/matrixevents"
+	"maunium.net/go/mautrix/event"
+	"maunium.net/go/mautrix/id"
+)
+
+func TestFitFinalEditPayloadCompactsOptionalMetadataFirst(t *testing.T) {
+	largePart := map[string]any{
+		"type": "tool-call",
+		"text": strings.Repeat("x", MaxMatrixEventContentBytes),
+	}
+	payload := &FinalEditPayload{
+		Content: &event.MessageEventContent{
+			MsgType:       event.MsgText,
+			Body:          "done",
+			Format:        event.FormatHTML,
+			FormattedBody: strings.Repeat("<p>done</p>", MaxMatrixEventContentBytes/8),
+		},
+		Extra: map[string]any{
+			matrixevents.BeeperAIKey: map[string]any{
+				"id":       "turn-1",
+				"role":     "assistant",
+				"metadata": map[string]any{"finish_reason": "stop"},
+				"parts":    []any{largePart},
+			},
+			"com.beeper.linkpreviews": []map[string]any{{
+				"matched_url": "https://example.com",
+				"title":       strings.Repeat("preview", 2000),
+			}},
+		},
+		TopLevelExtra: map[string]any{
+			"com.beeper.dont_render_edited": true,
+		},
+	}
+
+	fitted, details := FitFinalEditPayload(payload, id.EventID("$event-1"))
+	if fitted == nil || fitted.Content == nil {
+		t.Fatal("expected fitted payload")
+	}
+	if details.FinalSize > MaxMatrixEventContentBytes {
+		t.Fatalf("expected fitted payload under %d bytes, got %d", MaxMatrixEventContentBytes, details.FinalSize)
+	}
+	if fitted.Content.Body != "done" {
+		t.Fatalf("expected body to be preserved, got %q", fitted.Content.Body)
+	}
+	if !details.ClearedFormattedBody {
+		t.Fatal("expected formatted body to be cleared before trimming body")
+	}
+	if !details.DroppedLinkPreviews {
+		t.Fatal("expected oversized link previews to be dropped")
+	}
+	if details.TrimmedBody {
+		t.Fatal("expected metadata reductions to avoid trimming the visible body")
+	}
+	if rawUI, ok := fitted.Extra[matrixevents.BeeperAIKey].(map[string]any); ok {
+		if _, ok = rawUI["parts"]; ok {
+			t.Fatalf("expected ui message parts to be removed, got %#v", rawUI["parts"])
+		}
+	}
+}
+
+func TestFitFinalEditPayloadTrimsBodyAsLastResort(t *testing.T) {
+	body := strings.Repeat("abc\n", MaxMatrixEventContentBytes)
+	payload := &FinalEditPayload{
+		Content: &event.MessageEventContent{
+			MsgType: event.MsgText,
+			Body:    body,
+		},
+		TopLevelExtra: map[string]any{
+			"com.beeper.dont_render_edited": true,
+		},
+	}
+
+	fitted, details := FitFinalEditPayload(payload, id.EventID("$event-2"))
+	if fitted == nil || fitted.Content == nil {
+		t.Fatal("expected fitted payload")
+	}
+	if !details.TrimmedBody {
+		t.Fatal("expected oversized body to be trimmed")
+	}
+	if details.FinalSize > MaxMatrixEventContentBytes {
+		t.Fatalf("expected fitted payload under %d bytes, got %d", MaxMatrixEventContentBytes, details.FinalSize)
+	}
+	if len(fitted.Content.Body) >= len(body) {
+		t.Fatalf("expected trimmed body to be shorter than original")
+	}
+}

sdk/turn.go

@@ -675,13 +675,25 @@ func (t *Turn) buildFinalEdit() (networkid.MessageID, *bridgev2.ConvertedEdit) {
 	if target == "" {
 		return "", nil
 	}
-	content := *payload.Content
+	fittedPayload, fitDetails := FitFinalEditPayload(payload, t.initialEventID)
+	if fittedPayload == nil || fittedPayload.Content == nil {
+		return "", nil
+	}
+	if fitDetails.Changed() && t.conv != nil && t.conv.login != nil {
+		t.conv.login.Log.Warn().
+			Str("component", "sdk_turn").
+			Int("original_bytes", fitDetails.OriginalSize).
+			Int("final_bytes", fitDetails.FinalSize).
+			Str("reductions", fitDetails.Summary()).
+			Msg("Reduced final edit payload to fit Matrix content limits")
+	}
+	content := *fittedPayload.Content
 	if content.Mentions == nil {
 		content.Mentions = &event.Mentions{}
 	}
 	content.RelatesTo = nil
-	extra := maps.Clone(payload.Extra)
-	topLevelExtra := maps.Clone(payload.TopLevelExtra)
+	extra := maps.Clone(fittedPayload.Extra)
+	topLevelExtra := maps.Clone(fittedPayload.TopLevelExtra)
 	if extra == nil {
 		extra = map[string]any{}
 	}