From e641b0a8f42b6e96ddaaaddb3b7c35d4aab935ab Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 8 Sep 2026 15:11:45 +0000
Subject: [PATCH 1/3] Initial plan


From 8962764361f11a8f850876f7d17da6a70f3bddd6 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 8 Sep 2026 15:14:49 +0000
Subject: [PATCH 2/3] Fix floating comment editor sizing selector

Co-authored-by: chee <178266+chee@users.noreply.github.com>
---
 codemirror-base/src/lib/extensions/commentUI.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/codemirror-base/src/lib/extensions/commentUI.ts b/codemirror-base/src/lib/extensions/commentUI.ts
index 4e3258c1..c1f0834f 100644
--- a/codemirror-base/src/lib/extensions/commentUI.ts
+++ b/codemirror-base/src/lib/extensions/commentUI.ts
@@ -407,7 +407,7 @@ const commentUITheme = EditorView.baseTheme({
   // The draft textarea is width:100% with its own padding + border; without
   // border-box it spills out of the card's right edge (the card's own reset is
   // scoped to the sidebar panel, which the popover isn't inside).
-  ".cm-comment-popover .comment-draft-textarea": {
+  ".cm-comment-popover .comment-draft-editor": {
     boxSizing: "border-box",
     maxWidth: "100%",
   },

From 47b09d9af89e84083856ecd3b732dbdf747662d3 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 8 Sep 2026 15:30:40 +0000
Subject: [PATCH 3/3] Constrain comment editor layout

Co-authored-by: chee <178266+chee@users.noreply.github.com>
---
 codemirror-base/src/lib/extensions/commentUI.ts | 15 +++++++++++++++
 comments-view/src/styles.css                    | 13 ++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/codemirror-base/src/lib/extensions/commentUI.ts b/codemirror-base/src/lib/extensions/commentUI.ts
index c1f0834f..00d1eb11 100644
--- a/codemirror-base/src/lib/extensions/commentUI.ts
+++ b/codemirror-base/src/lib/extensions/commentUI.ts
@@ -410,6 +410,21 @@ const commentUITheme = EditorView.baseTheme({
   ".cm-comment-popover .comment-draft-editor": {
     boxSizing: "border-box",
     maxWidth: "100%",
+    minWidth: "0",
+    width: "100%",
+  },
+  ".cm-comment-popover .comment-draft-editor .cm-content": {
+    minHeight: "0",
+    minWidth: "0",
+    margin: "0",
+    padding: "8px",
+  },
+  ".cm-comment-popover .comment-draft-editor .cm-line": {
+    margin: "0",
+    padding: "0",
+  },
+  ".cm-comment-popover .comment-draft-editor .cm-scroller": {
+    minWidth: "0",
   },
 });
 
diff --git a/comments-view/src/styles.css b/comments-view/src/styles.css
index 7782ccf7..7688c2b4 100644
--- a/comments-view/src/styles.css
+++ b/comments-view/src/styles.css
@@ -199,6 +199,8 @@
 .comment-draft-editor {
   height: 6rem;
   min-height: 6rem;
+  min-width: 0;
+  width: 100%;
   border: 1px solid var(--comments-border);
   border-radius: 0.5rem;
   color: var(--comments-fg);
@@ -208,11 +210,20 @@
 
 .comment-draft-editor .cm-content {
   box-sizing: border-box;
-  min-height: 100%;
+  min-height: 0;
+  min-width: 0;
+  margin: 0;
+  padding: 0.5rem;
+}
+
+.comment-draft-editor .cm-line {
+  margin: 0;
+  padding: 0;
 }
 
 .comment-draft-editor .cm-scroller {
   height: 100%;
+  min-width: 0;
 }
 
 .comment-draft-editor:focus-within {