From eb858216113c4968059470fa906dea7df66beaeb Mon Sep 17 00:00:00 2001
From: Eduardo Villalpando Mello <eduardovil@microsoft.com>
Date: Mon, 21 Sep 2026 13:57:23 -0700
Subject: [PATCH 1/3] gh-#157928: PyREPL Detect OSC sequences

---
 Lib/_pyrepl/utils.py                | 4 +++-
 Lib/test/test_pyrepl/test_render.py | 9 +++++++++
 Lib/test/test_pyrepl/test_utils.py  | 3 +++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/Lib/_pyrepl/utils.py b/Lib/_pyrepl/utils.py
index e77001f6a1d10bb..fd63fadb6072bd6 100644
--- a/Lib/_pyrepl/utils.py
+++ b/Lib/_pyrepl/utils.py
@@ -19,7 +19,9 @@
 from .trace import trace
 
 
-ANSI_ESCAPE_SEQUENCE = re.compile(r"\x1b\[[ -@]*[A-~]")
+ANSI_ESCAPE_SEQUENCE = re.compile(
+    r"\x1b(?:\[[ -@]*[A-~]|\][^\x1b\x07]*(?:\x07|\x1b\\))"
+)
 ZERO_WIDTH_BRACKET = re.compile(r"\x01.*?\x02")
 ZERO_WIDTH_TRANS = str.maketrans({"\x01": "", "\x02": ""})
 IDENTIFIERS_AFTER = frozenset({"def", "class"})
diff --git a/Lib/test/test_pyrepl/test_render.py b/Lib/test/test_pyrepl/test_render.py
index 5479f2eb4bae398..10a119150376a0b 100644
--- a/Lib/test/test_pyrepl/test_render.py
+++ b/Lib/test/test_pyrepl/test_render.py
@@ -55,6 +55,15 @@ def test_from_rendered_text_empty_string(self):
         self.assertEqual(line.text, "")
         self.assertEqual(line.width, 0)
 
+    def test_from_rendered_text_with_osc_control(self):
+        osc = "\x1b]633;A\x1b\\"
+        line = RenderLine.from_rendered_text(f"{osc}>>> ")
+
+        self.assertEqual(line.width, 4)
+        self.assertEqual(line.cells[0].controls, (osc,))
+        self.assertEqual(line.cells[0].text, "")
+        self.assertEqual(line.text, f"{osc}>>> ")
+
     def test_from_rendered_text_with_non_sgr_controls(self):
         # \x1b[H is a cursor-home control (not SGR since it doesn't end with 'm')
         line = RenderLine.from_rendered_text("\x1b[Hx")
diff --git a/Lib/test/test_pyrepl/test_utils.py b/Lib/test/test_pyrepl/test_utils.py
index e87d14304c82257..e0e809838279ea1 100644
--- a/Lib/test/test_pyrepl/test_utils.py
+++ b/Lib/test/test_pyrepl/test_utils.py
@@ -47,6 +47,9 @@ def test_wlen(self):
         self.assertEqual(wlen('e\N{COMBINING ACUTE ACCENT}'), 1)
         self.assertEqual(wlen('a\N{ZERO WIDTH JOINER}b'), 2)
 
+    def test_wlen_with_osc_sequence(self):
+        self.assertEqual(wlen("\x1b]633;A\x07>>> "), 4)
+
     def test_prev_next_window(self):
         def gen_normal():
             yield 1

From d88732f55ab155a858e3993c78acd9e00858e686 Mon Sep 17 00:00:00 2001
From: "blurb-it[bot]" <43283697+blurb-it[bot]@users.noreply.github.com>
Date: Mon, 21 Sep 2026 21:07:13 +0000
Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=93=9C=F0=9F=A4=96=20Added=20by=20blu?=
 =?UTF-8?q?rb=5Fit.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../next/Library/2026-09-21-21-07-12.gh-issue-157928.ZPlNYC.rst  | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 Misc/NEWS.d/next/Library/2026-09-21-21-07-12.gh-issue-157928.ZPlNYC.rst

diff --git a/Misc/NEWS.d/next/Library/2026-09-21-21-07-12.gh-issue-157928.ZPlNYC.rst b/Misc/NEWS.d/next/Library/2026-09-21-21-07-12.gh-issue-157928.ZPlNYC.rst
new file mode 100644
index 000000000000000..2fa00484bf89865
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2026-09-21-21-07-12.gh-issue-157928.ZPlNYC.rst
@@ -0,0 +1 @@
+Correctly detect and handle OSC sequences in PyREPL

From 995f364b7c828fa881f4d8955ffad3a3047b4379 Mon Sep 17 00:00:00 2001
From: Eduardo Villalpando Mello <eduardovil@microsoft.com>
Date: Mon, 21 Sep 2026 14:10:23 -0700
Subject: [PATCH 3/3] Add negative test

---
 Lib/test/test_pyrepl/test_utils.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Lib/test/test_pyrepl/test_utils.py b/Lib/test/test_pyrepl/test_utils.py
index e0e809838279ea1..13483937831b251 100644
--- a/Lib/test/test_pyrepl/test_utils.py
+++ b/Lib/test/test_pyrepl/test_utils.py
@@ -50,6 +50,9 @@ def test_wlen(self):
     def test_wlen_with_osc_sequence(self):
         self.assertEqual(wlen("\x1b]633;A\x07>>> "), 4)
 
+    def test_wlen_with_unterminated_osc_sequence(self):
+        self.assertEqual(wlen("\x1b]633;A"), 7)
+
     def test_prev_next_window(self):
         def gen_normal():
             yield 1