MERGE

Reviewed [#17031](https://git.cafe/pingdotgg/t3code/pulls/17031) at local SHA `34fcb08ce3146c0b6424d676b1d05ec8b49014c4`, full `origin/main...HEAD` diff (16 files), including takeover, main merge, and round-two fixes. No concrete merge-blocking bug found.

The implementation recognizes execute-returned full results and bare `-html` references, checks execute references against the row’s source thread, and carries those references through web/desktop, mobile, guest rendering, and attachment cleanup. ACP identity handling covers the supplied Devin, CodeBuddy, and Grok envelopes; qualified rawInput.toolName filtering and child MCP output normalization are present. Wrapped execute output is trusted per Julius’s decision; the existing ownership check is retained.

Inspected both supplied feedback snapshots. Their outer-metadata-loss findings are addressed by the current bare-text-block guard and regression coverage. Forge head ed7d8da and its CI/reviews are stale evidence for this local revision.

Verification: 167 tests passed across shared htmlRender/toolOutput, ACP runtimeModel, web session-logic, and mobile threadActivity. Both selected ACP adapter tests passed (Grok OkayOutput and Devin child projection; 64 unrelated tests excluded). `git diff --check origin/main...HEAD` passed; worktree remained clean. An additional attachmentStore suite was invoked but its final output was not collected, so it is not credited as passing.

Limits: no browser, native client, live provider session, current-head CI, broad typecheck, or full server suite verification. No forge calls/writes, source edits, other worktrees, or subagents. Review used the requested pr-audit skill and local refs/saved feedback only; remote refs were not refreshed.