From 10d9b0c143fdc3c8f3e7e37cfd0a0f3ffcfeb8f6 Mon Sep 17 00:00:00 2001
From: Dax Raad <d@ironbay.co>
Date: Wed, 24 Sep 2025 04:50:53 -0400
Subject: [PATCH] tui: fix text part margin logic and import cleanup

---
 packages/opencode/src/cli/cmd/tui/session.tsx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/tui/session.tsx b/packages/opencode/src/cli/cmd/tui/session.tsx
index f051b10cc..986c0ce29 100644
--- a/packages/opencode/src/cli/cmd/tui/session.tsx
+++ b/packages/opencode/src/cli/cmd/tui/session.tsx
@@ -7,8 +7,7 @@ import { SplitBorder } from "./component/border"
 import { Theme } from "./context/theme"
 import { BoxRenderable, ScrollBoxRenderable } from "@opentui/core"
 import { Prompt } from "./component/prompt"
-import type { AssistantMessage, Part, ToolPart, UserMessage } from "@opencode-ai/sdk"
-import type { TextPart } from "ai"
+import type { AssistantMessage, Part, ToolPart, UserMessage, TextPart } from "@opencode-ai/sdk"
 import { useLocal } from "./context/local"
 import { Locale } from "../../../util/locale"
 import type { Tool } from "../../../tool/tool"
@@ -265,7 +264,7 @@ function resize(el: BoxRenderable) {
   const index = children.indexOf(el)
   const previous = children[index - 1]
   if (!previous) return
-  if (previous.height > 1 || previous.marginTop === 1) {
+  if (previous.height > 1 || previous.id.startsWith("text-")) {
     el.marginTop = 1
     return
   }
@@ -273,7 +272,7 @@ function resize(el: BoxRenderable) {
 
 function TextPart(props: { part: TextPart; message: AssistantMessage }) {
   return (
-    <box paddingLeft={3} marginTop={1} flexShrink={0}>
+    <box id={"text-" + props.part.id} paddingLeft={3} marginTop={1} flexShrink={0}>
       <text>{props.part.text.trim()}</text>
     </box>
   )