Best possible solution:

Land the focused importer and regression-test fix after normal maintainer review and required checks, keeping broader Claude placeholder filtering separate.

Do we have a high-confidence way to reproduce the issue?

Yes, at source level: current main returns null for an empty legacy reseed before preserving array siblings, and the PR head adds the mixed native-content fixture. I did not run tests because this review is read-only.

Is this the best way to solve the issue?

Yes. The branch keeps the repair inside the Claude CLI importer, shares the remove-block invariant with receipt-backed rows, and preserves existing suppression behavior for scalar and single-text empty reseeds.

AGENTS.md: found and applied where relevant.

Codex review notes: model internal, reasoning high; reviewed against d71a24f3a4b7.

Label justifications:

• P2: This is a normal-priority gateway history bug fix with limited blast radius and focused regression coverage.
• rating: 🐚 platinum hermit: Overall readiness is 🐚 platinum hermit; proof is 🐚 platinum hermit and patch quality is 🦞 diamond lobster.
• status: 👀 ready for maintainer look: ClawSweeper has no concrete contributor-facing blocker left for this PR. Not applicable: The external-contributor proof gate does not apply to this same-repo maintainer-labeled PR; the body still reports focused tests, static checks, and Testbox changed-check proof.

PR surface:

Source +13, Tests +54. Total +67 across 2 files.

What I checked:

• Current main behavior: Current main returns null for an empty legacy reseed userMessage before the array block path can preserve sibling image/document content. (src/gateway/cli-session-history.claude.ts:319, d71a24f3a4b7)
• PR implementation: The PR head adds removeContentBlock and uses it for empty legacy array reseeds, dropping only the synthetic block and dropping the row only when no content remains. (src/gateway/cli-session-history.claude.ts:330, a2a70206d0c9)
• Regression coverage: The PR head adds coverage for preserving caption/image/document siblings and preserving the existing scalar/single-text empty-row suppression behavior. (src/gateway/cli-session-history.test.ts:612, a2a70206d0c9)
• Caller surface: Gateway visible history imports Claude CLI messages through readClaudeCliSessionMessages before merging imported rows with local chat history. (src/gateway/cli-session-history.ts:50, d71a24f3a4b7)
• Parser contract: parseCliReseedPrompt can return a legacy reseed with an empty userMessage, which is the condition current main mishandles for mixed array content. (src/agents/cli-runner/reseed-envelope.ts:38, d71a24f3a4b7)
• History provenance: git blame ties the current reseed importer branch being refined to merged PR fix(cli): hide synthetic Claude reseed prompts #99653. (src/gateway/cli-session-history.claude.ts:319, 9aa4250c58ad)

Likely related people:

• ZOOWH: git blame and git log show the receipt-backed and legacy reseed importer branch came from the merged synthetic Claude reseed prompt fix. (role: introduced current reseed importer behavior; confidence: high; commits: 9aa4250c58ad; files: src/gateway/cli-session-history.claude.ts, src/gateway/cli-session-history.test.ts, src/config/sessions/cli-session-binding.ts)
• vincentkoc: Live PR metadata for the parent fix shows Vincent provided land-ready proof and merged the broader reseed fix, and this follow-up is in the same gateway history area. (role: recent reviewer, merger, and follow-up owner; confidence: medium; commits: 9aa4250c58ad, a2a70206d0c9; files: src/gateway/cli-session-history.claude.ts, src/gateway/cli-session-history.test.ts)

• 🦀 challenger crab: rare, exceptional readiness with strong proof, clean implementation, and convincing validation.
• 🦞 diamond lobster: very strong readiness with only minor maintainer review expected.
• 🐚 platinum hermit: good normal PR, likely mergeable with ordinary maintainer review.
• 🦐 gold shrimp: useful signal, but proof or patch confidence is still limited.
• 🦪 silver shellfish: thin signal; proof, validation, or implementation needs work.
• 🧂 unranked krab: not merge-ready because proof is missing/unusable or there are serious correctness or safety concerns.
• 🌊 off-meta tidepool: rating does not apply to this item.

Shiny media proof means a screenshot, video, or linked artifact directly shows the changed behavior. Runtime, network, CSP, and security claims still need visible diagnostics.

• ClawSweeper keeps one durable marker-backed review comment per issue or PR.
• Re-runs edit this comment so the latest verdict, findings, and automation markers stay together instead of adding duplicate bot comments.
• A fresh review can be triggered by eligible @clawsweeper re-review comments, exact-item GitHub events, scheduled/background review runs, or manual workflow dispatch.
• PR/issue authors and users with repository write access can comment @clawsweeper re-review or @clawsweeper re-run on an open PR or issue to request a fresh review only.
• Maintainers can also comment @clawsweeper review to request a fresh review only.
• Fresh-review commands do not start repair, autofix, rebase, CI repair, or automerge.
• Maintainer-only repair and merge flows require explicit commands such as @clawsweeper autofix, @clawsweeper automerge, @clawsweeper fix ci, or @clawsweeper address review.
• Maintainers can comment @clawsweeper explain to ask for more context, or @clawsweeper stop to stop active automation.