From 1b7749bf1207acf6fd5b08e98e68e0fe7d0e3bca Mon Sep 17 00:00:00 2001
From: Hugo Dutka <hugo@coder.com>
Date: Fri, 24 Oct 2025 15:12:14 +0200
Subject: [PATCH 1/2] fix: use unique keys for message components

---
 packages/blink/src/tui/dev.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/blink/src/tui/dev.tsx b/packages/blink/src/tui/dev.tsx
index 523be42..3a5848b 100644
--- a/packages/blink/src/tui/dev.tsx
+++ b/packages/blink/src/tui/dev.tsx
@@ -279,7 +279,7 @@ const Root = ({ directory }: { directory: string }) => {
               </Box>
             ) : (
               <Message
-                key={message.id}
+                key={`${message.id}-${index}`}
                 message={message}
                 previousMessage={
                   // These indices are off by one because of the banner's first message.

From b1c79c13c60fd4eda9f53da755e6b670c5be97f9 Mon Sep 17 00:00:00 2001
From: Hugo Dutka <hugo@coder.com>
Date: Fri, 24 Oct 2025 16:04:10 +0200
Subject: [PATCH 2/2] fix: reset terminal on resize properly

---
 bun.lock                                         | 1 +
 packages/blink/package.json                      | 1 +
 packages/blink/src/tui/components/text-input.tsx | 2 +-
 packages/blink/src/tui/dev.tsx                   | 4 ++--
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/bun.lock b/bun.lock
index cfededa..449c83c 100644
--- a/bun.lock
+++ b/bun.lock
@@ -53,6 +53,7 @@
         "@types/ws": "^8.18.1",
         "@whatwg-node/server": "^0.10.12",
         "@xterm/headless": "^5.5.0",
+        "ansi-escapes": "^7.1.1",
         "chalk": "^5.6.2",
         "commander": "^14.0.0",
         "dotenv": "^17.2.3",
diff --git a/packages/blink/package.json b/packages/blink/package.json
index 09372a4..bfa227c 100644
--- a/packages/blink/package.json
+++ b/packages/blink/package.json
@@ -106,6 +106,7 @@
     "@types/ws": "^8.18.1",
     "@whatwg-node/server": "^0.10.12",
     "@xterm/headless": "^5.5.0",
+    "ansi-escapes": "^7.1.1",
     "chalk": "^5.6.2",
     "commander": "^14.0.0",
     "dotenv": "^17.2.3",
diff --git a/packages/blink/src/tui/components/text-input.tsx b/packages/blink/src/tui/components/text-input.tsx
index 120c178..57a36e9 100644
--- a/packages/blink/src/tui/components/text-input.tsx
+++ b/packages/blink/src/tui/components/text-input.tsx
@@ -7,7 +7,7 @@ import {
   KeypressProvider as KeypressProviderBase,
   Config,
   type InputPromptProps,
-  useBracketedPaste
+  useBracketedPaste,
 } from "@jaaydenh/gemini-cli/ui";
 
 function createMinimalConfig(): Config {
diff --git a/packages/blink/src/tui/dev.tsx b/packages/blink/src/tui/dev.tsx
index 3a5848b..45117b8 100644
--- a/packages/blink/src/tui/dev.tsx
+++ b/packages/blink/src/tui/dev.tsx
@@ -11,6 +11,7 @@ import React, {
   useRef,
   useState,
 } from "react";
+import { clearTerminal as clearTerminalEscape } from "ansi-escapes";
 import { isToolApprovalOutput } from "../agent/tools";
 import useDevMode, { type TokenUsage } from "../react/use-dev-mode";
 import Markdown from "./components/markdown";
@@ -169,8 +170,7 @@ const Root = ({ directory }: { directory: string }) => {
   const { write } = useStdout();
   const [epoch, setEpoch] = useState(0);
   const resetTerminal = useCallback(() => {
-    write("\x1Bc"); // Full terminal reset
-    write("\x1B[?25l"); // Hide cursor
+    write(clearTerminalEscape);
     setEpoch((prev) => prev + 1);
   }, [write]);